" . T_("Create an instrument in Limesurvey") ."";
}
?>
-
-
editor("rs_intro","",$ckeditorConfig);?>
-
editor("rs_project_intro","",$ckeditorConfig);?>
-
editor("rs_callback","",$ckeditorConfig);?>
-
editor("rs_answeringmachine","",$ckeditorConfig);?>
+
+
+
+
+
+
:
+
:
+$entry";
+ }
+ }
+ closedir($handle);
+}
+?>
+
+
:
-
editor("rs_project_end","",$ckeditorConfig); ?>
-
editor("info","",$ckeditorConfig);?>
-
+
+
editor("rs_intro","",$ckeditorConfig);?>
+
editor("rs_project_intro","",$ckeditorConfig);?>
+
editor("rs_callback","",$ckeditorConfig);?>
+
editor("rs_answeringmachine","",$ckeditorConfig);?>
+
+
editor("rs_project_end","",$ckeditorConfig); ?>
+
editor("info","",$ckeditorConfig);?>
+
- $val)
+ $operator_id = intval($_POST['operator_id']);
+ $voip = $enabled = 0;
+ if (isset($_POST['voip'])) $voip = 1;
+ if (isset($_POST['enabled'])) $enabled = 1;
+
+ if (HTPASSWD_PATH !== false && $_POST['existing_username'] != $_POST['username'] && empty($_POST['password']))
{
- if (substr($key,0,8) == "password")
+ $msg = T_("If changing usernames, you must specify a new password");
+ }
+ else
+ {
+ $sql = "UPDATE operator
+ SET username = " . $db->qstr($_POST['username']) . ",
+ lastName = " . $db->qstr($_POST['lastName']) . ",
+ firstName = " . $db->qstr($_POST['firstName']) . ",
+ extension = " . $db->qstr($_POST['extension']) . ",
+ extension_password = " . $db->qstr($_POST['extension_password']) . ",
+ Time_zone_name = " . $db->qstr($_POST['timezone']) . ",
+ voip = $voip, enabled = $enabled
+ WHERE operator_id = $operator_id";
+
+ $rs = $db->Execute($sql);
+
+ if (!empty($rs))
{
- if (HTPASSWD_PATH !== false)
+ if (HTPASSWD_PATH !== false && !empty($_POST['password']))
{
- $operator_id = intval(substr($key,8));
//update password in htaccess
include_once(dirname(__FILE__).'/../functions/functions.htpasswd.php');
$htp = New Htpasswd(HTPASSWD_PATH);
- $htp->deleteUser($_POST["username" . $operator_id]);
- $htp->addUser($_POST["username" . $operator_id],$val);
+ $htp->deleteUser($_POST["existing_username"]);
+ $htp->deleteUser($_POST["username"]);
+ $htp->addUser($_POST["username"],$_POST["password"]);
}
+
+ $msg = T_("Successfully updated user");
}
- else if (substr($key,0,8) == "timezone")
+ else
{
- $operator_id = intval(substr($key,8));
- $tzone = $db->qstr($val);
- $sql = "UPDATE operator
- SET Time_zone_name = $tzone
- WHERE operator_id = '$operator_id'";
- $db->Execute($sql);
+ $msg = T_("Failed to update user. Please make sure the username and extension are unique");
}
}
+ $_GET['edit'] = $operator_id;
}
+
+if (isset($_GET['edit']))
+{
+ xhtml_head(T_("Operator edit"),true,array("../css/table.css"));
+
+ $operator_id = intval($_GET['edit']);
+
+ $sql = "SELECT *,
+ CONCAT('
', (SELECT GROUP_CONCAT(CONCAT('', Time_zone_name, ' ') SEPARATOR '') as tzones
+ FROM timezone_template),' ') as timezone
+ FROM operator
+ WHERE operator_id = $operator_id";
+
+ $rs = $db->GetRow($sql);
+
+ print "
" . T_("Edit") . ": " . $rs['username'] . " ";
+ echo "
" . T_("Go back") . "
";
+ if (!empty($msg)) print "
$msg ";
+
+ ?>
+
+ " . T_("Enable VoIP") . "')
ELSE
CONCAT('
" . T_("Disable VoIP") . " ')
- END
- as voipenabledisable,
+ END as voipenabledisable,
+ CONCAT('
" . T_("Edit") . " ') as edit,
username
FROM operator";
@@ -184,8 +252,8 @@ if ($display)
xhtml_head(T_("Operator list"),true,array("../css/table.css"));
- $columns = array("name","username","enabledisable","timezone");
- $titles = array(T_("Operator"),T_("Username"),T_("Enable/Disable"),T_("Update timezone"));
+ $columns = array("name","username","enabledisable","edit");
+ $titles = array(T_("Operator"),T_("Username"),T_("Enable/Disable"),T_("Edit"));
if (VOIP_ENABLED)
{
@@ -202,12 +270,6 @@ if ($display)
$titles[] = T_("*nix VoIP");
}
- if (HTPASSWD_PATH !== false)
- {
- $columns[] = "password";
- $titles[] = T_("Update password");
- }
-
xhtml_table($rs,$columns,$titles);
diff --git a/admin/operatorperformance.php b/admin/operatorperformance.php
index 2691dbbd..a0549554 100644
--- a/admin/operatorperformance.php
+++ b/admin/operatorperformance.php
@@ -1,5 +1,4 @@
-
-
-
-
-
+GetAll($sql);
?>
-
-
-
+
+
+
-
-
-" . T_("Add an availability group to this questionnaire:") . "";
?>
- StartTrans();
+
+ $sql = "DELETE FROM `appointment`
+ WHERE case_id IN
+ (SELECT case_id
+ FROM `case`
+ WHERE questionnaire_id = $questionnaire_id)";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `call`
+ WHERE case_id IN
+ (SELECT case_id
+ FROM `case`
+ WHERE questionnaire_id = $questionnaire_id)";
+
+ $db->Execute($sql);
+
+
+ $sql = "DELETE FROM `call_attempt`
+ WHERE case_id IN
+ (SELECT case_id
+ FROM `case`
+ WHERE questionnaire_id = $questionnaire_id)";
+
+ $db->Execute($sql);
+
+
+ $sql = "DELETE FROM `case_availability`
+ WHERE case_id IN
+ (SELECT case_id
+ FROM `case`
+ WHERE questionnaire_id = $questionnaire_id)";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `case_note`
+ WHERE case_id IN
+ (SELECT case_id
+ FROM `case`
+ WHERE questionnaire_id = $questionnaire_id)";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `contact_phone`
+ WHERE case_id IN
+ (SELECT case_id
+ FROM `case`
+ WHERE questionnaire_id = $questionnaire_id)";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `respondent`
+ WHERE case_id IN
+ (SELECT case_id
+ FROM `case`
+ WHERE questionnaire_id = $questionnaire_id)";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `client_questionnaire`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `operator_questionnaire`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire_availability`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire_prefill`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire_sample`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire_sample_exclude_priority`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire_sample_priority`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire_sample_quota`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire_sample_quota_row`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire_sample_quota_row_exclude`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `shift_report`
+ WHERE shift_id IN
+ (SELECT shift_id
+ FROM `shift`
+ WHERE questionnaire_id = $questionnaire_id)";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `shift`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `case`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $sql = "DELETE FROM `questionnaire`
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+
+ $db->CompleteTrans();
+
+}
+
if (isset($_GET['disable']))
{
$questionnaire_id = intval($_GET['disable']);
@@ -86,8 +229,10 @@ if (isset($_POST['update']) && isset($_GET['modify']))
$ras =0;
$rws = 0;
$rs = 0;
+ $respsc = 0;
if (isset($_POST['ras'])) $ras = 1;
if (isset($_POST['rws'])) $rws = 1;
+ if (isset($_POST['respsc'])) $respsc = 1;
$name = $db->qstr(html_entity_decode($_POST['description']));
if (isset($_POST['rs_intro']))
@@ -102,7 +247,7 @@ if (isset($_POST['update']) && isset($_GET['modify']))
$rs_project_end = $db->qstr(html_entity_decode($_POST['rs_project_end'],true));
$sql = "UPDATE questionnaire
- SET description = $name, info = $info, rs_project_end = $rs_project_end, restrict_appointments_shifts = '$ras', restrict_work_shifts = '$rws'
+ SET description = $name, info = $info, rs_project_end = $rs_project_end, restrict_appointments_shifts = '$ras', restrict_work_shifts = '$rws', self_complete = $respsc
WHERE questionnaire_id = '$questionnaire_id'";
$db->Execute($sql);
@@ -116,10 +261,22 @@ if (isset($_POST['update']) && isset($_GET['modify']))
$db->Execute($sql);
}
-
+ if ($respsc == 1)
+ {
+ $lime_mode = $db->qstr($_POST['lime_mode'],get_magic_quotes_gpc());
+ $lime_template = $db->qstr($_POST['lime_template'],get_magic_quotes_gpc());
+ $lime_endurl = $db->qstr($_POST['lime_endurl'],get_magic_quotes_gpc());
+
+ $sql = "UPDATE questionnaire
+ SET lime_mode = $lime_mode, lime_template = $lime_template, lime_endurl = $lime_endurl
+ WHERE questionnaire_id = $questionnaire_id";
+
+ $db->Execute($sql);
+ }
+
}
-xhtml_head(T_("Questionnaire list"),true,array("../css/table.css"));
+xhtml_head(T_("Questionnaire list"),true,array("../css/table.css"),array("../js/new.js"));
if (isset($_GET['modify']))
@@ -150,38 +307,93 @@ if (isset($_GET['modify']))
$rs = $db->GetRow($sql);
- $testing = $rws = $ras = "checked=\"checked\"";
-
+ $testing = $rws = $ras = $rsc = "checked=\"checked\"";
+ $rscd = "";
+
+ $aio = $qbq = $gat = "";
+ if ($rs['lime_mode'] == "survey") $aio = "selected=\"selected\"";
+ if ($rs['lime_mode'] == "question") $qbq = "selected=\"selected\"";
+ if ($rs['lime_mode'] == "group") $gat = "selected=\"selected\"";
+
+
if ($rs['restrict_appointments_shifts'] != 1) $ras = "";
if ($rs['restrict_work_shifts'] != 1) $rws = "";
if ($rs['testing'] != 1) $testing = "";
+ if ($rs['self_complete'] == 0)
+ {
+ $rsc = "";
+ $rscd = "style='display:none;'";
+ }
echo "
" . $rs['description'] . " ";
echo "
" . T_("Go back") . "
";
echo "
" . T_("Edit instrument in Limesurvey") . "
";
?>
-
- GetRow($sql);
+
+ echo "
" . $rs['description'] . " ";
+
+ echo "
" . T_("Go back") . "
";
+
+ print "
" . T_("Any collected data and the limesurvey instrument will NOT be deleted") . "
";
+ print "
" . T_("The questionnaire will be deleted from queXS including call history, cases, case notes, respondent details, appointments and the links between operators, clients and the questionnaire") . "
";
+ print "
" . T_("Please confirm you wish to delete the questionnaire") . "
";
+
+ print "
";
+}
else
{
- $columns = array("description","enabledisable","modify");
- $titles = array(T_("Questionnaire"),T_("Enable/Disable"),("Modify"));
+ $columns = array("description","enabledisable","modify","deletee");
+ $titles = array(T_("Questionnaire"),T_("Enable/Disable"),T_("Modify"),T_("Delete"));
$sql = "SELECT
description,
@@ -191,7 +403,8 @@ else
CONCAT('
" . T_("Disable") . " ')
END
as enabledisable,
- CONCAT('
" . T_("Modify"). " ') as modify
+ CONCAT('
" . T_("Modify"). " ') as modify,
+ CONCAT('
" . T_("Delete"). " ') as deletee
FROM questionnaire";
$rs = $db->GetAll($sql);
diff --git a/admin/questionnaireprefill.php b/admin/questionnaireprefill.php
index bc1542d4..58e6a7d1 100644
--- a/admin/questionnaireprefill.php
+++ b/admin/questionnaireprefill.php
@@ -1,4 +1,4 @@
-
-
- GetRow($sql);
diff --git a/admin/quotarow.php b/admin/quotarow.php
index 6d04510d..93f056b7 100755
--- a/admin/quotarow.php
+++ b/admin/quotarow.php
@@ -1,4 +1,4 @@
-
-
-
-
-
-
-
-
-
+
- " . T_("Assign this case to operator (will appear as next case for them)") . "";
?>
- " . T_("Add a Timezone:") . "";
?>
- CompleteTrans();
@@ -129,12 +131,12 @@ if(isset($_GET['respondent_id']) && $_GET['respondent_id'] == 0)
{
//ability to create a new one
?>
-
+
-
-
+
-
-
+
- GetAll($sql);
@@ -133,7 +134,17 @@ function display_outcomes($contacted,$ca,$case_id)
print "
";
if (!empty($rs))
{
- $do = false;
+ $lime_sid = get_limesurvey_id(get_operator_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);
+
if (isset($_GET['defaultoutcome'])) $do = bigintval($_GET['defaultoutcome']);
foreach($rs as $r)
{
diff --git a/call_interface2.php b/call_interface2.php
index 3b0f0c96..f31c7866 100644
--- a/call_interface2.php
+++ b/call_interface2.php
@@ -1,4 +1,4 @@
-
-
+
-
-
+
-
+ * @copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2013
+ * @package queXS
+ * @subpackage user
+ * @link http://www.acspri.org.au/ queXS was writen for ACSPRI
+ * @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2
+ *
+ */
+
+/**
+ * Configuration file
+ */
+include ("config.inc.php");
+
+/**
+ * Database file
+ */
+include ("db.inc.php");
+
+/**
+ * XHTML functions
+ */
+include ("functions/functions.xhtml.php");
+
+/**
+ * Operator functions
+ */
+include("functions/functions.operator.php");
+
+/**
+ * Input functions
+ */
+include("functions/functions.input.php");
+
+/**
+ * LimeSurvey functions
+ */
+include("functions/functions.limesurvey.php");
+
+
+global $db;
+
+$operator_id = get_operator_id();
+
+$msg = "";
+
+if (isset($_POST['firstname']))
+{
+ //validate email address
+ if (validate_email($_POST['email']))
+ {
+ $case_id = get_case_id($operator_id);
+ $lime_sid = get_lime_sid($case_id);
+ $ca = get_call_attempt($operator_id);
+ $token = get_token($case_id);
+ $email = $db->qstr($_POST['email']);
+ $firstname = $db->qstr($_POST['firstname']);
+ $lastname = $db->qstr($_POST['lastname']);
+
+ //update the limesurvey database email details
+ $sql = "UPDATE " . LIME_PREFIX ."tokens_{$lime_sid}
+ SET email = $email, firstname = $firstname, lastname = $lastname, emailstatus = 'OK'
+ WHERE token = '$token'";
+
+ $db->Execute($sql);
+
+ //Send email
+ include_once("include/limesurvey/classes/phpmailer/class.phpmailer.php");
+ $fieldsarray = array();
+ $fieldsarray["{EMAIL}"]=$_POST['email'];
+ $fieldsarray["{FIRSTNAME}"]=$_POST['firstname'];
+ $fieldsarray["{LASTNAME}"]=$_POST['lastname'];
+ $fieldsarray["{TOKEN}"]=$token;
+ $fieldsarray["{LANGUAGE}"]=DEFAULT_LOCALE;
+ $fieldsarray["{SID}"]=$fieldsarray["{SURVEYID}"]=$lime_sid;
+ //$fieldsarray["{SURVEYNAME}"]=$thissurvey["surveyls_title"];
+
+ $sql = "SELECT s.var,s.val
+ FROM `sample_var` as s, `case` as c
+ WHERE c.case_id = $case_id
+ AND s.sample_id = c.sample_id";
+
+ $attributes = $db->GetAssoc($sql);
+
+ //Assign sample variables
+ foreach ($attributes as $attributefield=>$val)
+ {
+ $fieldsarray['{SAMPLE:'.strtoupper($attributefield).'}']=$val;
+ }
+
+ $fieldsarray["{OPTOUTURL}"]=LIME_URL . "optout.php?lang=".trim(DEFAULT_LOCALE)."&sid=$lime_sid&token={$token}";
+ $fieldsarray["{SURVEYURL}"]=LIME_URL . "index.php?lang=".trim(DEFAULT_LOCALE)."&sid=$lime_sid&token={$token}";
+ $barebone_link=$fieldsarray["{SURVEYURL}"];
+
+ $customheaders = array( '1' => "X-surveyid: ".$lime_sid, '2' => "X-tokenid: ".$fieldsarray["{TOKEN}"]);
+
+ $sql = "SELECT surveyls_email_invite_subj, surveyls_email_invite
+ FROM `lime_surveys_languagesettings`
+ WHERE `surveyls_survey_id` = $lime_sid
+ order by surveyls_language LIKE '" . DEFAULT_LOCALE . "' DESC";
+
+ $econtent = $db->GetRow($sql);
+
+ $modsubject = $econtent['surveyls_email_invite_subj'];
+ $modmessage = $econtent['surveyls_email_invite'];
+
+ foreach ( $fieldsarray as $key => $value )
+ {
+ $modsubject=str_replace($key, $value, $modsubject);
+ }
+
+ foreach ( $fieldsarray as $key => $value )
+ {
+ $modmessage=str_replace($key, $value, $modmessage);
+ }
+
+ $modsubject = str_replace("@@SURVEYURL@@", $barebone_link, $modsubject);
+ $modmessage = str_replace("@@SURVEYURL@@", $barebone_link, $modmessage);
+
+ $mail = new PHPMailer;
+
+ $sql = "SELECT stg_value
+ FROM " . LIME_PREFIX . "settings_global
+ WHERE stg_name LIKE 'siteadminemail'";
+
+ $fromemail = $db->GetOne($sql);
+
+ $sql = "SELECT stg_value
+ FROM " . LIME_PREFIX . "settings_global
+ WHERE stg_name LIKE 'siteadminname'";
+
+ $fromname = $db->GetOne($sql);
+
+ $mail->SetFrom($fromemail,$fromname);
+ $mail->AddAddress($_POST['email']);
+ foreach ($customheaders as $key=>$val)
+ {
+ $mail->AddCustomHeader($val);
+ }
+ $mail->AddCustomHeader("X-Surveymailer: queXS Emailer (quexs.sourceforge.net)");
+
+ $mail->IsHTML(true);
+ $mail->Body = $modmessage;
+ $mail->AltBody = trim(strip_tags(html_entity_decode($modmessage,ENT_QUOTES,'UTF-8')));
+ $mail->Subject = $modsubject;
+
+
+ if ($mail->Send())
+ {
+ // Put call attempt id in to sent
+ $sql = "UPDATE ". LIME_PREFIX . "tokens_{$lime_sid}
+ SET sent='$ca'
+ WHERE token='$token'";
+
+ $db->Execute($sql);
+
+ //Add a note that sent
+
+ $sql = "INSERT INTO `case_note` (case_id,operator_id,note,datetime)
+ VALUES ($case_id,$operator_id,'" . T_("Self completion invitation sent via email to") . ": " . $_POST['email'] . "',CONVERT_TZ(NOW(),'System','UTC'))";
+
+ $db->Execute($sql);
+
+
+ if (isset($_POST['submith']))
+ {
+ end_call($operator_id,41); //end with outcome sent
+ if (is_voip_enabled($operator_id))
+ {
+ include("functions/functions.voip.php");
+ $v = new voip();
+ $v->connect(VOIP_SERVER);
+ $v->hangup(get_extension($operator_id));
+ }
+ //disable recording
+ $newtext = T_("Start REC");
+ $js = "js/window.js";
+ if (browser_ie()) $js = "js/window_ie6.js";
+ if (isset($_GET['interface2']))
+ {
+ xhtml_head(T_("Email"),true,array("css/call.css"),array($js),"onload='openParent(\"endcase=endcase\");'");
+ }
+ else
+ {
+ xhtml_head(T_("Email"),true,array("css/call.css"),array($js),"onload='toggleRec(\"$newtext\",\"record.php?start=start\",\"offline\"); openParentObject(\"main-content\",\"" . get_respondentselection_url($operator_id) . "\"); parent.closePopup();'");
+ }
+
+ }
+ else if (isset($_POST['submit']))
+ {
+ xhtml_head(T_("Email"),true,array("css/call.css"),array($js),"onload='parent.closePopup();'");
+ }
+ xhtml_foot();
+ die();
+ }
+ else
+ {
+ $msg = T_("The email did not send");
+ }
+ }
+ else
+ {
+ $msg = T_("The email address is not valid");
+ }
+}
+
+$case_id = get_case_id($operator_id);
+
+$js = "js/window.js";
+if (browser_ie()) $js = "js/window_ie6.js";
+
+xhtml_head(T_("Email"),true,array("css/call.css"),array($js));
+
+$sql = "SELECT q.self_complete
+ FROM questionnaire as q, `case` as c
+ WHERE c.case_id = $case_id
+ AND c.questionnaire_id = q.questionnaire_id";
+
+$sc = $db->GetOne($sql);
+
+if ($sc == 1)
+{
+ $sql = "SELECT sv1.val as firstname, sv2.val as lastname, sv3.val as email
+ FROM `case` as c
+ LEFT JOIN sample_var as sv1 on (sv1.sample_id = c.sample_id AND sv1.type = 6)
+ LEFT JOIN sample_var as sv2 on (sv2.sample_id = c.sample_id AND sv2.type = 7)
+ LEFT JOIN sample_var as sv3 on (sv3.sample_id = c.sample_id AND sv3.type = 8)
+ WHERE c.case_id = $case_id";
+
+ $rs = $db->GetRow($sql);
+
+ print "
" . T_("Email respondent for self completion") . "
";
+ if (!empty($msg)) print "
$msg
";
+ print "
";
+}
+else
+{
+ print "
" . T_("Self completion email not available for this questionnaire") . "
";
+}
+
+xhtml_foot();
+
+?>
diff --git a/endwork.php b/endwork.php
index c27f01ce..59ab7f20 100644
--- a/endwork.php
+++ b/endwork.php
@@ -1,4 +1,4 @@
-S
S
-fetch() ) {
@@ -564,7 +567,7 @@ function display_calendar($respondent_id, $questionnaire_id, $year = false, $mon
- " . date('l j F Y',mktime(0,0,0,$month,$day,$year)) . "
";
}
diff --git a/functions/functions.client.php b/functions/functions.client.php
index 6eff5078..d1ec7479 100644
--- a/functions/functions.client.php
+++ b/functions/functions.client.php
@@ -1,4 +1,4 @@
-
+ * @since 2013-02-26
+ */
+function strip_comments($comment, $email, $replace=''){
+
+ while (1){
+ $new = preg_replace("!$comment!", $replace, $email);
+ if (strlen($new) == strlen($email)){
+ return $email;
+ }
+ $email = $new;
+ }
+}
+
+
+/*function validate_email($email)
+{
+// Create the syntactical validation regular expression
+// Validate the syntax
+
+// see http://data.iana.org/TLD/tlds-alpha-by-domain.txt
+$maxrootdomainlength = 6;
+return ( ! preg_match("/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,".$maxrootdomainlength."}))$/ix", $email)) ? FALSE : TRUE;
+}*/
+
+function validate_email($email){
+
+
+ $no_ws_ctl = "[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]";
+ $alpha = "[\\x41-\\x5a\\x61-\\x7a]";
+ $digit = "[\\x30-\\x39]";
+ $cr = "\\x0d";
+ $lf = "\\x0a";
+ $crlf = "(?:$cr$lf)";
+
+
+ $obs_char = "[\\x00-\\x09\\x0b\\x0c\\x0e-\\x7f]";
+ $obs_text = "(?:$lf*$cr*(?:$obs_char$lf*$cr*)*)";
+ $text = "(?:[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f]|$obs_text)";
+
+
+ $text = "(?:$lf*$cr*$obs_char$lf*$cr*)";
+ $obs_qp = "(?:\\x5c[\\x00-\\x7f])";
+ $quoted_pair = "(?:\\x5c$text|$obs_qp)";
+
+
+ $wsp = "[\\x20\\x09]";
+ $obs_fws = "(?:$wsp+(?:$crlf$wsp+)*)";
+ $fws = "(?:(?:(?:$wsp*$crlf)?$wsp+)|$obs_fws)";
+ $ctext = "(?:$no_ws_ctl|[\\x21-\\x27\\x2A-\\x5b\\x5d-\\x7e])";
+ $ccontent = "(?:$ctext|$quoted_pair)";
+ $comment = "(?:\\x28(?:$fws?$ccontent)*$fws?\\x29)";
+ $cfws = "(?:(?:$fws?$comment)*(?:$fws?$comment|$fws))";
+
+
+ $outer_ccontent_dull = "(?:$fws?$ctext|$quoted_pair)";
+ $outer_ccontent_nest = "(?:$fws?$comment)";
+ $outer_comment = "(?:\\x28$outer_ccontent_dull*(?:$outer_ccontent_nest$outer_ccontent_dull*)+$fws?\\x29)";
+
+
+
+ $atext = "(?:$alpha|$digit|[\\x21\\x23-\\x27\\x2a\\x2b\\x2d\\x2f\\x3d\\x3f\\x5e\\x5f\\x60\\x7b-\\x7e])";
+ $atext_domain = "(?:$alpha|$digit|[\\x2b\\x2d\\x5f])";
+
+ $atom = "(?:$cfws?(?:$atext)+$cfws?)";
+ $atom_domain = "(?:$cfws?(?:$atext_domain)+$cfws?)";
+
+
+ $qtext = "(?:$no_ws_ctl|[\\x21\\x23-\\x5b\\x5d-\\x7e])";
+ $qcontent = "(?:$qtext|$quoted_pair)";
+ $quoted_string = "(?:$cfws?\\x22(?:$fws?$qcontent)*$fws?\\x22$cfws?)";
+
+
+ $quoted_string = "(?:$cfws?\\x22(?:$fws?$qcontent)+$fws?\\x22$cfws?)";
+ $word = "(?:$atom|$quoted_string)";
+
+
+ $obs_local_part = "(?:$word(?:\\x2e$word)*)";
+
+
+ $obs_domain = "(?:$atom_domain(?:\\x2e$atom_domain)*)";
+
+ $dot_atom_text = "(?:$atext+(?:\\x2e$atext+)*)";
+ $dot_atom_text_domain = "(?:$atext_domain+(?:\\x2e$atext_domain+)*)";
+
+
+ $dot_atom = "(?:$cfws?$dot_atom_text$cfws?)";
+ $dot_atom_domain = "(?:$cfws?$dot_atom_text_domain$cfws?)";
+
+
+ $dtext = "(?:$no_ws_ctl|[\\x21-\\x5a\\x5e-\\x7e])";
+ $dcontent = "(?:$dtext|$quoted_pair)";
+ $domain_literal = "(?:$cfws?\\x5b(?:$fws?$dcontent)*$fws?\\x5d$cfws?)";
+
+
+ $local_part = "(($dot_atom)|($quoted_string)|($obs_local_part))";
+ $domain = "(($dot_atom_domain)|($domain_literal)|($obs_domain))";
+ $addr_spec = "$local_part\\x40$domain";
+
+
+ if (strlen($email) > 256) return FALSE;
+
+
+ $email = strip_comments($outer_comment, $email, "(x)");
+
+
+
+ if (!preg_match("!^$addr_spec$!", $email, $m)){
+
+ return FALSE;
+ }
+
+ $bits = array(
+ 'local' => isset($m[1]) ? $m[1] : '',
+ 'local-atom' => isset($m[2]) ? $m[2] : '',
+ 'local-quoted' => isset($m[3]) ? $m[3] : '',
+ 'local-obs' => isset($m[4]) ? $m[4] : '',
+ 'domain' => isset($m[5]) ? $m[5] : '',
+ 'domain-atom' => isset($m[6]) ? $m[6] : '',
+ 'domain-literal' => isset($m[7]) ? $m[7] : '',
+ 'domain-obs' => isset($m[8]) ? $m[8] : '',
+ );
+
+
+
+ $bits['local'] = strip_comments($comment, $bits['local']);
+ $bits['domain'] = strip_comments($comment, $bits['domain']);
+
+
+
+
+ if (strlen($bits['local']) > 64) return FALSE;
+ if (strlen($bits['domain']) > 255) return FALSE;
+
+
+
+ if (strlen($bits['domain-literal'])){
+
+ $Snum = "(\d{1,3})";
+ $IPv4_address_literal = "$Snum\.$Snum\.$Snum\.$Snum";
+
+ $IPv6_hex = "(?:[0-9a-fA-F]{1,4})";
+
+ $IPv6_full = "IPv6\:$IPv6_hex(:?\:$IPv6_hex){7}";
+
+ $IPv6_comp_part = "(?:$IPv6_hex(?:\:$IPv6_hex){0,5})?";
+ $IPv6_comp = "IPv6\:($IPv6_comp_part\:\:$IPv6_comp_part)";
+
+ $IPv6v4_full = "IPv6\:$IPv6_hex(?:\:$IPv6_hex){5}\:$IPv4_address_literal";
+
+ $IPv6v4_comp_part = "$IPv6_hex(?:\:$IPv6_hex){0,3}";
+ $IPv6v4_comp = "IPv6\:((?:$IPv6v4_comp_part)?\:\:(?:$IPv6v4_comp_part\:)?)$IPv4_address_literal";
+
+
+
+ if (preg_match("!^\[$IPv4_address_literal\]$!", $bits['domain'], $m)){
+
+ if (intval($m[1]) > 255) return FALSE;
+ if (intval($m[2]) > 255) return FALSE;
+ if (intval($m[3]) > 255) return FALSE;
+ if (intval($m[4]) > 255) return FALSE;
+
+ }else{
+
+
+ while (1){
+
+ if (preg_match("!^\[$IPv6_full\]$!", $bits['domain'])){
+ break;
+ }
+
+ if (preg_match("!^\[$IPv6_comp\]$!", $bits['domain'], $m)){
+ list($a, $b) = explode('::', $m[1]);
+ $folded = (strlen($a) && strlen($b)) ? "$a:$b" : "$a$b";
+ $groups = explode(':', $folded);
+ if (count($groups) > 6) return FALSE;
+ break;
+ }
+
+ if (preg_match("!^\[$IPv6v4_full\]$!", $bits['domain'], $m)){
+
+ if (intval($m[1]) > 255) return FALSE;
+ if (intval($m[2]) > 255) return FALSE;
+ if (intval($m[3]) > 255) return FALSE;
+ if (intval($m[4]) > 255) return FALSE;
+ break;
+ }
+
+ if (preg_match("!^\[$IPv6v4_comp\]$!", $bits['domain'], $m)){
+ list($a, $b) = explode('::', $m[1]);
+ $b = substr($b, 0, -1); # remove the trailing colon before the IPv4 address
+ $folded = (strlen($a) && strlen($b)) ? "$a:$b" : "$a$b";
+ $groups = explode(':', $folded);
+ if (count($groups) > 4) return FALSE;
+ break;
+ }
+
+ return FALSE;
+ }
+ }
+ }else{
+
+
+ $labels = explode('.', $bits['domain']);
+
+
+ if (count($labels) == 1) return FALSE;
+
+
+ foreach ($labels as $label){
+
+ if (strlen($label) > 63) return FALSE;
+ if (substr($label, 0, 1) == '-') return FALSE;
+ if (substr($label, -1) == '-') return FALSE;
+ }
+
+ if (preg_match('!^[0-9]+$!', array_pop($labels))) return FALSE;
+ }
+
+
+ return TRUE;
+}
+
/**
* Return the number of completions for a given
* questionnaire, where the given sample var has
@@ -65,7 +297,7 @@ function limesurvey_quota_replicate_completions($lime_sid,$questionnaire_id,$sam
JOIN `sample` as sam ON (c.sample_id = sam.sample_id AND sam.import_id = '$sample_import_id')
JOIN `sample_var` as sv ON (sv.sample_id = sam.sample_id AND sv.var LIKE '$var' AND sv.val LIKE '$val')
WHERE s.submitdate IS NOT NULL
- AND s.token = c.case_id";
+ AND s.token = c.token";
$rs = $db->GetRow($sql);
@@ -95,7 +327,7 @@ function limesurvey_quota_match($lime_sgqa,$lime_sid,$case_id,$value,$comparison
FROM " . LIME_PREFIX . "survey_$lime_sid as s
JOIN `case` as c ON (c.case_id = '$case_id')
JOIN `sample` as sam ON (c.sample_id = sam.sample_id)
- WHERE s.token = c.case_id
+ WHERE s.token = c.token
AND s.`$lime_sgqa` $comparison '$value'";
$rs = $db->GetRow($sql);
@@ -127,7 +359,7 @@ function limesurvey_quota_replicate_match($lime_sid,$case_id,$val,$var)
JOIN `case` as c ON (c.case_id = '$case_id')
JOIN `sample` as sam ON (c.sample_id = sam.sample_id)
JOIN `sample_var` as sv ON (sv.sample_id = sam.sample_id AND sv.var LIKE '$var' AND sv.val LIKE '$val')
- WHERE s.token = c.case_id";
+ WHERE s.token = c.token";
$rs = $db->GetRow($sql);
@@ -161,7 +393,7 @@ function limesurvey_quota_completions($lime_sgqa,$lime_sid,$questionnaire_id,$sa
JOIN `case` as c ON (c.questionnaire_id = '$questionnaire_id')
JOIN `sample` as sam ON (c.sample_id = sam.sample_id AND sam.import_id = '$sample_import_id')
WHERE s.submitdate IS NOT NULL
- AND s.token = c.case_id
+ AND s.token = c.token
AND s.`$lime_sgqa` $comparison '$value'";
$rs = $db->GetRow($sql);
@@ -272,7 +504,6 @@ function getRandomID()
-
/**
* Taken from admin/database.php in the LimeSurvey package
* With modifications
@@ -351,9 +582,10 @@ function get_lime_id($case_id)
$lime_sid = get_lime_sid($case_id);
if ($lime_sid == false) return false;
- $sql = "SELECT id
- FROM " . LIME_PREFIX . "survey_$lime_sid
- WHERE token = '$case_id'";
+ $sql = "SELECT s.id
+ FROM " . LIME_PREFIX . "survey_$lime_sid as s, `case` as c
+ WHERE c.case_id = '$case_id'
+ AND c.token = s.token";
$r = $db->GetRow($sql);
@@ -380,9 +612,10 @@ function get_lime_tid($case_id)
$lime_sid = get_lime_sid($case_id);
if ($lime_sid == false) return false;
- $sql = "SELECT tid
- FROM " . LIME_PREFIX . "tokens_$lime_sid
- WHERE token = '$case_id'";
+ $sql = "SELECT t.tid
+ FROM " . LIME_PREFIX . "tokens_$lime_sid as t, `case` as c
+ WHERE c.case_id = '$case_id'
+ AND c.token = t.token";
$r = $db->GetRow($sql);
@@ -431,9 +664,10 @@ function limesurvey_is_quota_full($case_id)
$lime_sid = get_lime_sid($case_id);
if ($lime_sid == false) return false;
- $sql = "SELECT completed
- FROM " . LIME_PREFIX . "tokens_$lime_sid
- WHERE token = '$case_id'";
+ $sql = "SELECT t.completed
+ FROM " . LIME_PREFIX . "tokens_$lime_sid as t, `case` as c
+ WHERE c.case_id = '$case_id'
+ AND c.token = t.token";
$r = $db->GetRow($sql);
@@ -458,9 +692,10 @@ function limesurvey_is_completed($case_id)
$lime_sid = get_lime_sid($case_id);
if ($lime_sid == false) return false;
- $sql = "SELECT completed
- FROM " . LIME_PREFIX . "tokens_$lime_sid
- WHERE token = '$case_id'";
+ $sql = "SELECT t.completed
+ FROM " . LIME_PREFIX . "tokens_$lime_sid as t, `case` as c
+ WHERE c.case_id = '$case_id'
+ AND t.token = c.token";
$r = $db->GetRow($sql);
@@ -540,351 +775,4 @@ function limesurvey_get_width($qid,$default)
return $default;
}
-
-/**
- * Return the greatest width of answers
- *
- * @param mixed $qid Limesurvey question id
- *
- * @return int width of longest answer
- * @author Adam Zammit
- * @since 2010-11-03
- */
-function limesurvey_answer_width($qid)
-{
- global $db;
-
- $sql = "SELECT MAX(LENGTH(code)) as c FROM ".LIME_PREFIX."answers WHERE qid = $qid";
- $r = $db->GetRow($sql);
-
- $val = 1;
-
- if (!empty($r))
- $val = $r['c'];
-
- return $val;
-
-}
-
-function limesurvey_fixed_width($lid)
-{
- global $db;
-
- $sql = "SELECT MAX(LENGTH(code)) as c FROM ".LIME_PREFIX."labels WHERE lid = $lid";
- $r = $db->GetRow($sql);
-
- $val = 1;
-
- if (!empty($r))
- $val = $r['c'];
-
- return $val;
-}
-
-function limesurvey_create_multi(&$varwidth,&$vartype,$qid,$varname,$length,$type)
-{
- global $db;
-
- $sql = "SELECT *
- FROM ".LIME_PREFIX."answers
- WHERE qid = $qid
- ORDER BY sortorder ASC";
-
- $r = $db->GetAll($sql);
-
- foreach($r as $Row)
- {
- $v = $varname . $Row['code'];
- $varwidth[$v] = $length;
- $vartype[$v] = $type;
- }
-
- return;
-}
-
-/**
- * Return a string with only ASCII characters in it
- *
- * This function was sourced from the php website, help on str_replace
- * No author was listed at the time of access
- *
- * @param string $stringIn The string
- * @return string A string containing only ASCII characters
- */
-function all_ascii( $stringIn ){
- $final = '';
- $search = array(chr(145),chr(146),chr(147),chr(148),chr(150),chr(151),chr(13),chr(10));
- $replace = array("'","'",'"','"','-','-',' ',' ');
-
- $hold = str_replace($search[0],$replace[0],$stringIn);
- $hold = str_replace($search[1],$replace[1],$hold);
- $hold = str_replace($search[2],$replace[2],$hold);
- $hold = str_replace($search[3],$replace[3],$hold);
- $hold = str_replace($search[4],$replace[4],$hold);
- $hold = str_replace($search[5],$replace[5],$hold);
- $hold = str_replace($search[6],$replace[6],$hold);
- $hold = str_replace($search[7],$replace[7],$hold);
-
- if(!function_exists('str_split')){
- function str_split($string,$split_length=1){
- $count = strlen($string);
- if($split_length < 1){
- return false;
- } elseif($split_length > $count){
- return array($string);
- } else {
- $num = (int)ceil($count/$split_length);
- $ret = array();
- for($i=0;$i<$num;$i++){
- $ret[] = substr($string,$i*$split_length,$split_length);
- }
- return $ret;
- }
- }
- }
-
- $holdarr = str_split($hold);
- foreach ($holdarr as $val) {
- if (ord($val) < 128) $final .= $val;
- }
- return $final;
-}
-
-
-/**
- * Produce a fixed width string containing the data from a questionnaire
- *
- * @param int $questionnaire_id The quesitonnaire id
- * @param int|false $sample_import_id The sample importid or false for all data
- * @return string Fixed width data from the limesurvey database
- *
- */
-function limesurvey_export_fixed_width($questionnaire_id,$sample_import_id = false)
-{
- global $db;
-
- //array of varname and width
- $varwidth = array();
- $vartype = array();
-
- $sql = "SELECT lime_sid
- FROM questionnaire
- WHERE questionnaire_id = '$questionnaire_id'";
-
- $r = $db->GetRow($sql);
-
- if (!empty($r))
- $surveyid = $r['lime_sid'];
- else
- return;
-
- //foreach question
- $sql = "SELECT q.*
- FROM ".LIME_PREFIX."questions as q, ".LIME_PREFIX."groups as g
- WHERE q.sid=$surveyid
- AND q.type NOT LIKE 'X'
- AND g.gid = q.gid
- ORDER BY g.group_order ASC,q.question_order ASC";
-
- $r = $db->GetAll($sql);
- foreach ($r as $RowQ)
- {
- $type = $RowQ['type'];
- $qid = $RowQ['qid'];
- $lid = $RowQ['lid'];
- $gid = $RowQ['gid'];
-
- $varName = $surveyid . "X" . $gid . "X" . $qid;
-
- switch ($type)
- {
- case "X": //BOILERPLATE QUESTION - none should appear
-
- break;
- case "5": //5 POINT CHOICE radio-buttons
- $varwidth[$varName]=1;
- $vartype[$varName] = 1;
- break;
- case "D": //DATE
- $varwidth[$varName]=8;
- $vartype[$varName] = 1;
- break;
- case "Z": //LIST Flexible drop-down/radio-button list
- $varwidth[$varName]=limesurvey_fixed_width($lid);
- $vartype[$varName] = 1;
- break;
- case "L": //LIST drop-down/radio-button list
- $varwidth[$varName]=limesurvey_answer_width($qid);
- $vartype[$varName] = 1;
- break;
- case "W": //List - dropdown
- $varwidth[$varName]=limesurvey_answer_width($qid);
- $vartype[$varName] = 1;
- break;
- case "!": //List - dropdown
- $varwidth[$varName]=limesurvey_answer_width($qid);
- $vartype[$varName] = 1;
- break;
- case "O": //LIST WITH COMMENT drop-down/radio-button list + textarea
- //Not yet implemented
- break;
- case "R": //RANKING STYLE
- //Not yet implemented
- break;
- case "M": //MULTIPLE OPTIONS checkbox
- limesurvey_create_multi($varwidth,$vartype,$qid,$varName,1,3);
- break;
- case "P": //MULTIPLE OPTIONS WITH COMMENTS checkbox + text
- //Not yet implemented
- break;
- case "Q": //MULTIPLE SHORT TEXT
- limesurvey_create_multi($varwidth,$vartype,$qid,$varName,limesurvey_get_width($qid,24),2);
- break;
- case "K": //MULTIPLE NUMERICAL
- limesurvey_create_multi($varwidth,$vartype,$qid,$varName,limesurvey_get_width($qid,10),1);
- break;
- case "N": //NUMERICAL QUESTION TYPE
- $varwidth[$varName]= limesurvey_get_width($qid,10);
- $vartype[$varName] = 1;
- break;
- case "S": //SHORT FREE TEXT
- $varwidth[$varName]= limesurvey_get_width($qid,240);
- $vartype[$varName] = 2;
- break;
- case "T": //LONG FREE TEXT
- $varwidth[$varName]= limesurvey_get_width($qid,1024);
- $vartype[$varName] = 2;
- break;
- case "U": //HUGE FREE TEXT
- $varwidth[$varName]= limesurvey_get_width($qid,2048);
- $vartype[$varName] = 2;
- break;
- case "Y": //YES/NO radio-buttons
- $varwidth[$varName]=1;
- $vartype[$varName] = 1;
- break;
- case "G": //GENDER drop-down list
- $varwidth[$varName]=1;
- $vartype[$varName] = 1;
- break;
- case "A": //ARRAY (5 POINT CHOICE) radio-buttons
- $varwidth[$varName]=1;
- $vartype[$varName] = 1;
- break;
- case "B": //ARRAY (10 POINT CHOICE) radio-buttons
- $varwidth[$varName]=2;
- $vartype[$varName] = 1;
- break;
- case "C": //ARRAY (YES/UNCERTAIN/NO) radio-buttons
- $varwidth[$varName]=1;
- $vartype[$varName] = 1;
- break;
- case "E": //ARRAY (Increase/Same/Decrease) radio-buttons
- $varwidth[$varName]=1;
- $vartype[$varName] = 1;
- break;
- case "F": //ARRAY (Flexible) - Row Format
- limesurvey_create_multi($varwidth,$vartype,$qid,$varName,limesurvey_fixed_width($lid),1);
- break;
- case "H": //ARRAY (Flexible) - Column Format
- limesurvey_create_multi($varwidth,$vartype,$qid,$varName,limesurvey_fixed_width($lid),1);
- break;
- case "^": //SLIDER CONTROL
- //Not yet implemented
- break;
- } //End Switch
-
-
- }
-
-
- $fn = "survey_$surveyid.dat";
-
- header("Content-Type: application/download");
- header("Content-Disposition: attachment; filename=$fn");
- header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
- header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
- Header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
- header("Pragma: no-cache"); // HTTP/1.0
-
- $sql3 = "SELECT c.case_id as case_id
- FROM `case` as c
- WHERE c.questionnaire_id = '$questionnaire_id'
- AND c.current_outcome_id = 10";
-
- $r = $db->GetAll($sql3);
-
- if (!empty($r))
- {
- $sql = "SELECT *
- FROM ".LIME_PREFIX."survey_$surveyid
- WHERE ";
-
-
- if ($sample_import_id == false)
- {
- $sql .= " (";
- $ccount = count($r);
- $ccounter = 0;
- foreach($r as $row)
- {
- $token = $row['case_id'];
- $ccounter++;
- $sql .= " token = '$token'";
- if ($ccounter < $ccount)
- $sql .= " or ";
- }
- $sql .= ")";
- }
- else
- {
- $sql2 = "SELECT c.case_id as case_id
- FROM `case` as c, `sample` as s
- WHERE c.questionnaire_id = '$questionnaire_id'
- AND c.sample_id = s.sample_id
- AND s.import_id = '$sample_import_id'";
-
- $r = $db->GetAll($sql2);
-
- if (!empty($r))
- {
- $sql .= " (";
- $ccount = count($r);
- $ccounter = 0;
- foreach($r as $row)
- {
- $token = $row['case_id'];
- $ccounter++;
- $sql .= " token = '$token'";
- if ($ccounter < $ccount)
- $sql .= " or ";
- }
- $sql .= ")";
- }
-
- }
-
- $r = $db->GetAll($sql);
-
- foreach($r as $Row)
- {
- foreach ($varwidth as $var => $width)
- {
- if ($vartype[$var] == 1)
- echo str_pad(substr(all_ascii($Row[$var]),0,$width), $width, " ", STR_PAD_LEFT);
- else if ($vartype[$var] == 2)
- echo str_pad(substr(all_ascii($Row[$var]),0,$width), $width, " ", STR_PAD_RIGHT);
- else if ($vartype[$var] == 3)
- if (empty($Row[$var])) echo " "; else echo "1";
- }
- echo str_pad(substr($Row['token'],0,9), 9, " ", STR_PAD_LEFT);
- echo str_pad(substr($Row['datestamp'],0,16), 16, " ", STR_PAD_LEFT);
- echo "\n";
- }
-
- }
-
-}
-
-
?>
diff --git a/functions/functions.operator.php b/functions/functions.operator.php
index 8f7c10de..b102110d 100644
--- a/functions/functions.operator.php
+++ b/functions/functions.operator.php
@@ -1,4 +1,4 @@
-= apn.start) AND (CONVERT_TZ(NOW(),'System','UTC') <= apn.end))
WHERE c.sortorder IS NOT NULL
AND c.current_operator_id IS NULL
+ AND (apn.require_operator_id IS NULL OR apn.require_operator_id = '$operator_id')
ORDER BY c.sortorder ASC
LIMIT 1";
@@ -418,6 +441,7 @@ function get_case_id($operator_id, $create = false)
AND !(si.call_restrict = 1 AND cr.day_of_week IS NULL AND os.outcome_type_id != 2)
AND ((apn.appointment_id IS NOT NULL) or qs.call_attempt_max = 0 or ((SELECT count(*) FROM call_attempt WHERE case_id = c.case_id) < qs.call_attempt_max))
AND ((apn.appointment_id IS NOT NULL) or qs.call_max = 0 or ((SELECT count(*) FROM `call` WHERE case_id = c.case_id) < qs.call_max))
+ AND (apn.require_operator_id IS NULL OR apn.require_operator_id = '$operator_id')
AND (SELECT count(*) FROM `questionnaire_sample_quota` WHERE questionnaire_id = c.questionnaire_id AND sample_import_id = s.import_id AND quota_reached = 1) = 0
ORDER BY apn.start DESC, a.start ASC, qsep.priority DESC
LIMIT 1";
@@ -496,8 +520,10 @@ function get_case_id($operator_id, $create = false)
if (!empty($r3))
{
- $sql = "INSERT INTO `case` (case_id, sample_id, questionnaire_id, last_call_id, current_operator_id, current_call_id, current_outcome_id)
- VALUES (NULL, {$r3['sample_id']}, {$r3['questionnaire_id']} , NULL, $operator_id, NULL, 1)";
+ $token = sRandomChars();
+
+ $sql = "INSERT INTO `case` (case_id, sample_id, questionnaire_id, last_call_id, current_operator_id, current_call_id, current_outcome_id,token)
+ VALUES (NULL, {$r3['sample_id']}, {$r3['questionnaire_id']} , NULL, $operator_id, NULL, 1, '$token')";
$db->Execute($sql);
@@ -576,7 +602,7 @@ function get_case_id($operator_id, $create = false)
if ($lime_sid)
{
$sql = "INSERT INTO ".LIME_PREFIX."tokens_$lime_sid (tid,firstname,lastname,email,token,language,sent,completed,mpid)
- VALUES (NULL,'','','',$case_id,'".DEFAULT_LOCALE."','N','N',NULL)";
+ VALUES (NULL,'','','','$token','".DEFAULT_LOCALE."','N','N',NULL)";
$db->Execute($sql);
}
@@ -624,6 +650,31 @@ function get_case_id($operator_id, $create = false)
}
+
+/**
+ * Get the token based on the case id
+ *
+ * @param int $case_id The case id
+ *
+ * @return string|bool The token otherwise false if case doesn't exist
+ * @author Adam Zammit
+ * @since 2013-02-25
+ */
+function get_token($case_id)
+{
+ global $db;
+
+ $sql = "SELECT token
+ FROM `case`
+ WHERE case_id = $case_id";
+
+ $token = $db->GetOne($sql);
+
+ if (empty($token)) return FALSE;
+
+ return $token;
+}
+
/**
* Return the phone number of a call
*
@@ -1077,7 +1128,7 @@ function get_respondentselection_url($operator_id,$escape = true,$interface2 = f
{
$sid = get_limesurvey_id($operator_id,true); //true for RS
if ($sid != false && !empty($sid) && $sid != 'NULL')
- $url = LIME_URL . "index.php?loadall=reload" . $amp . "sid=$sid" . $amp . "token=$call_id" . $amp . "lang=" . DEFAULT_LOCALE;
+ $url = LIME_URL . "index.php?interviewer=interviewer&loadall=reload" . $amp . "sid=$sid" . $amp . "token=$call_id" . $amp . "lang=" . DEFAULT_LOCALE;
else
{
if ($interface2)
@@ -1113,14 +1164,21 @@ function get_limesurvey_url($operator_id)
if ($case_id)
{
+ $sql = "SELECT token
+ FROM `case`
+ WHERE case_id = $case_id";
+
+ $token = $db->GetOne($sql);
+
$sid = get_limesurvey_id($operator_id);
- $url = LIME_URL . "index.php?loadall=reload&sid=$sid&token=$case_id&lang=" . DEFAULT_LOCALE;
+ $url = LIME_URL . "index.php?interviewer=interviewer&loadall=reload&sid=$sid&token=$token&lang=" . DEFAULT_LOCALE;
$questionnaire_id = get_questionnaire_id($operator_id);
//get prefills
$sql = "SELECT lime_sgqa,value
FROM questionnaire_prefill
WHERE questionnaire_id = '$questionnaire_id'";
+
$pf = $db->GetAll($sql);
if (!empty($pf))
diff --git a/functions/functions.performance.php b/functions/functions.performance.php
index b75a2080..12bb062a 100644
--- a/functions/functions.performance.php
+++ b/functions/functions.performance.php
@@ -1,4 +1,4 @@
-";
- <? if (empty($title)) print "queXS"; else print "queXS: $title"; ?>
-<?php if (empty($title)) print "queXS"; else print "queXS: $title"; ?>
+";
if ($javascript)
@@ -67,7 +67,7 @@ print "";
if (!$body) return;
?>
-"; else print "";
}
@@ -83,7 +83,7 @@ function xhtml_foot()
-ExecuteSQLArray($sqlarray,1);
+
+ //queXS Addition - add an index on the token
+ $createtokenindex = $dict->CreateIndexSQL("{$tabname}_idx", $tabname, array('token'));
+ $dict->ExecuteSQLArray($createtokenindex, false) or safe_die ("Failed to create token index\n" .
diff --git a/include/limesurvey/admin/browse.php b/include/limesurvey/admin/browse.php
index 6d81353a..ef9d2bdf 100644
--- a/include/limesurvey/admin/browse.php
+++ b/include/limesurvey/admin/browse.php
@@ -197,7 +197,7 @@ if ($subaction == "id")
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $query .= " JOIN `case` AS c ON (s.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $query .= " JOIN `case` AS c ON (s.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$query .= " JOIN `sample` AS ss ON (ss.sample_id = c.sample_id AND ss.import_id = '{$qfs[1]}') ";
}
@@ -592,7 +592,7 @@ elseif ($subaction == "all")
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $sql_from .= " JOIN `case` AS c ON ({$surveytable}.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $sql_from .= " JOIN `case` AS c ON ({$surveytable}.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$sql_from .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
@@ -639,7 +639,7 @@ elseif ($subaction == "all")
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $dtquery .= " JOIN `case` AS c ON ({$surveytable}.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $dtquery .= " JOIN `case` AS c ON ({$surveytable}.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$dtquery .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
@@ -669,7 +669,7 @@ elseif ($subaction == "all")
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $dtquery .= " JOIN `case` AS c ON ({$surveytable}.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $dtquery .= " JOIN `case` AS c ON ({$surveytable}.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$dtquery .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
@@ -702,7 +702,7 @@ elseif ($subaction == "all")
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $dtquery .= " JOIN `case` AS c ON ({$surveytable}.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $dtquery .= " JOIN `case` AS c ON ({$surveytable}.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$dtquery .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
diff --git a/include/limesurvey/admin/export_data_functions.php b/include/limesurvey/admin/export_data_functions.php
index daa5fc90..3a3544a3 100644
--- a/include/limesurvey/admin/export_data_functions.php
+++ b/include/limesurvey/admin/export_data_functions.php
@@ -460,7 +460,7 @@ function spss_getquery() {
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$query .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
diff --git a/include/limesurvey/admin/exportresults.php b/include/limesurvey/admin/exportresults.php
index ffbc42d8..56efb414 100644
--- a/include/limesurvey/admin/exportresults.php
+++ b/include/limesurvey/admin/exportresults.php
@@ -254,7 +254,8 @@ $quexsfilterstate = questionnaireSampleFilterstate();
$exportoutput .= "
".$attr_desc."\n";
}
- $exportoutput .= "
".$clang->gT("Case ID")."\n"
+ $exportoutput .= "
".$clang->gT("Token")."\n"
+ ."
".$clang->gT("Case ID")."\n"
."
".$clang->gT("Number of call attempts")."\n"
."
".$clang->gT("Number of answering machine messages left")."\n";
@@ -422,17 +423,24 @@ else
$dquery = "SELECT $selectfields";
if ($tokenTableExists && $thissurvey['anonymized']=='N' && isset($_POST['attribute_select']) && is_array($_POST['attribute_select']))
{
+ if (in_array('caseid',$_POST['attribute_select']))
+ {
+ $dquery .= ", (SELECT c4.case_id
+ FROM `case` as c4
+ WHERE c4.token = {$dbprefix}survey_$surveyid.token) as caseid ";
+ }
if (in_array('callattempts',$_POST['attribute_select']))
{
$dquery .= ", (SELECT COUNT(c.call_attempt_id)
- FROM call_attempt as c
- WHERE c.case_id = {$dbprefix}survey_$surveyid.token) as callattempts ";
+ FROM call_attempt as c, `case` as ca
+ WHERE c.case_id = ca.case_id AND ca.token = {$dbprefix}survey_$surveyid.token) as callattempts ";
}
if (in_array('messagesleft',$_POST['attribute_select']))
{
$dquery .= ", (SELECT COUNT(c2.call_id)
- FROM `call` as c2
- WHERE c2.case_id = {$dbprefix}survey_$surveyid.token
+ FROM `call` as c2, `case` as ca2
+ WHERE ca2.case_id = c2.case_id
+ AND ca2.token = {$dbprefix}survey_$surveyid.token
AND c2.outcome_id = 23) as messagesleft ";
}
if (in_array('token',$_POST['attribute_select']))
@@ -477,7 +485,7 @@ if ($tokenTableExists && $thissurvey['anonymized']=='N' && isset($_POST['attribu
{
$dquery .= ", ( SELECT sv.val
FROM sample_var as sv, `case` as c3
- WHERE c3.case_id = {$dbprefix}survey_$surveyid.token
+ WHERE c3.token = {$dbprefix}survey_$surveyid.token
AND c3.sample_id = sv.sample_id
AND sv.var LIKE '$attr_name') as attribute_$i ";
@@ -505,7 +513,7 @@ $qfs = questionnaireSampleFilterstate();
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $dquery .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $dquery .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$dquery .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
@@ -530,6 +538,11 @@ for ($i=0; $i<$fieldcount; $i++)
if ($type == "csv") {$firstline .= "\"".$elang->gT("Number of answering machine messages left")."\"$separator";}
else {$firstline .= $elang->gT("Number of answering machine messages left")."$separator";}
}
+ elseif ($fieldinfo == "caseid")
+ {
+ if ($type == "csv") {$firstline .= "\"".$elang->gT("Case ID")."\"$separator";}
+ else {$firstline .= $elang->gT("Case ID")."$separator";}
+ }
elseif ($fieldinfo == "email")
{
if ($type == "csv") {$firstline .= "\"".$elang->gT("Email address")."\"$separator";}
@@ -547,8 +560,8 @@ for ($i=0; $i<$fieldcount; $i++)
}
elseif ($fieldinfo == "token")
{
- if ($type == "csv") {$firstline .= "\"".$elang->gT("Case ID")."\"$separator";}
- else {$firstline .= $elang->gT("Case ID")."$separator";}
+ if ($type == "csv") {$firstline .= "\"".$elang->gT("Token")."\"$separator";}
+ else {$firstline .= $elang->gT("Token")."$separator";}
}
elseif (substr($fieldinfo,0,10)=="attribute_")
{
@@ -823,7 +836,7 @@ elseif ($answers == "long") //chose complete answers
$fqid=0; // By default fqid is set to zero
$field=$dresult->FetchField($i);
$fieldinfo=$field->name;
- if ($fieldinfo != "startlanguage" && $fieldinfo != "id" && $fieldinfo != "datestamp" && $fieldinfo != "startdate" && $fieldinfo != "ipaddr" && $fieldinfo != "refurl" && $fieldinfo != "token" && $fieldinfo != "firstname" && $fieldinfo != "lastname" && $fieldinfo != "email" && (substr($fieldinfo,0,10)!="attribute_") && $fieldinfo != "completed")
+ if ($fieldinfo != "startlanguage" && $fieldinfo != "id" && $fieldinfo != "datestamp" && $fieldinfo != "startdate" && $fieldinfo != "ipaddr" && $fieldinfo != "refurl" && $fieldinfo != "token" && $fieldinfo != "firstname" && $fieldinfo != "lastname" && $fieldinfo != "email" && (substr($fieldinfo,0,10)!="attribute_") && $fieldinfo != "completed" && $fieldinfo != "caseid" && $fieldinfo != "callattempts" && $fieldinfo != "messagesleft")
{
$fielddata=$fieldmap[$fieldinfo];
$fqid=$fielddata['qid'];
@@ -844,6 +857,15 @@ elseif ($answers == "long") //chose complete answers
{
switch($fieldinfo)
{
+ case "caseid":
+ $ftitle=$elang->gT("Case ID").":";
+ break;
+ case "callattempts":
+ $ftitle=$elang->gT("Number of call attempts").":";
+ break;
+ case "messagesleft":
+ $ftitle=$elang->gT("Number of answering machine messages left").":";
+ break;
case "datestamp":
$ftitle=$elang->gT("Date Last Action").":";
break;
diff --git a/include/limesurvey/admin/statistics_function.php b/include/limesurvey/admin/statistics_function.php
index e2104717..1e7f82a2 100644
--- a/include/limesurvey/admin/statistics_function.php
+++ b/include/limesurvey/admin/statistics_function.php
@@ -510,7 +510,7 @@
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$query .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
@@ -1143,7 +1143,7 @@
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$query .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
@@ -1207,7 +1207,7 @@
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$query .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
@@ -1237,7 +1237,7 @@
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $querystarter .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $querystarter .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$querystarter .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
@@ -1957,7 +1957,7 @@
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $querylimit .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $querylimit .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$querylimit .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
diff --git a/include/limesurvey/admin/vvexport.php b/include/limesurvey/admin/vvexport.php
index 44166ee5..53ce7274 100644
--- a/include/limesurvey/admin/vvexport.php
+++ b/include/limesurvey/admin/vvexport.php
@@ -123,7 +123,7 @@ elseif (isset($surveyid) && $surveyid)
if ($qfs != false)
{
//Limit responses by questionnaire and/or sample
- $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.case_id AND c.questionnaire_id = '{$qfs[0]}') ";
+ $query .= " JOIN `case` AS c ON ({$dbprefix}survey_$surveyid.token = c.token AND c.questionnaire_id = '{$qfs[0]}') ";
if ($qfs[1] != 0) //if a sample is selected
$query .= " JOIN `sample` AS s ON (s.sample_id = c.sample_id AND s.import_id = '{$qfs[1]}') ";
}
diff --git a/include/limesurvey/classes/expressions/LimeExpressionManager.php b/include/limesurvey/classes/expressions/LimeExpressionManager.php
index d43c27d0..175265e4 100644
--- a/include/limesurvey/classes/expressions/LimeExpressionManager.php
+++ b/include/limesurvey/classes/expressions/LimeExpressionManager.php
@@ -3419,7 +3419,7 @@
$sql = "SELECT sv.var,sv.val
FROM sample_var as sv, `case` as c
WHERE c.sample_id = sv.sample_id
- AND c.case_id = {$_SESSION['token']}";
+ AND c.token = '{$_SESSION['token']}'";
$queXSrs = $connect->GetAssoc($sql);
diff --git a/include/limesurvey/group.php b/include/limesurvey/group.php
index fa41d0af..986428bd 100644
--- a/include/limesurvey/group.php
+++ b/include/limesurvey/group.php
@@ -15,23 +15,31 @@
if (!isset($homedir) || isset($_REQUEST['$homedir'])) {die("Cannot run this script directly");}
require_once("save.php"); // for supporting functions only
+include_once("quexs.php"); //queXS funcitons
// $LEMdebugLevel - customizable debugging for Lime Expression Manager
$LEMdebugLevel=0; // LEM_DEBUG_TIMING; // (LEM_DEBUG_TIMING + LEM_DEBUG_VALIDATION_SUMMARY + LEM_DEBUG_VALIDATION_DETAIL);
$LEMskipReprocessing=false; // true if used GetLastMoveResult to avoid generation of unneeded extra JavaScript
-switch ($thissurvey['format'])
+
+if ($interviewer)
{
- case "A": //All in one
- $surveyMode='survey';
- break;
- default:
- case "S": //One at a time
- $surveyMode='question';
- break;
- case "G": //Group at a time
- $surveyMode='group';
- break;
+ switch ($thissurvey['format'])
+ {
+ case "A": //All in one
+ $surveyMode='survey';
+ break;
+ default:
+ case "S": //One at a time
+ $surveyMode='question';
+ break;
+ case "G": //Group at a time
+ $surveyMode='group';
+ break;
+ }
}
+else
+ $surveyMode=quexs_get_survey_mode($clienttoken);
+
$radix=getRadixPointData($thissurvey['surveyls_numberformat']);
$radix = $radix['seperator'];
@@ -459,11 +467,21 @@ else
//queXS Addition
include_once("quexs.php");
- $quexs_url = get_start_interview_url();
- $url = str_replace("{STARTINTERVIEWURL}", $quexs_url, $url);
-
- $end_url = get_end_interview_url();
- $url = str_replace("{ENDINTERVIEWURL}", $end_url, $url);
+
+ if ($interviewer)
+ {
+ $quexs_url = get_start_interview_url();
+ $url = str_replace("{STARTINTERVIEWURL}", $quexs_url, $url);
+
+ $end_url = get_end_interview_url();
+ $url = str_replace("{ENDINTERVIEWURL}", $end_url, $url);
+ }
+ else
+ {
+ $url = get_end_interview_url($clienttoken);
+ quexs_completed_by_respondent($surveyid,$clienttoken);
+ }
+
header("Location: {$url}");
}
diff --git a/include/limesurvey/index.php b/include/limesurvey/index.php
index ebb255ce..cafc9b1e 100644
--- a/include/limesurvey/index.php
+++ b/include/limesurvey/index.php
@@ -21,6 +21,8 @@ require_once(dirname(__FILE__).'/classes/core/startup.php');
require_once(dirname(__FILE__).'/config-defaults.php');
require_once(dirname(__FILE__).'/common.php');
require_once(dirname(__FILE__).'/classes/core/language.php');
+include_once("quexs.php");
+
@ini_set('session.gc_maxlifetime', $sessionlifetime);
$loadname=returnglobal('loadname');
@@ -56,6 +58,7 @@ if (isset($_GET['loadall']) && $_GET['loadall'] == "reload" && isset($_GET['toke
//Must destroy the session
session_unset();
}
+
//end queXS Addition
//LimeExpressionManager::SetSurveyId($surveyid); // must be called early - it clears internal cache if a new survey is being used
@@ -120,6 +123,21 @@ if ( $embedded && $embedded_inc != '' )
require_once( $embedded_inc );
}
+//queXS Addition
+//see who is doing this survey - an interviewer or the respondent directly
+$interviewer=returnglobal('interviewer');
+if (!empty($interviewer) || (isset($_SESSION['interviewer']) && $_SESSION['interviewer'] == true))
+{
+ $interviewer = true;
+ $_SESSION['interviewer'] = true;
+}
+else
+{
+ $interviewer = false;
+}
+
+
+
//CHECK FOR REQUIRED INFORMATION (sid)
if (!$surveyid || !$surveyexists)
{
@@ -512,15 +530,22 @@ else
-
-//SET THE TEMPLATE DIRECTORY
-if (!$thissurvey['templatedir'])
+if ($interviewer)
{
- $thistpl=sGetTemplatePath($defaulttemplate);
+ //SET THE TEMPLATE DIRECTORY
+ if (!$thissurvey['templatedir'])
+ {
+ $thistpl=sGetTemplatePath($defaulttemplate);
+ }
+ else
+ {
+ $thistpl=sGetTemplatePath($thissurvey['templatedir']);
+ }
}
else
{
- $thistpl=sGetTemplatePath($thissurvey['templatedir']);
+ $thissurvey['templatedir'] = quexs_get_template($clienttoken);
+ $thistpl=sGetTemplatePath(quexs_get_template($clienttoken));
}
@@ -2649,7 +2674,7 @@ function check_quota($checkaction,$surveyid)
$querysel = "SELECT id FROM ".db_table_name('survey_'.$surveyid)." AS s
JOIN `case` AS cq ON (cq.case_id = '$case_id')
JOIN sample AS sampt ON (sampt.sample_id = cq.sample_id)
- JOIN `case` AS c ON (c.case_id = s.token AND c.questionnaire_id = cq.questionnaire_id)
+ JOIN `case` AS c ON (c.token = s.token AND c.questionnaire_id = cq.questionnaire_id)
JOIN `sample` as sam ON (c.sample_id = sam.sample_id AND sam.import_id = sampt.import_id)
WHERE ".implode(' AND ',$querycond)." "."
AND s.submitdate IS NOT NULL";
diff --git a/include/limesurvey/optout.php b/include/limesurvey/optout.php
index b986ba5a..14a8cffa 100644
--- a/include/limesurvey/optout.php
+++ b/include/limesurvey/optout.php
@@ -60,6 +60,29 @@ else
{
$usquery = "Update ".db_table_name("tokens_{$surveyid}")." set emailstatus='OptOut', usesleft=0 where token=".db_quoteall($token,true);
$usresult = $connect->Execute($usquery);
+
+ //queXS addition
+
+ //Set to Hard Refusal, respondent
+ $sql = "UPDATE `case`
+ SET current_outcome_id = 9
+ WHERE token = '$token'";
+
+ $connect->Execute($sql);
+
+ $sql = "SELECT case_id
+ FROM `case`
+ WHERE token = '$token'";
+
+ $case_id = $connect->GetOne($sql);
+
+
+ //Add a case note to clarify (need to translate this string)
+ $sql = "INSERT INTO `case_note` (case_id,operator_id,note,datetime)
+ VALUES ($case_id,1,'Self completion refused via opt out function',CONVERT_TZ(NOW(),'System','UTC'))";
+
+ $connect->Execute($sql);
+
$html .= $clang->gT('You have been successfully removed from this survey.');
}
else
diff --git a/include/limesurvey/quexs.php b/include/limesurvey/quexs.php
index dd961f46..7193d65f 100644
--- a/include/limesurvey/quexs.php
+++ b/include/limesurvey/quexs.php
@@ -1,4 +1,4 @@
-
+ * @since 2013-02-20
+ */
+function quexs_get_template($clienttoken)
+{
+ if (empty($clienttoken)) return 'default';
+
+ $db = newADOConnection(DB_TYPE);
+ $db->Connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+ $db->SetFetchMode(ADODB_FETCH_ASSOC);
+
+ $sql = "SELECT q.lime_template
+ FROM questionnaire as q, `case` as c
+ WHERE q.questionnaire_id = c.questionnaire_id
+ AND c.token = '$clienttoken'";
+
+ return $db->GetOne($sql);
+}
+
+/**
+ * Mode of survey completion
+ *
+ * @param string $clienttoken The token
+ *
+ * @return The limesurvey mode
+ * @author Adam Zammit
+ * @since 2013-02-20
+ */
+function quexs_get_survey_mode($clienttoken)
+{
+ $db = newADOConnection(DB_TYPE);
+ $db->Connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+ $db->SetFetchMode(ADODB_FETCH_ASSOC);
+
+ $sql = "SELECT q.lime_mode
+ FROM questionnaire as q, `case` as c
+ WHERE q.questionnaire_id = c.questionnaire_id
+ AND c.token = '$clienttoken'";
+
+ return $db->GetOne($sql);
+}
+
+
+/**
+ * Set the case as completed by respondent
+ *
+ * @param int $surveyid The limesurvey survey id
+ * @param string $clienttoken The token
+ *
+ * @return none
+ * @author Adam Zammit
+ * @since 2013-01-30
+ */
+function quexs_completed_by_respondent($surveyid,$clienttoken)
+{
+ $db = newADOConnection(DB_TYPE);
+ $db->Connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+ $db->SetFetchMode(ADODB_FETCH_ASSOC);
+
+ $sql = "UPDATE `case`
+ SET current_outcome_id = 40
+ WHERE token = '$clienttoken'";
+
+ $db->Execute($sql);
+
+ $sql = "SELECT case_id
+ FROM `case`
+ WHERE token = '$clienttoken'";
+
+ $case_id = $db->GetOne($sql);
+
+ //Add a case note to clarify (need to translate this string)
+ $sql = "INSERT INTO `case_note` (case_id,operator_id,note,datetime)
+ VALUES ($case_id,1,'Self completed online',CONVERT_TZ(NOW(),'System','UTC'))";
+
+ $db->Execute($sql);
+}
+
+
/**
* Get the number of answering messages left for this case
*
@@ -441,6 +526,8 @@ function get_respondent_variable($variable,$respondent_id)
*/
function get_operator_id()
{
+ if (!isset($_SERVER['PHP_AUTH_USER'])) return false;
+
$db = newADOConnection(DB_TYPE);
$db->Connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
$db->SetFetchMode(ADODB_FETCH_ASSOC);
@@ -715,7 +802,7 @@ function get_respondent_selection_url()
{
$sid = get_limesurvey_id($operator_id,true); //true for RS
if ($sid != false && !empty($sid) && $sid != 'NULL')
- $url = LIME_URL . "index.php?loadall=reload&sid=$sid&token=$call_id&lang=" . DEFAULT_LOCALE;
+ $url = LIME_URL . "index.php?interviewer=interviewer&loadall=reload&sid=$sid&token=$call_id&lang=" . DEFAULT_LOCALE;
else
$url = 'rs_intro.php';
}
@@ -727,11 +814,26 @@ function get_respondent_selection_url()
/**
* Get the URL to end the interview
*
+ * @param string $token The token if ended by the respondent, blank if ended by the interviewer
* @return string The URL to end the interview
*/
-function get_end_interview_url()
+function get_end_interview_url($token = "")
{
- return QUEXS_URL . "rs_project_end.php";
+ if ($token == "")
+ return QUEXS_URL . "rs_project_end.php";
+ else
+ {
+ $db = newADOConnection(DB_TYPE);
+ $db->Connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+ $db->SetFetchMode(ADODB_FETCH_ASSOC);
+
+ $sql = "SELECT q.lime_endurl
+ FROM questionnaire as q, `case` as c
+ WHERE c.token = '$token'
+ AND c.questionnaire_id = q.questionnaire_id";
+
+ return $db->GetOne($sql);
+ }
}
/**
@@ -753,8 +855,14 @@ function get_start_interview_url()
if ($case_id)
{
+ $sql = "SELECT token
+ FROM `case`
+ WHERE case_id = $case_id";
+
+ $token = $db->GetOne($sql);
+
$sid = get_limesurvey_id($operator_id);
- $url = LIME_URL . "index.php?loadall=reload&sid=$sid&token=$case_id&lang=" . DEFAULT_LOCALE;
+ $url = LIME_URL . "index.php?interviewer=interviewer&loadall=reload&sid=$sid&token=$token&lang=" . DEFAULT_LOCALE;
$questionnaire_id = get_questionnaire_id($operator_id);
//get prefills
diff --git a/index.php b/index.php
index dd302561..00d17bda 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-GetOne($sql);
+
?>
-
@@ -181,92 +190,92 @@ xhtml_object($data,"main-content");
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
" id="tab-shifts">
-
-
+
+
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
@@ -274,7 +283,7 @@ xhtml_object($data,"main-content");
-
@@ -288,82 +297,82 @@ xhtml_object($data,"main-content");
-
-
-
+
-
-
-
+
-
-
-
+
-
-
" id="tab-shifts">
-
-
+
+
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
@@ -371,7 +380,7 @@ xhtml_object($data,"main-content");
-
+
GetAll($sql);
?>
-
-
+
GetRow($sql);
?>
-
-
+
-
-
+
-
+
-" . T_("Do not leave a message, please hang up") . "";
?>
-
-
-
-
-
+" . T_("Do not leave a message, please hang up") . "";
?>
-
-
-
-
-
+
-
+
-
-
-
+
-
+
-
-
-
+" . T_("You are: ") . round(limesurvey_percent_complete
?>
-
-
-
-
+
+" . T_("You are: ") . round(limesurvey_percent_complete
?>
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
+
+
+
-
+
-" . template_replace($r['rs_project_intro'],$operator_i
?>
-
+
-
-
-
+
+
+
-
+
-" . template_replace($_GET['message'],$operator_id,$cas
if (ALTERNATE_INTERFACE && !is_voip_enabled($operator_id))
{
?>
-
-
-