Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Fixed expression manager selection by token

Browse Source 
Fixed export notices about array
This commit is contained in:
Adam Zammit
2013-01-25 15:30:59 +11:00
parent 45c2792d25
commit 9694ec704c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/limesurvey/admin/exportresults.php
View File

@@ -425,7 +425,9 @@ if ($tokenTableExists && $thissurvey['anonymized']=='N' && isset($_POST['attribu
{ {
if (in_array('caseid',$_POST['attribute_select'])) if (in_array('caseid',$_POST['attribute_select']))
{ {
$dquery .= ", c.case_id "; $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'])) if (in_array('callattempts',$_POST['attribute_select']))
{ {
@@ -834,7 +836,7 @@ elseif ($answers == "long") //chose complete answers
$fqid=0; // By default fqid is set to zero $fqid=0; // By default fqid is set to zero
$field=$dresult->FetchField($i); $field=$dresult->FetchField($i);
$fieldinfo=$field->name; $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]; $fielddata=$fieldmap[$fieldinfo];
$fqid=$fielddata['qid']; $fqid=$fielddata['qid'];
@@ -855,6 +857,15 @@ elseif ($answers == "long") //chose complete answers
{ {
switch($fieldinfo) 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": case "datestamp":
$ftitle=$elang->gT("Date Last Action").":"; $ftitle=$elang->gT("Date Last Action").":";
break; break;

2
include/limesurvey/classes/expressions/LimeExpressionManager.php
View File

@@ -3419,7 +3419,7 @@
$sql = "SELECT sv.var,sv.val $sql = "SELECT sv.var,sv.val
FROM sample_var as sv, `case` as c FROM sample_var as sv, `case` as c
WHERE c.sample_id = sv.sample_id WHERE c.sample_id = sv.sample_id
AND c.token = {$_SESSION['token']}"; AND c.token = '{$_SESSION['token']}'";
$queXSrs = $connect->GetAssoc($sql); $queXSrs = $connect->GetAssoc($sql);