diff --git a/call.php b/call.php index 745cb53d..c54ca407 100644 --- a/call.php +++ b/call.php @@ -140,16 +140,20 @@ function display_outcomes($contacted,$ca,$case_id) print "
"; if (!empty($rs)) { - $lime_sid = get_limesurvey_id(get_operator_id()); + $qid = get_questionnaire_id(get_operator_id()); + + $sql = "SELECT token + FROM `case` + WHERE case_id = $case_id"; - //Check to see if we have sent an email on this call and set the default outcome - $sql = "SELECT 41 - FROM `case` as c, " . LIME_PREFIX . "tokens_$lime_sid as t - WHERE t.sent = '$ca' - AND c.case_id = $case_id - AND t.token = c.token"; + $token = $db->GetOne($sql); - $do = $db->GetOne($sql); + $sent = get_token_value($qid,$token,'sent'); + + $do =""; + + if ($sent == $ca) + $do = 41; if (isset($_GET['defaultoutcome'])) $do = bigintval($_GET['defaultoutcome']); foreach($rs as $r) diff --git a/call_interface2.php b/call_interface2.php index 54d30cb5..5795f37c 100644 --- a/call_interface2.php +++ b/call_interface2.php @@ -144,16 +144,20 @@ function display_outcomes($contacted,$ca,$case_id) { $do = false; - $lime_sid = get_limesurvey_id(get_operator_id()); + $qid = get_questionnaire_id(get_operator_id()); + + $sql = "SELECT token + FROM `case` + WHERE case_id = $case_id"; - //Check to see if we have sent an email on this call and set the default outcome - $sql = "SELECT 41 - FROM `case` as c, " . LIME_PREFIX . "tokens_$lime_sid as t - WHERE t.sent = '$ca' - AND c.case_id = $case_id - AND t.token = c.token"; - $do = $db->GetOne($sql); - + $token = $db->GetOne($sql); + + $sent = get_token_value($qid,$token,'sent'); + + if ($sent == $ca) + $do = 41; + + if (isset($_GET['defaultoutcome'])) $do = bigintval($_GET['defaultoutcome']); foreach($rs as $r) { diff --git a/database/quexs.sql b/database/quexs.sql index ab62eab1..d8a6cef5 100644 --- a/database/quexs.sql +++ b/database/quexs.sql @@ -366,562 +366,6 @@ CREATE TABLE `extension` ( -- -------------------------------------------------------- --- --- Table structure for table `lime_answers` --- - -CREATE TABLE `lime_answers` ( - `qid` int(11) NOT NULL DEFAULT '0', - `code` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `answer` text COLLATE utf8_unicode_ci NOT NULL, - `assessment_value` int(11) NOT NULL DEFAULT '0', - `sortorder` int(11) NOT NULL, - `language` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'en', - `scale_id` tinyint(4) NOT NULL DEFAULT '0', - PRIMARY KEY (`qid`,`code`,`language`,`scale_id`), - KEY `answers_idx2` (`sortorder`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_assessments` --- - -CREATE TABLE `lime_assessments` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `sid` int(11) NOT NULL DEFAULT '0', - `scope` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `gid` int(11) NOT NULL DEFAULT '0', - `name` text COLLATE utf8_unicode_ci NOT NULL, - `minimum` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `maximum` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `message` text COLLATE utf8_unicode_ci NOT NULL, - `language` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'en', - PRIMARY KEY (`id`,`language`), - KEY `assessments_idx2` (`sid`), - KEY `assessments_idx3` (`gid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_conditions` --- - -CREATE TABLE `lime_conditions` ( - `cid` int(11) NOT NULL AUTO_INCREMENT, - `qid` int(11) NOT NULL DEFAULT '0', - `scenario` int(11) NOT NULL DEFAULT '1', - `cqid` int(11) NOT NULL DEFAULT '0', - `cfieldname` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `method` char(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `value` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - PRIMARY KEY (`cid`), - KEY `conditions_idx2` (`qid`), - KEY `conditions_idx3` (`cqid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_defaultvalues` --- - -CREATE TABLE `lime_defaultvalues` ( - `qid` int(11) NOT NULL DEFAULT '0', - `specialtype` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `scale_id` int(11) NOT NULL DEFAULT '0', - `sqid` int(11) NOT NULL DEFAULT '0', - `language` varchar(20) COLLATE utf8_unicode_ci NOT NULL, - `defaultvalue` text COLLATE utf8_unicode_ci, - PRIMARY KEY (`qid`,`scale_id`,`language`,`specialtype`,`sqid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_expression_errors` --- - -CREATE TABLE `lime_expression_errors` ( - `id` int(9) NOT NULL AUTO_INCREMENT, - `errortime` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `sid` int(11) DEFAULT NULL, - `gid` int(11) DEFAULT NULL, - `qid` int(11) DEFAULT NULL, - `gseq` int(11) DEFAULT NULL, - `qseq` int(11) DEFAULT NULL, - `type` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `eqn` text COLLATE utf8_unicode_ci, - `prettyprint` text COLLATE utf8_unicode_ci, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_failed_login_attempts` --- - -CREATE TABLE `lime_failed_login_attempts` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `ip` varchar(37) COLLATE utf8_unicode_ci NOT NULL, - `last_attempt` varchar(20) COLLATE utf8_unicode_ci NOT NULL, - `number_attempts` int(11) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_groups` --- - -CREATE TABLE `lime_groups` ( - `gid` int(11) NOT NULL AUTO_INCREMENT, - `sid` int(11) NOT NULL DEFAULT '0', - `group_name` varchar(100) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `group_order` int(11) NOT NULL DEFAULT '0', - `description` text COLLATE utf8_unicode_ci, - `language` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'en', - `randomization_group` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `grelevance` text COLLATE utf8_unicode_ci, - PRIMARY KEY (`gid`,`language`), - KEY `groups_idx2` (`sid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_labels` --- - -CREATE TABLE `lime_labels` ( - `lid` int(11) NOT NULL DEFAULT '0', - `code` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `title` text COLLATE utf8_unicode_ci, - `sortorder` int(11) NOT NULL, - `assessment_value` int(11) NOT NULL DEFAULT '0', - `language` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'en', - PRIMARY KEY (`lid`,`sortorder`,`language`), - KEY `ixcode` (`code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_labelsets` --- - -CREATE TABLE `lime_labelsets` ( - `lid` int(11) NOT NULL AUTO_INCREMENT, - `label_name` varchar(100) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `languages` varchar(200) COLLATE utf8_unicode_ci DEFAULT 'en', - PRIMARY KEY (`lid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_participants` --- - -CREATE TABLE `lime_participants` ( - `participant_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL, - `firstname` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL, - `lastname` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL, - `email` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL, - `language` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL, - `blacklisted` varchar(1) COLLATE utf8_unicode_ci NOT NULL, - `owner_uid` int(20) NOT NULL, - PRIMARY KEY (`participant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_participant_attribute` --- - -CREATE TABLE `lime_participant_attribute` ( - `participant_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL, - `attribute_id` int(11) NOT NULL, - `value` varchar(50) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`participant_id`,`attribute_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_participant_attribute_names` --- - -CREATE TABLE `lime_participant_attribute_names` ( - `attribute_id` int(11) NOT NULL AUTO_INCREMENT, - `attribute_type` varchar(4) COLLATE utf8_unicode_ci NOT NULL, - `visible` char(5) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`attribute_id`,`attribute_type`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_participant_attribute_names_lang` --- - -CREATE TABLE `lime_participant_attribute_names_lang` ( - `attribute_id` int(11) NOT NULL, - `attribute_name` varchar(30) COLLATE utf8_unicode_ci NOT NULL, - `lang` varchar(20) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`attribute_id`,`lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_participant_attribute_values` --- - -CREATE TABLE `lime_participant_attribute_values` ( - `value_id` int(11) NOT NULL AUTO_INCREMENT, - `attribute_id` int(11) NOT NULL, - `value` varchar(20) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`value_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_participant_shares` --- - -CREATE TABLE `lime_participant_shares` ( - `participant_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL, - `share_uid` int(11) NOT NULL, - `date_added` datetime NOT NULL, - `can_edit` varchar(5) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`participant_id`,`share_uid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_questions` --- - -CREATE TABLE `lime_questions` ( - `qid` int(11) NOT NULL AUTO_INCREMENT, - `parent_qid` int(11) NOT NULL DEFAULT '0', - `sid` int(11) NOT NULL DEFAULT '0', - `gid` int(11) NOT NULL DEFAULT '0', - `type` char(1) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'T', - `title` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `question` text COLLATE utf8_unicode_ci NOT NULL, - `preg` text COLLATE utf8_unicode_ci, - `help` text COLLATE utf8_unicode_ci, - `other` char(1) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'N', - `mandatory` char(1) COLLATE utf8_unicode_ci DEFAULT NULL, - `question_order` int(11) NOT NULL, - `language` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'en', - `scale_id` tinyint(4) NOT NULL DEFAULT '0', - `same_default` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Saves if user set to use the same default value across languages in default options dialog', - `relevance` text COLLATE utf8_unicode_ci, - PRIMARY KEY (`qid`,`language`), - KEY `questions_idx2` (`sid`), - KEY `questions_idx3` (`gid`), - KEY `questions_idx4` (`type`), - KEY `parent_qid_idx` (`parent_qid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_question_attributes` --- - -CREATE TABLE `lime_question_attributes` ( - `qaid` int(11) NOT NULL AUTO_INCREMENT, - `qid` int(11) NOT NULL DEFAULT '0', - `attribute` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `value` text COLLATE utf8_unicode_ci, - `language` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL, - PRIMARY KEY (`qaid`), - KEY `question_attributes_idx2` (`qid`), - KEY `question_attributes_idx3` (`attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_quota` --- - -CREATE TABLE `lime_quota` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `sid` int(11) DEFAULT NULL, - `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `qlimit` int(8) DEFAULT NULL, - `action` int(2) DEFAULT NULL, - `active` int(1) NOT NULL DEFAULT '1', - `autoload_url` int(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`), - KEY `quota_idx2` (`sid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_quota_languagesettings` --- - -CREATE TABLE `lime_quota_languagesettings` ( - `quotals_id` int(11) NOT NULL AUTO_INCREMENT, - `quotals_quota_id` int(11) NOT NULL DEFAULT '0', - `quotals_language` varchar(45) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'en', - `quotals_name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `quotals_message` text COLLATE utf8_unicode_ci NOT NULL, - `quotals_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `quotals_urldescrip` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - PRIMARY KEY (`quotals_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_quota_members` --- - -CREATE TABLE `lime_quota_members` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `sid` int(11) DEFAULT NULL, - `qid` int(11) DEFAULT NULL, - `quota_id` int(11) DEFAULT NULL, - `code` varchar(11) COLLATE utf8_unicode_ci DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `sid` (`sid`,`qid`,`quota_id`,`code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_saved_control` --- - -CREATE TABLE `lime_saved_control` ( - `scid` int(11) NOT NULL AUTO_INCREMENT, - `sid` int(11) NOT NULL DEFAULT '0', - `srid` int(11) NOT NULL DEFAULT '0', - `identifier` bigint(20) NOT NULL, - `access_code` text COLLATE utf8_unicode_ci NOT NULL, - `email` varchar(320) COLLATE utf8_unicode_ci DEFAULT NULL, - `ip` text COLLATE utf8_unicode_ci NOT NULL, - `saved_thisstep` text COLLATE utf8_unicode_ci NOT NULL, - `status` char(1) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `saved_date` datetime NOT NULL, - `refurl` text COLLATE utf8_unicode_ci, - PRIMARY KEY (`scid`), - KEY `saved_control_idx2` (`sid`), - KEY `identifier` (`identifier`), - KEY `srid` (`srid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_sessions` --- - -CREATE TABLE `lime_sessions` ( - `sesskey` varchar(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `expiry` datetime NOT NULL, - `expireref` varchar(250) COLLATE utf8_unicode_ci DEFAULT '', - `created` datetime NOT NULL, - `modified` datetime NOT NULL, - `sessdata` longtext COLLATE utf8_unicode_ci, - PRIMARY KEY (`sesskey`), - KEY `sess2_expiry` (`expiry`), - KEY `sess2_expireref` (`expireref`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_settings_global` --- - -CREATE TABLE `lime_settings_global` ( - `stg_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `stg_value` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - PRIMARY KEY (`stg_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- --- Dumping data for table `lime_settings_global` --- - -INSERT INTO `lime_settings_global` (`stg_name`, `stg_value`) VALUES('DBVersion', '155.6'); -INSERT INTO `lime_settings_global` (`stg_name`, `stg_value`) VALUES('SessionName', 'ls28629164789259281352'); - --- -------------------------------------------------------- - --- --- Table structure for table `lime_surveys` --- - -CREATE TABLE `lime_surveys` ( - `sid` int(11) NOT NULL, - `owner_id` int(11) NOT NULL, - `admin` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `active` char(1) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'N', - `expires` datetime DEFAULT NULL, - `startdate` datetime DEFAULT NULL, - `adminemail` varchar(320) COLLATE utf8_unicode_ci DEFAULT NULL, - `anonymized` char(1) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'N', - `faxto` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL, - `format` char(1) COLLATE utf8_unicode_ci DEFAULT NULL, - `savetimings` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `template` varchar(100) COLLATE utf8_unicode_ci DEFAULT 'default', - `language` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `additional_languages` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `datestamp` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `usecookie` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `allowregister` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `allowsave` char(1) COLLATE utf8_unicode_ci DEFAULT 'Y', - `autonumber_start` bigint(11) DEFAULT '0', - `autoredirect` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `allowprev` char(1) COLLATE utf8_unicode_ci DEFAULT 'Y', - `printanswers` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `ipaddr` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `refurl` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `datecreated` date DEFAULT NULL, - `publicstatistics` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `publicgraphs` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `listpublic` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `htmlemail` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `tokenanswerspersistence` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `assessments` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `usecaptcha` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `usetokens` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `bounce_email` varchar(320) COLLATE utf8_unicode_ci DEFAULT NULL, - `attributedescriptions` text COLLATE utf8_unicode_ci, - `emailresponseto` text COLLATE utf8_unicode_ci, - `emailnotificationto` text COLLATE utf8_unicode_ci, - `tokenlength` tinyint(2) DEFAULT '15', - `showxquestions` char(1) COLLATE utf8_unicode_ci DEFAULT 'Y', - `showgroupinfo` char(1) COLLATE utf8_unicode_ci DEFAULT 'B', - `shownoanswer` char(1) COLLATE utf8_unicode_ci DEFAULT 'Y', - `showqnumcode` char(1) COLLATE utf8_unicode_ci DEFAULT 'X', - `bouncetime` bigint(20) DEFAULT NULL, - `bounceprocessing` varchar(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `bounceaccounttype` varchar(4) COLLATE utf8_unicode_ci DEFAULT NULL, - `bounceaccounthost` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL, - `bounceaccountpass` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `bounceaccountencryption` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL, - `bounceaccountuser` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL, - `showwelcome` char(1) COLLATE utf8_unicode_ci DEFAULT 'Y', - `showprogress` char(1) COLLATE utf8_unicode_ci DEFAULT 'Y', - `allowjumps` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `navigationdelay` tinyint(2) DEFAULT '0', - `nokeyboard` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `alloweditaftercompletion` char(1) COLLATE utf8_unicode_ci DEFAULT 'N', - `googleanalyticsstyle` char(1) COLLATE utf8_unicode_ci DEFAULT NULL, - `googleanalyticsapikey` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL, - PRIMARY KEY (`sid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_surveys_languagesettings` --- - -CREATE TABLE `lime_surveys_languagesettings` ( - `surveyls_survey_id` int(11) NOT NULL DEFAULT '0', - `surveyls_language` varchar(45) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'en', - `surveyls_title` varchar(200) COLLATE utf8_unicode_ci NOT NULL, - `surveyls_description` text COLLATE utf8_unicode_ci, - `surveyls_welcometext` text COLLATE utf8_unicode_ci, - `surveyls_endtext` text COLLATE utf8_unicode_ci, - `surveyls_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `surveyls_urldescription` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `surveyls_email_invite_subj` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `surveyls_email_invite` text COLLATE utf8_unicode_ci, - `surveyls_email_remind_subj` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `surveyls_email_remind` text COLLATE utf8_unicode_ci, - `surveyls_email_register_subj` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `surveyls_email_register` text COLLATE utf8_unicode_ci, - `surveyls_email_confirm_subj` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `surveyls_email_confirm` text COLLATE utf8_unicode_ci, - `surveyls_dateformat` int(10) unsigned NOT NULL DEFAULT '1', - `email_admin_notification_subj` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `email_admin_notification` text COLLATE utf8_unicode_ci, - `email_admin_responses_subj` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `email_admin_responses` text COLLATE utf8_unicode_ci, - `surveyls_numberformat` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`surveyls_survey_id`,`surveyls_language`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_survey_links` --- - -CREATE TABLE `lime_survey_links` ( - `participant_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL, - `token_id` int(11) NOT NULL, - `survey_id` int(11) NOT NULL, - `date_created` datetime NOT NULL, - PRIMARY KEY (`participant_id`,`token_id`,`survey_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_survey_permissions` --- - -CREATE TABLE `lime_survey_permissions` ( - `sid` int(11) NOT NULL, - `uid` int(11) NOT NULL, - `permission` varchar(20) COLLATE utf8_unicode_ci NOT NULL, - `create_p` tinyint(1) NOT NULL DEFAULT '0', - `read_p` tinyint(1) NOT NULL DEFAULT '0', - `update_p` tinyint(1) NOT NULL DEFAULT '0', - `delete_p` tinyint(1) NOT NULL DEFAULT '0', - `import_p` tinyint(1) NOT NULL DEFAULT '0', - `export_p` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`sid`,`uid`,`permission`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_templates` --- - -CREATE TABLE `lime_templates` ( - `folder` varchar(255) COLLATE utf8_unicode_ci NOT NULL, - `creator` int(11) NOT NULL, - PRIMARY KEY (`folder`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_templates_rights` --- - -CREATE TABLE `lime_templates_rights` ( - `uid` int(11) NOT NULL, - `folder` varchar(255) COLLATE utf8_unicode_ci NOT NULL, - `use` int(1) NOT NULL, - PRIMARY KEY (`uid`,`folder`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - -- -- Table structure for table `lime_users` -- @@ -959,33 +403,6 @@ INSERT INTO `lime_users` (`uid`, `users_name`, `password`, `full_name`, `parent_ -- -------------------------------------------------------- --- --- Table structure for table `lime_user_groups` --- - -CREATE TABLE `lime_user_groups` ( - `ugid` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(20) COLLATE utf8_unicode_ci NOT NULL, - `description` text COLLATE utf8_unicode_ci NOT NULL, - `owner_id` int(11) NOT NULL, - PRIMARY KEY (`ugid`), - UNIQUE KEY `name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Table structure for table `lime_user_in_groups` --- - -CREATE TABLE `lime_user_in_groups` ( - `ugid` int(11) NOT NULL, - `uid` int(11) NOT NULL, - PRIMARY KEY (`ugid`,`uid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - -- -- Table structure for table `operator` -- @@ -1226,7 +643,9 @@ CREATE TABLE `questionnaire` ( `lime_endurl` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Forwarding end URL for respondent self completion', `enabled` tinyint(1) NOT NULL DEFAULT '1', `outcomes` varchar(256) COLLATE utf8_unicode_ci NULL DEFAULT '1,2,3,7,9,10,14,17,18,19' COMMENT 'Comma-separated string of outcomes defined for the questionnaire', - PRIMARY KEY (`questionnaire_id`) + `remote_id` int(11) NOT NULL, + PRIMARY KEY (`questionnaire_id`), + KEY `remote_id` (`remote_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -------------------------------------------------------- diff --git a/functions/functions.limesurvey.php b/functions/functions.limesurvey.php index 04570aa3..b071d0a6 100644 --- a/functions/functions.limesurvey.php +++ b/functions/functions.limesurvey.php @@ -71,6 +71,31 @@ function limerpc_init ($url,$user,$pass) return true; } +function get_token_value($questionnaire_id,$token, $value = 'sent') +{ + global $limeRPC; + global $limeKey; + global $db; + + $sql = "SELECT r.rpc_url, r.username, r.password, r.description, q.lime_id + FROM remote as r, questionnaire as q + WHERE q.questoinnaire_d = '$questionnaire_id' + AND q.remote_id = r.id"; + + $r = $db->GetRow($sql); + + $ret = false; + + if (limerpc_init($r['rpc_url'],$r['username'],$r['password']) === true) { + $l = $limeRPC->get_participant_properties($limeKey,$r['lime_id'],array('token'=>$token),array($value)); + if (isset($l[$value]) { + $ret= $l[$value]; + } + } + + return $ret; +} + function get_survey_list () {