"
+ .$clang->gT("The required directory for saving the uploaded files couldn't be created. Please check file premissions on the /upload/surveys directory.")
+ ."
";
+ }
+
+ if ($survey->allowregister=='Y')
+ {
+ $aViewUrls['output'] .= $clang->gT("This survey allows public registration. A token table must also be created.")."
\n"
+ ."getController()->createUrl("admin/tokens/index/surveyid/".$iSurveyID))."\" />\n";
+ }
+ else
+ {
+ $aViewUrls['output'] .= $clang->gT("This survey is now active, and responses can be recorded.")."
\n"
+ ."".$clang->gT("Open-access mode").": ".$clang->gT("No invitation code is needed to complete the survey.")." ".$clang->gT("You can switch to the closed-access mode by initialising a token table with the button below.")."
".sprintf($clang->gT("Only %s new dummy tokens were added after %s trials."),$newDummyToken,$invalidtokencount)
+ .$clang->gT("Try with a bigger token length.")."
\n";
echo "\t" . $clang->gT("Sorry. There is no matching survey.") . "
\n";
- echo templatereplace(file_get_contents("$thistpl/endpage.pstpl"), array(), $redata);
+ echo templatereplace(file_get_contents($sTemplatePath."endpage.pstpl"), array(), $redata);
doFooter();
exit;
}
@@ -699,6 +707,9 @@ function run($surveyid,$args) {
sendCacheHeaders();
doHeader();
+ $redata = compact(array_keys(get_defined_vars()));
+ echo templatereplace(file_get_contents($sTemplatePath."startpage.pstpl"), array(), $redata);
+ //popup need jquery
if (isset($popup))
{
echo $popup;
@@ -712,10 +723,6 @@ function run($surveyid,$args) {
echo $fpopup;
}
- $redata = compact(array_keys(get_defined_vars()));
-
- echo templatereplace(file_get_contents("$thistpl/startpage.pstpl"), array(), $redata);
-
//ALTER PAGE CLASS TO PROVIDE WHOLE-PAGE ALTERNATION
if ($surveyMode != 'survey' && $_SESSION[$LEMsessid]['step'] != $_SESSION[$LEMsessid]['prevstep'] ||
(isset($_SESSION[$LEMsessid]['stepno']) && $_SESSION[$LEMsessid]['stepno'] % 2))
@@ -748,19 +755,19 @@ function run($surveyid,$args) {
}
else
{
- echo templatereplace(file_get_contents("$thistpl/welcome.pstpl"), array(), $redata) . "\n";
+ echo templatereplace(file_get_contents($sTemplatePath."welcome.pstpl"), array(), $redata) . "\n";
}
if ($thissurvey['anonymized'] == "Y")
{
- echo templatereplace(file_get_contents("$thistpl/privacy.pstpl"), array(), $redata) . "\n";
+ echo templatereplace(file_get_contents($sTemplatePath."privacy.pstpl"), array(), $redata) . "\n";
}
}
// <-- START THE SURVEY -->
if ($surveyMode != 'survey')
{
- echo templatereplace(file_get_contents("{$thistpl}/survey.pstpl"), array(), $redata);
+ echo templatereplace(file_get_contents($sTemplatePath."survey.pstpl"), array(), $redata);
}
// the runonce element has been changed from a hidden to a text/display:none one
@@ -771,22 +778,33 @@ function run($surveyid,$args) {
\n";
- echo templatereplace(file_get_contents("$thistpl/endgroup.pstpl"), array(), $redata);
+ echo templatereplace(file_get_contents($sTemplatePath."endgroup.pstpl"), array(), $redata);
echo "\n\n\n";
}
@@ -997,7 +1015,7 @@ function checkconditions(value, name, type, evt_type)
$redata = compact(array_keys(get_defined_vars()));
echo "\n\n\n";
- echo templatereplace(file_get_contents("$thistpl/navigator.pstpl"), array(), $redata);
+ echo templatereplace(file_get_contents($sTemplatePath."navigator.pstpl"), array(), $redata);
echo "\n";
if ($thissurvey['active'] != "Y")
@@ -1114,7 +1132,7 @@ function checkconditions(value, name, type, evt_type)
}
echo "\n";
- echo templatereplace(file_get_contents("$thistpl/endpage.pstpl"), array(), $redata);
+ echo templatereplace(file_get_contents($sTemplatePath."endpage.pstpl"), array(), $redata);
echo "\n";
diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php
index 446b364dbc9..22292a4d8ac 100644
--- a/application/helpers/admin/activate_helper.php
+++ b/application/helpers/admin/activate_helper.php
@@ -17,12 +17,12 @@
* fixes the numbering of questions
* @param $fixnumbering
*/
-function fixNumbering($fixnumbering, $surveyid)
+function fixNumbering($fixnumbering, $iSurveyID)
{
Yii::app()->loadHelper("database");
- LimeExpressionManager::RevertUpgradeConditionsToRelevance($surveyid);
+ LimeExpressionManager::RevertUpgradeConditionsToRelevance($iSurveyID);
//Fix a question id - requires renumbering a question
$oldqid = $fixnumbering;
$query = "SELECT qid FROM {{questions}} ORDER BY qid DESC";
@@ -63,7 +63,7 @@ function fixNumbering($fixnumbering, $surveyid)
$query = "UPDATE {{answers}} SET qid=$newqid WHERE qid=$oldqid";
$result = db_execute_assosc($query);
- LimeExpressionManager::UpgradeConditionsToRelevance($surveyid);
+ LimeExpressionManager::UpgradeConditionsToRelevance($iSurveyID);
}
/**
* checks consistency of groups
@@ -92,15 +92,16 @@ function checkGroup($postsid)
/**
* checks questions in a survey for consistency
* @param $postsid
- * @param $surveyid
+* @param $iSurveyID
* @return array $faildcheck
*/
-function checkQuestions($postsid, $surveyid)
+function checkQuestions($postsid, $iSurveyID)
{
$clang = Yii::app()->lang;
//CHECK TO MAKE SURE ALL QUESTION TYPES THAT REQUIRE ANSWERS HAVE ACTUALLY GOT ANSWERS
+ $chkquery = "SELECT qid, question, gid, type FROM {{questions}} WHERE sid={$iSurveyID} and parent_qid=0";
$chkresult = Questions::model()->with('question_types')->findAllByAttributes(array('sid' => $surveyid, 'parent_qid' => 0));
foreach ($chkresult as $chkrow)
@@ -131,7 +132,7 @@ function checkQuestions($postsid, $surveyid)
//NOW CHECK THAT ALL QUESTIONS HAVE A 'QUESTION TYPE' FIELD SET
//$chkquery = "SELECT qid, question, gid FROM {{questions}} WHERE sid={$_GET['sid']} AND type = ''";
- $chkquery = "SELECT qid, question, gid FROM {{questions}} WHERE sid={$surveyid} AND type = ''";
+ $chkquery = "SELECT qid, question, gid FROM {{questions}} WHERE sid={$iSurveyID} AND type = ''";
$chkresult = Yii::app()->db->createCommand($chkquery)->query()->readAll();
foreach ($chkresult as $chkrow)
{
@@ -143,7 +144,7 @@ function checkQuestions($postsid, $surveyid)
//ChECK THAT certain array question types have answers set
//$chkquery = "SELECT q.qid, question, gid FROM {{questions}} as q WHERE (select count(*) from {{answers}} as a where a.qid=q.qid and scale_id=0)=0 and sid={$_GET['sid']} AND type IN ('F', 'H', 'W', 'Z', '1') and q.parent_qid=0";
- $chkquery = "SELECT q.qid, question, gid FROM {{questions}} as q WHERE (select count(*) from {{answers}} as a where a.qid=q.qid and scale_id=0)=0 and sid={$surveyid} AND type IN ('F', 'H', 'W', 'Z', '1') and q.parent_qid=0";
+ $chkquery = "SELECT q.qid, question, gid FROM {{questions}} as q WHERE (select count(*) from {{answers}} as a where a.qid=q.qid and scale_id=0)=0 and sid={$iSurveyID} AND type IN ('F', 'H', 'W', 'Z', '1') and q.parent_qid=0";
$chkresult = Yii::app()->db->createCommand($chkquery)->query()->readAll();
foreach($chkresult as $chkrow){
$failedcheck[]=array($chkrow['qid'], $chkrow['question'], ": ".$clang->gT("This question requires answers, but none are set."), $chkrow['gid']);
@@ -151,7 +152,7 @@ function checkQuestions($postsid, $surveyid)
//CHECK THAT DUAL Array has answers set
//$chkquery = "SELECT q.qid, question, gid FROM {{questions}} as q WHERE (select count(*) from {{answers}} as a where a.qid=q.qid and scale_id=1)=0 and sid={$_GET['sid']} AND type='1' and q.parent_qid=0";
- $chkquery = "SELECT q.qid, question, gid FROM {{questions}} as q WHERE (select count(*) from {{answers}} as a where a.qid=q.qid and scale_id=1)=0 and sid={$surveyid} AND type='1' and q.parent_qid=0";
+ $chkquery = "SELECT q.qid, question, gid FROM {{questions}} as q WHERE (select count(*) from {{answers}} as a where a.qid=q.qid and scale_id=1)=0 and sid={$iSurveyID} AND type='1' and q.parent_qid=0";
$chkresult = Yii::app()->db->createCommand($chkquery)->query()->readAll();
foreach ($chkresult as $chkrow){
$failedcheck[]=array($chkrow['qid'], $chkrow['question'], ": ".$clang->gT("This question requires a second answer set but none is set."), $chkrow['gid']);
@@ -172,7 +173,7 @@ function checkQuestions($postsid, $surveyid)
// $c++;
// }
//TO AVOID NATURAL SORT ORDER ISSUES, FIRST GET ALL QUESTIONS IN NATURAL SORT ORDER, AND FIND OUT WHICH NUMBER IN THAT ORDER THIS QUESTION IS
- $qorderquery = "SELECT * FROM {{questions}} WHERE sid=$surveyid AND type not in ('S', 'D', 'T', 'Q')";
+ $qorderquery = "SELECT * FROM {{questions}} WHERE sid=$iSurveyID AND type not in ('S', 'D', 'T', 'Q')";
$qorderresult = Yii::app()->db->createCommand($qorderquery)->query()->readAll();
$qrows = array(); //Create an empty array in case FetchRow does not return any rows
foreach ($qorderresult as $qrow) {$qrows[] = $qrow;} // Get table output into array
@@ -219,7 +220,7 @@ function checkQuestions($postsid, $surveyid)
}
//CHECK THAT ALL THE CREATED FIELDS WILL BE UNIQUE
- $fieldmap = createFieldMap($surveyid,'full',false,false,getBaseLanguageFromSurveyID($surveyid)); //AJS#
+ $fieldmap = createFieldMap($iSurveyID,'full',false,false,getBaseLanguageFromSurveyID($surveyid)); //AJS#
if (isset($fieldmap))
{
foreach($fieldmap as $fielddata)
@@ -237,7 +238,7 @@ function checkQuestions($postsid, $surveyid)
foreach ($duplicates as $dup)
{
$q = $fieldmap[$dup]['q'];
- $fix = "[Click Here to Fix]";
+ $fix = "[Click Here to Fix]";
$failedcheck[]=array($badquestion['qid'], $badquestion['question'], ": Bad duplicate fieldname $fix", $badquestion['gid']);
}
}
@@ -249,16 +250,15 @@ function checkQuestions($postsid, $surveyid)
/**
* Function to activate a survey
- * @param int $surveyid The Survey ID
+* @param int $iSurveyID The Survey ID
* @param bool $simulate
* @return string
*/
-function activateSurvey($surveyid, $simulate = false)
+function activateSurvey($iSurveyID, $simulate = false)
{
- $clang = Yii::app()->lang;
$createsurvey='';
$activateoutput='';
@@ -266,19 +266,10 @@ function activateSurvey($surveyid, $simulate = false)
$fieldstiming = array();
$createsurveydirectory=false;
//Check for any additional fields for this survey and create necessary fields (token and datestamp)
- $pquery = "SELECT anonymized, allowregister, datestamp, ipaddr, refurl, savetimings FROM {{surveys}} WHERE sid={$surveyid}";
- $prow = Yii::app()->db->createCommand($pquery)->query()->read();
- if ($prow['allowregister'] == "Y")
- {
- $surveyallowsregistration="TRUE";
- }
- if ($prow['savetimings'] == "Y")
- {
- $savetimings="TRUE";
- }
+ $prow = Survey::model()->findByAttributes(array('sid' => $iSurveyID));
//Get list of questions for the base language
- $fieldmap = createFieldMap($surveyid,'full',true,false,getBaseLanguageFromSurveyID($surveyid)); //AJS
+ $fieldmap = createFieldMap($iSurveyID,'full',true,false,getBaseLanguageFromSurveyID($surveyid)); //AJS
$createsurvey = array();
foreach ($fieldmap as $arow) //With each question, create the appropriate field(s)
@@ -303,15 +294,15 @@ function activateSurvey($surveyid, $simulate = false)
$createsurvey[$q->fieldname] = "integer";
break;
case "ipaddr":
- if ($prow['ipaddr'] == "Y")
+ if ($prow->ipaddr == "Y")
$createsurvey[$q->fieldname] = "text";
break;
case "refurl":
- if ($prow['refurl'] == "Y")
+ if ($prow->refurl == "Y")
$createsurvey[$q->fieldname] = "text";
break;
case "token":
- if ($prow['anonymized'] == "N")
+ if ($prow->anonymized == "N")
{
$createsurvey[$q->fieldname] = "VARCHAR(36)";
}
@@ -344,36 +335,18 @@ function activateSurvey($surveyid, $simulate = false)
// If last question is of type MCABCEFHP^QKJR let's get rid of the ending coma in createsurvey
//$createsurvey = rtrim($createsurvey, ",\n")."\n"; // Does nothing if not ending with a comma
- $tabname = "{{survey_{$surveyid}}}";
+ $tabname = "{{survey_{$iSurveyID}}}";
$command = new CDbCommand(Yii::app()->db);
try
{
$execresult = $command->createTable($tabname,$createsurvey);
- $execresult = true;
}
catch (CDbException $e)
{
- echo $e->getMessage();
- $execresult = false;
+ return array('error'=>'surveytablecreation');
}
-
- if (!$execresult)
- {
- $link = Yii::app()->getController()->createUrl("admin/survey/view/surveyid/".$surveyid);
- $activateoutput .= " \n
" ;
- }
-
- if ($execresult)
- {
-
- $anquery = "SELECT autonumber_start FROM {{surveys}} WHERE sid={$surveyid}";
+ $anquery = "SELECT autonumber_start FROM {{surveys}} WHERE sid={$iSurveyID}";
if ($anresult=Yii::app()->db->createCommand($anquery)->query()->readAll())
{
//if there is an autonumber_start field, start auto numbering here
@@ -382,25 +355,25 @@ function activateSurvey($surveyid, $simulate = false)
if ($row['autonumber_start'] > 0)
{
if (Yii::app()->db->driverName=='mssql' || Yii::app()->db->driverName=='sqlsrv') {
- mssql_drop_primary_index('survey_'.$surveyid);
- mssql_drop_constraint('id','survey_'.$surveyid);
- $autonumberquery = "alter table {{survey_{$surveyid}}} drop column id ";
- Yii::app()->db->createCommand($autonumberquery)->query()->readAll();
- $autonumberquery = "alter table {{survey_{$surveyid}}} add [id] int identity({$row['autonumber_start']},1)";
- Yii::app()->db->createCommand($autonumberquery)->query()->readAll();
+ mssql_drop_primary_index('survey_'.$iSurveyID);
+ mssql_drop_constraint('id','survey_'.$iSurveyID);
+ $autonumberquery = "alter table {{survey_{$iSurveyID}}} drop column id ";
+ Yii::app()->db->createCommand($autonumberquery)->execute();
+ $autonumberquery = "alter table {{survey_{$iSurveyID}}} add [id] int identity({$row['autonumber_start']},1)";
+ Yii::app()->db->createCommand($autonumberquery)->execute();
}
else
{
- $autonumberquery = "ALTER TABLE {{survey_{$surveyid}}} AUTO_INCREMENT = ".$row['autonumber_start'];
+ $autonumberquery = "ALTER TABLE {{survey_{$iSurveyID}}} AUTO_INCREMENT = ".$row['autonumber_start'];
$result = @Yii::app()->db->createCommand($autonumberquery)->execute();
}
}
}
}
- if (isset($savetimings) && $savetimings=="TRUE")
+ if ($prow->savetimings == "Y")
{
- $timingsfieldmap = createFieldMap($surveyid,"short",false,false,getBaseLanguageFromSurveyID($surveyid)); //AJS#
+ $timingsfieldmap = createFieldMap($iSurveyID,"short",false,false,getBaseLanguageFromSurveyID($surveyid)); //AJS#
$column['id'] = $createsurvey['id'];
$column['interviewtime'] = 'FLOAT';
@@ -417,63 +390,36 @@ function activateSurvey($surveyid, $simulate = false)
}
$command = new CDbCommand(Yii::app()->db);
- $tabname = "{{survey_{$surveyid}}}_timings";
+ $tabname = "{{survey_{$iSurveyID}}}_timings";
try
{
$execresult = $command->createTable($tabname,$column);
- $execresult = true;
}
catch (CDbException $e)
{
- echo $e->getMessage();
- $execresult = false;
+ return array('error'=>'timingstablecreation');
}
}
-
- $activateoutput .= " \n
\n";
- $activateoutput .= "
".$clang->gT("Activate Survey")." ($surveyid)
\n";
- $activateoutput .= "
".$clang->gT("Survey has been activated. Results table has been successfully created.")."
\n";
-
+ $aResult=array('status'=>'OK');
// create the survey directory where the uploaded files can be saved
if ($createsurveydirectory)
{
- if (!file_exists(Yii::app()->getConfig('uploaddir') . "/surveys/" . $surveyid . "/files"))
+ if (!file_exists(Yii::app()->getConfig('uploaddir') . "/surveys/" . $iSurveyID . "/files"))
{
- if (!(mkdir(Yii::app()->getConfig('uploaddir') . "/surveys/" . $surveyid . "/files", 0777, true)))
+ if (!(mkdir(Yii::app()->getConfig('uploaddir') . "/surveys/" . $iSurveyID . "/files", 0777, true)))
{
- $activateoutput .= "
" .
- $clang->gT("The required directory for saving the uploaded files couldn't be created. Please check file premissions on the /upload/surveys directory.") . "
";
+ $aResult['warning']='nouploadsurveydir';
} else {
- file_put_contents(Yii::app()->getConfig('uploaddir') . "/surveys/" . $surveyid . "/files/index.html", '');
+ file_put_contents(Yii::app()->getConfig('uploaddir') . "/surveys/" . $iSurveyID . "/files/index.html", '');
}
}
}
- $acquery = "UPDATE {{surveys}} SET active='Y' WHERE sid=".$surveyid;
+ $acquery = "UPDATE {{surveys}} SET active='Y' WHERE sid=".$iSurveyID;
$acresult = Yii::app()->db->createCommand($acquery)->query();
- if (isset($surveyallowsregistration) && $surveyallowsregistration == "TRUE")
- {
- $activateoutput .= $clang->gT("This survey allows public registration. A token table must also be created.")."
\n";
- $activateoutput .= "getController()->createUrl("admin/tokens/index/surveyid/".$surveyid))."\" />\n";
- }
- else
- {
- $link = Yii::app()->getController()->createUrl("admin/survey/view/surveyid/".$surveyid);
-
- $activateoutput .= $clang->gT("This survey is now active, and responses can be recorded.")."
\n";
- $activateoutput .= "".$clang->gT("Open-access mode").": ".$clang->gT("No invitation code is needed to complete the survey.")." ".$clang->gT("You can switch to the closed-access mode by initialising a token table with the button below.")."
\n";
- $lsrcOutput = true;
- }
-
-
- return $activateoutput;
-
-}
function mssql_drop_constraint($fieldname, $tablename)
{
@@ -487,7 +433,7 @@ function mssql_drop_constraint($fieldname, $tablename)
sys.sysobjects AS t_obj ON c_obj.parent_obj = t_obj.id INNER JOIN
sys.sysconstraints AS con ON c_obj.id = con.constid INNER JOIN
sys.syscolumns AS col ON t_obj.id = col.id AND con.colid = col.colid
- WHERE (c_obj.xtype = 'D') AND (col.name = '$fieldname') AND (t_obj.name={{{$tablename}}})";
+ WHERE (c_obj.xtype = 'D') AND (col.name = '$fieldname') AND (t_obj.name='{{{$tablename}}}')";
$result = dbExecuteAssoc($dfquery)->read();
$defaultname=$result['CONTRAINT_NAME'];
if ($defaultname!=false)
@@ -505,12 +451,11 @@ function mssql_drop_primary_index($tablename)
// find out the constraint name of the old primary key
$pkquery = "SELECT CONSTRAINT_NAME "
."FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS "
- ."WHERE (TABLE_NAME = {{{$tablename}}}) AND (CONSTRAINT_TYPE = 'PRIMARY KEY')";
+ ."WHERE (TABLE_NAME = '{{{$tablename}}}') AND (CONSTRAINT_TYPE = 'PRIMARY KEY')";
- $result = dbExecuteAssoc($pkquery)->read();
- $primarykey=$result['CONTSTRAINT_NAME'];
- if ($primarykey!=false)
+ $primarykey = Yii::app()->db->createCommand($pkquery)->queryRow(false);
+ if ($primarykey!==false)
{
- modifyDatabase("","ALTER TABLE {{{$tablename}}} DROP CONSTRAINT {$primarykey}"); echo $modifyoutput; flush();
+ Yii::app()->db->createCommand("ALTER TABLE {{{$tablename}}} DROP CONSTRAINT {$primarykey[0]}")->execute();
}
}
diff --git a/application/helpers/admin/exportresults_helper.php b/application/helpers/admin/exportresults_helper.php
index a66bc72d92f..74c3ddad031 100644
--- a/application/helpers/admin/exportresults_helper.php
+++ b/application/helpers/admin/exportresults_helper.php
@@ -1,17 +1,17 @@
selectedColumns))
+ if (empty($oOptions->selectedColumns))
{
safeDie('At least one column must be selected for export.');
}
- //echo $options->toString().PHP_EOL;
+ //echo $oOptions->toString().PHP_EOL;
$writer = null;
- $intSurveyId = sanitize_int($surveyId);
+ $iSurveyId = sanitize_int($iSurveyId);
- switch ( $options->format ) {
+ switch ( $oOptions->format ) {
case "doc":
- header("Content-Disposition: attachment; filename=results-survey".$intSurveyId.".doc");
- header("Content-type: application/vnd.ms-word");
+ if ($sOutputStyle=='display')
+ {
+ header("Content-Disposition: attachment; filename=results-survey".$iSurveyId.".doc");
+ header("Content-type: application/vnd.ms-word");
+ }
$writer = new DocWriter();
break;
case "xls":
- $writer = new ExcelWriter();
- break;
- case "csv":
- header("Content-Disposition: attachment; filename=results-survey".$intSurveyId.".csv");
- header("Content-type: text/comma-separated-values; charset=UTF-8");
- $writer = new CsvWriter();
+ if ($sOutputStyle=='return')
+ {
+ $sRandomFileName=Yii::app()->getConfig("tempdir"). DIRECTORY_SEPARATOR . randomChars(40);
+ $writer = new ExcelWriter($sRandomFileName);
+ }
+ else
+ {
+ $writer = new ExcelWriter();
+ }
break;
case "pdf":
Yii::import("application.libraries.admin.pdf", true);
- $writer = new PdfWriter();
+ if ($sOutputStyle=='return')
+ {
+ $sRandomFileName=Yii::app()->getConfig("tempdir") . DIRECTORY_SEPARATOR . randomChars(40);
+ $writer = new PdfWriter($sRandomFileName);
+ }
+ else
+ {
+ $writer = new PdfWriter();
+ }
break;
+ case "csv":
default:
- header("Content-Disposition: attachment; filename=results-survey".$intSurveyId.".csv");
- header("Content-type: text/comma-separated-values; charset=UTF-8");
+ if ($sOutputStyle=='display')
+ {
+ header("Content-Disposition: attachment; filename=results-survey".$iSurveyId.".csv");
+ header("Content-type: text/comma-separated-values; charset=UTF-8");
+ }
$writer = new CsvWriter();
break;
}
- header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
- header("Pragma: public");
+ if ($sOutputStyle=='display')
+ {
+ header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+ header("Pragma: public");
+ }
$surveyDao = new SurveyDao();
- $survey = $surveyDao->loadSurveyById($intSurveyId);
- $surveyDao->loadSurveyResults($survey, $options->responseMinRecord, $options->responseMaxRecord);
+ $survey = $surveyDao->loadSurveyById($iSurveyId);
+ $surveyDao->loadSurveyResults($survey, $oOptions->responseMinRecord, $oOptions->responseMaxRecord);
- $writer->write($survey, $languageCode, $options);
+ $writer->write($survey, $sLanguageCode, $oOptions);
$output = $writer->close();
- if ($options->format == 'csv' || $options->format == 'doc')
+ if (($oOptions->format == 'csv' || $oOptions->format == 'doc') && $sOutputStyle='display')
{
echo $output;
}
+ if (($oOptions->format == 'xls' || $oOptions->format == 'pdf') && $sOutputStyle='return')
+ {
+ $output=file_get_contents($sRandomFileName);
+ unlink($sRandomFileName);
+ }
return $output;
}
}
@@ -142,9 +168,9 @@ class FormattingOptions
/**
* Acceptable values are:
- * "abrev" = Abbreviated headings
+ * "abbreviated" = Abbreviated headings
* "full" = Full headings
- * "headcodes" = Question codes
+ * "code" = Question codes
*
* @var string
*/
@@ -291,7 +317,7 @@ public function loadSurveyResults(SurveyObj $survey, $minRecord = null, $maxReco
{
/* @var $recordSet ADORecordSet */
- $sql = 'SELECT * FROM {{survey_' . $survey->id . '}}';
+ $sql = 'SELECT * FROM {{survey_' . $survey->id . '}} order by id';
if (!isset($minRecord) && !isset($maxRecord))
{
//Neither min or max is set, load it all.
@@ -497,6 +523,204 @@ public function getSubQuestionArrays($parentQuestionId)
}
/**
+<<<<<<< HEAD
+=======
+ * Returns the full answer for the question that matches $fieldName
+ * and the answer that matches the $answerCode. If a match cannot
+ * be made then false is returned.
+ *
+ * The name of the variable $answerCode is not strictly an answerCode
+ * but could also be a comment entered by a participant.
+ *
+ * @param string $fieldName
+ * @param string $answerCode
+ * @param Translator $translator
+ * @param string $sLanguageCode
+ * @return string (or false)
+ */
+ public function getFullAnswer($fieldName, $answerCode, Translator $translator, $sLanguageCode)
+ {
+ $fullAnswer = null;
+ $fieldType = $this->fieldMap[$fieldName]['type'];
+ $question = $this->getQuestionArray($fieldName);
+ $questionId = $question['qid'];
+ $answers = $this->getAnswers($questionId);
+ if (array_key_exists($answerCode, $answers))
+ {
+ $answer = $answers[$answerCode]['answer'];
+ }
+ else
+ {
+ $answer = null;
+ }
+
+ //echo "\n$fieldName: $fieldType = $answerCode";
+ switch ($fieldType)
+ {
+ case 'R': //RANKING TYPE
+ $fullAnswer = $answer;
+ break;
+
+ case '1': //Array dual scale
+ if (mb_substr($fieldName, -1) == 0)
+ {
+ $answers = $this->getAnswers($questionId, 0);
+ }
+ else
+ {
+ $answers = $this->getAnswers($questionId, 1);
+ }
+ if (array_key_exists($answerCode, $answers))
+ {
+ $fullAnswer = $answers[$answerCode]['answer'];
+ }
+ else
+ {
+ $fullAnswer = null;
+ }
+ break;
+
+ case 'L': //DROPDOWN LIST
+ case '!':
+ if (mb_substr($fieldName, -5, 5) == 'other')
+ {
+ $fullAnswer = $answerCode;
+ }
+ else
+ {
+ if ($answerCode == '-oth-')
+ {
+ $fullAnswer = $translator->translate('Other', $sLanguageCode);
+ }
+ else
+ {
+ $fullAnswer = $answer;
+ }
+ }
+ break;
+
+ case 'O': //DROPDOWN LIST WITH COMMENT
+ if (isset($answer))
+ {
+ //This is one of the dropdown list options.
+ $fullAnswer = $answer;
+ }
+ else
+ {
+ //This is a comment.
+ $fullAnswer = $answerCode;
+ }
+ break;
+
+ case 'Y': //YES/NO
+ switch ($answerCode)
+ {
+ case 'Y':
+ $fullAnswer = $translator->translate('Yes', $sLanguageCode);
+ break;
+
+ case 'N':
+ $fullAnswer = $translator->translate('No', $sLanguageCode);
+ break;
+
+ default:
+ $fullAnswer = $translator->translate('N/A', $sLanguageCode);
+ }
+ break;
+
+ case 'G':
+ switch ($answerCode)
+ {
+ case 'M':
+ $fullAnswer = $translator->translate('Male', $sLanguageCode);
+ break;
+
+ case 'F':
+ $fullAnswer = $translator->translate('Female', $sLanguageCode);
+ break;
+
+ default:
+ $fullAnswer = $translator->translate('N/A', $sLanguageCode);
+ }
+ break;
+
+ case 'M': //MULTIOPTION
+ case 'P':
+ if (mb_substr($fieldName, -5, 5) == 'other' || mb_substr($fieldName, -7, 7) == 'comment')
+ {
+ //echo "\n -- Branch 1 --";
+ $fullAnswer = $answerCode;
+ }
+ else
+ {
+ switch ($answerCode)
+ {
+ case 'Y':
+ $fullAnswer = $translator->translate('Yes', $sLanguageCode);
+ break;
+
+ case 'N':
+ case '':
+ $fullAnswer = $translator->translate('No', $sLanguageCode);
+ break;
+
+ default:
+ //echo "\n -- Branch 2 --";
+ $fullAnswer = $answerCode;
+ }
+ }
+ break;
+
+ case 'C':
+ switch ($answerCode)
+ {
+ case 'Y':
+ $fullAnswer = $translator->translate('Yes', $sLanguageCode);
+ break;
+
+ case 'N':
+ $fullAnswer = $translator->translate('No', $sLanguageCode);
+ break;
+
+ case 'U':
+ $fullAnswer = $translator->translate('Uncertain', $sLanguageCode);
+ break;
+ }
+ break;
+
+ case 'E':
+ switch ($answerCode)
+ {
+ case 'I':
+ $fullAnswer = $translator->translate('Increase', $sLanguageCode);
+ break;
+
+ case 'S':
+ $fullAnswer = $translator->translate('Same', $sLanguageCode);
+ break;
+
+ case 'D':
+ $fullAnswer = $translator->translate('Decrease', $sLanguageCode);
+ break;
+ }
+ break;
+
+ case 'F':
+ case 'H':
+ $answers = $this->getAnswers($questionId, 0);
+ $fullAnswer = (isset($answers[$answerCode])) ? $answers[$answerCode]['answer'] : "";
+ break;
+
+ default:
+
+ $fullAnswer .= $answerCode;
+ }
+
+ return $fullAnswer;
+ }
+
+ /**
+>>>>>>> 39b5089519acbd1c950066dd62fb9f672bebcdf8
* Returns an array of possible answers to the question. If $scaleId is
* specified then only answers that match the $scaleId value will be
* returned. An empty array
@@ -549,9 +773,9 @@ class Translator
//'tid' => 'Token ID'
);
- public function translate($key, $languageCode)
+ public function translate($key, $sLanguageCode)
{
- return $this->getTranslationLibrary($languageCode)->gT($key);
+ return $this->getTranslationLibrary($sLanguageCode)->gT($key);
}
/**
@@ -568,16 +792,16 @@ public function translate($key, $languageCode)
* survey data column.
*
* @param string $column
- * @param string $languageCode
+ * @param string $sLanguageCode
* @return string
*/
- public function translateHeading($column, $languageCode)
+ public function translateHeading($column, $sLanguageCode)
{
$key = $this->getHeaderTranslationKey($column);
//echo "Column: $column, Key: $key".PHP_EOL;
if ($key)
{
- return $this->translate($key, $languageCode);
+ return $this->translate($key, $sLanguageCode);
}
else
{
@@ -585,17 +809,17 @@ public function translateHeading($column, $languageCode)
}
}
- protected function getTranslationLibrary($languageCode)
+ protected function getTranslationLibrary($sLanguageCode)
{
$library = null;
- if (!array_key_exists($languageCode, $this->translations))
+ if (!array_key_exists($sLanguageCode, $this->translations))
{
- $library = new limesurvey_lang($languageCode);
- $this->translations[$languageCode] = $library;
+ $library = new limesurvey_lang($sLanguageCode);
+ $this->translations[$sLanguageCode] = $library;
}
else
{
- $library = $this->translations[$languageCode];
+ $library = $this->translations[$sLanguageCode];
}
return $library;
}
@@ -630,10 +854,10 @@ interface IWriter
* and results from the database.
*
* @param Survey $survey
- * @param string $languagecode
- * @param FormattingOptions $options
+ * @param string $sLanguageCode
+ * @param FormattingOptions $oOptions
*/
- public function write(SurveyObj $survey, $languageCode, FormattingOptions $options);
+ public function write(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions);
public function close();
}
@@ -646,24 +870,24 @@ public function close();
*/
abstract class Writer implements IWriter
{
- public $languageCode;
+ public $sLanguageCode;
public $translator;
- public function translate($key, $languageCode)
+ public function translate($key, $sLanguageCode)
{
- return $this->translator->translate($key, $languageCode);
+ return $this->translator->translate($key, $sLanguageCode);
}
- protected function translateHeading($column, $languageCode)
+ protected function translateHeading($column, $sLanguageCode)
{
- return $this->translator->translateHeading($column, $languageCode);
+ return $this->translator->translateHeading($column, $sLanguageCode);
}
- private final function initialize(SurveyObj $survey, $languageCode, FormattingOptions $options)
+ private final function initialize(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions)
{
- $this->languageCode = $languageCode;
+ $this->languageCode = $sLanguageCode;
$this->translator = new Translator();
- $this->init($survey, $languageCode, $options);
+ $this->init($survey, $sLanguageCode, $oOptions);
}
/**
@@ -672,26 +896,27 @@ private final function initialize(SurveyObj $survey, $languageCode, FormattingOp
* may need for setup.
*
* @param Survey $survey
- * @param mixed $languageCode
- * @param FormattingOptions $options
+ * @param mixed $sLanguageCode
+ * @param FormattingOptions $oOptions
*/
- protected function init(SurveyObj $survey, $languageCode, FormattingOptions $options)
+ protected function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions)
{
//This implementation does nothing.
}
/**
- * Returns true if, given the $options, the response should be included in the
+ * Returns true if, given the $oOptions, the response should be included in the
* output, and false if otherwise.
*
* @param mixed $response
- * @param FormattingOptions $options
+ * @param FormattingOptions $oOptions
* @return boolean
*/
- protected function shouldOutputResponse(array $response, FormattingOptions $options)
+ protected function shouldOutputResponse(array $response, FormattingOptions $oOptions)
{
- switch ($options->responseCompletionState)
+ switch ($oOptions->responseCompletionState)
{
+ default:
case 'show':
return true;
break;
@@ -704,9 +929,6 @@ protected function shouldOutputResponse(array $response, FormattingOptions $opti
return isset($response['submitdate']);
break;
- default:
- //Ut oh
- safeDie('An invalid incomplete answer filter state was encountered: '.$options->responseCompletionState);
}
}
@@ -740,7 +962,7 @@ public function getAbbreviatedHeading(SurveyObj $survey, $q)
* False is returned if no matching question is found.
*
* @param Survey $survey
- * @param FormattingOptions $options
+ * @param FormattingOptions $oOptions
* @param string $fieldName
* @return string (or false)
*/
@@ -785,20 +1007,20 @@ public function getCommentSubHeading()
* the code that is called after all initialization is completed.
*
* @param Survey $survey
- * @param string $languageCode
- * @param FormattingOptions $options
+ * @param string $sLanguageCode
+ * @param FormattingOptions $oOptions
*/
- final public function write(SurveyObj $survey, $languageCode, FormattingOptions $options)
+ final public function write(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions)
{
- $this->initialize($survey, $languageCode, $options);
+ $this->initialize($survey, $sLanguageCode, $oOptions);
//Output the survey.
$headers = array();
- foreach ($options->selectedColumns as $column)
+ foreach ($oOptions->selectedColumns as $column)
{
//Output the header.
- $value = $this->translateHeading($column, $languageCode);
- if(!$value)
+ $value = $this->translateHeading($column, $sLanguageCode);
+ if($value===false)
{
//This branch may be reached erroneously if columns are added to the LimeSurvey product
//but are not updated in the Writer->headerTranslationKeys array. We should trap for this
@@ -806,27 +1028,23 @@ final public function write(SurveyObj $survey, $languageCode, FormattingOptions
//FIXME fix the above condition
//Survey question field, $column value is a field name from the getFieldMap function.
+
$q = $survey->fieldMap[$column]['q'];
- switch ($options->headingFormat)
+ switch ($oOptions->headingFormat)
{
- case 'abrev':
+ case 'abbreviated':
$value = $this->getAbbreviatedHeading($survey, $q);
break;
-
- case 'headcodes':
- $value = $this->getCodeHeading($survey, $q);
- break;
-
case 'full':
$value = $this->getFullHeading($survey, $q);
break;
-
default:
- //Ut oh.
- safeDie('An invalid header format option was specified: '.$options->headingFormat);
+ case 'code':
+ $value = $this->getCodeHeading($survey, $q);
+ break;
}
}
- if ($options->headerSpacesToUnderscores)
+ if ($oOptions->headerSpacesToUnderscores)
{
$value = str_replace(' ', '_', $value);
}
@@ -842,12 +1060,12 @@ final public function write(SurveyObj $survey, $languageCode, FormattingOptions
//If we shouldn't be outputting this response then we should skip the rest
//of the loop and continue onto the next value.
- if (!$this->shouldOutputResponse($response, $options))
+ if (!$this->shouldOutputResponse($response, $oOptions))
{
continue;
}
- foreach ($options->selectedColumns as $column)
+ foreach ($oOptions->selectedColumns as $column)
{
$value = $response[$column];
$q = $survey->fieldMap[$column]['q'];
@@ -858,22 +1076,18 @@ final public function write(SurveyObj $survey, $languageCode, FormattingOptions
continue;
}
- switch ($options->answerFormat) {
- case 'short':
- $elementArray[] = $q->transformResponseValue($this, $value, $options);
- break;
-
+ switch ($oOptions->answerFormat) {
case 'long':
- $elementArray[] = $q->transformResponseValue($this, $q->getFullAnswer($value, $this, $survey), $options);
+ $elementArray[] = $elementArray[] = $q->transformResponseValue($this, $q->getFullAnswer($value, $this, $survey), $oOptions);
break;
-
default:
- //Ut oh
- safeDie('An invalid answer format was encountered: '.$options->answerFormat);
+ case 'short':
+ $elementArray[] = $q->transformResponseValue($this, $value, $oOptions);
+ break;
}
}
- $this->outputRecord($headers, $elementArray, $options);
+ $this->outputRecord($headers, $elementArray, $oOptions);
}
}
@@ -892,9 +1106,9 @@ public function stripTagsFull($string)
*
* @param array $headers
* @param array $values
- * @param FormattingOptions $options
+ * @param FormattingOptions $oOptions
*/
- abstract protected function outputRecord($headers, $values, FormattingOptions $options);
+ abstract protected function outputRecord($headers, $values, FormattingOptions $oOptions);
}
class CsvWriter extends Writer
@@ -910,7 +1124,7 @@ function __construct()
$this->hasOutputHeader = false;
}
- protected function outputRecord($headers, $values, FormattingOptions $options)
+ protected function outputRecord($headers, $values, FormattingOptions $oOptions)
{
if(!$this->hasOutputHeader)
{
@@ -965,7 +1179,7 @@ public function __construct()
$this->isBeginning = true;
}
- public function init(SurveyObj $survey, $languageCode, FormattingOptions $options)
+ public function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions)
{
//header("Content-Disposition: attachment; filename=results-survey".$survey->id.".doc");
//header("Content-type: application/vnd.ms-word");
@@ -985,16 +1199,16 @@ public function init(SurveyObj $survey, $languageCode, FormattingOptions $option
/**
* @param array $headers
* @param array $values
- * @param FormattingOptions $options
+ * @param FormattingOptions $oOptions
*/
- protected function outputRecord($headers, $values, FormattingOptions $options)
+ protected function outputRecord($headers, $values, FormattingOptions $oOptions)
{
- if ($options->answerFormat == 'short')
+ if ($oOptions->answerFormat == 'short')
{
//No headers at all, only output values.
$this->output .= implode($this->separator, $values).PHP_EOL;
}
- elseif ($options->answerFormat == 'long')
+ elseif ($oOptions->answerFormat == 'long')
{
//Output each record, one per page, with a header preceding every value.
if ($this->isBeginning)
@@ -1058,14 +1272,11 @@ public function __construct($filename = null)
Yii::import('application.libraries.admin.pear.Spreadsheet.Excel.Xlswriter', true);
if (!empty($filename))
{
- $this->workbook = new xlswriter;
- $this->outputToFile = true;
- $this->fileName = $filename;
+ $this->workbook = new xlswriter($filename);
}
else
{
$this->workbook = new xlswriter;
- $this->outputToFile = false;
}
$this->separator = '~|';
@@ -1073,7 +1284,7 @@ public function __construct($filename = null)
$this->rowCounter = 1;
}
- protected function init(SurveyObj $survey, $languageCode, FormattingOptions $options)
+ protected function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions)
{
$this->workbook->send('results-survey'.$survey->id.'.xls');
$worksheetName = $survey->languageSettings[0]['surveyls_title'];
@@ -1088,7 +1299,7 @@ protected function init(SurveyObj $survey, $languageCode, FormattingOptions $opt
$this->currentSheet = $sheet;
}
- protected function outputRecord($headers, $values, FormattingOptions $options)
+ protected function outputRecord($headers, $values, FormattingOptions $oOptions)
{
if (!$this->hasOutputHeader)
{
@@ -1151,7 +1362,8 @@ public function __construct($filename = null)
//come from the Lime Survey config files.
global $pdforientation, $pdfdefaultfont, $pdffontsize;
-
+
+ Yii::import('application.libraries.admin.pdf', true);
$this->pdf = new PDF($pdforientation,'mm','A4');
$this->pdf->SetFont($pdfdefaultfont, '', $pdffontsize);
$this->pdf->AddPage();
@@ -1163,16 +1375,16 @@ public function __construct($filename = null)
$this->rowCounter = 0;
}
- protected function init(SurveyObj $survey, $languageCode, FormattingOptions $options)
+ protected function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions)
{
$this->surveyName = $survey->languageSettings[0]['surveyls_title'];
$this->pdf->titleintopdf($this->surveyName, $survey->languageSettings[0]['surveyls_description']);
}
- public function outputRecord($headers, $values, FormattingOptions $options)
+ public function outputRecord($headers, $values, FormattingOptions $oOptions)
{
$this->rowCounter++;
- if ($options->answerFormat == 'short')
+ if ($oOptions->answerFormat == 'short')
{
$pdfstring = '';
$this->pdf->titleintopdf($this->translate('New Record', $this->languageCode));
@@ -1182,7 +1394,7 @@ public function outputRecord($headers, $values, FormattingOptions $options)
}
$this->pdf->intopdf($pdfstring);
}
- elseif ($options->answerFormat == 'long')
+ elseif ($oOptions->answerFormat == 'long')
{
if ($this->rowCounter != 1)
{
@@ -1200,7 +1412,7 @@ public function outputRecord($headers, $values, FormattingOptions $options)
}
else
{
- safeDie('An invalid answer format was encountered: '.$options->answerFormat);
+ safeDie('An invalid answer format was encountered: '.$oOptions->answerFormat);
}
}
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
index d99eed4c891..47ebb188946 100644
--- a/application/helpers/admin/import_helper.php
+++ b/application/helpers/admin/import_helper.php
@@ -9,7 +9,6 @@
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See COPYRIGHT.php for copyright notices and details.
-*
*/
@@ -404,7 +403,7 @@ function CSVImportGroup($sFullFilepath, $iNewSID)
}
// replace the sid
- $oldsid=$grouprowdata['sid'];
+ $iOldSID=$grouprowdata['sid'];
$grouprowdata['sid']=$iNewSID;
// replace the gid or remove it if needed (it also will calculate the group order if is a new group)
@@ -428,8 +427,8 @@ function CSVImportGroup($sFullFilepath, $iNewSID)
$grouprowdata=array_map('convertCSVReturnToReturn', $grouprowdata);
// translate internal links
- $grouprowdata['group_name']=translateLinks('survey', $oldsid, $iNewSID, $grouprowdata['group_name']);
- $grouprowdata['description']=translateLinks('survey', $oldsid, $iNewSID, $grouprowdata['description']);
+ $grouprowdata['group_name']=translateLinks('survey', $iOldSID, $iNewSID, $grouprowdata['group_name']);
+ $grouprowdata['description']=translateLinks('survey', $iOldSID, $iNewSID, $grouprowdata['description']);
$gres = Yii::app()->db->createCommand()->insert('{{groups}}', $grouprowdata);
@@ -502,9 +501,9 @@ function CSVImportGroup($sFullFilepath, $iNewSID)
$questionrowdata=array_map('convertCSVReturnToReturn', $questionrowdata);
// translate internal links
- $questionrowdata['title']=translateLinks('survey', $oldsid, $iNewSID, $questionrowdata['title']);
- $questionrowdata['question']=translateLinks('survey', $oldsid, $iNewSID, $questionrowdata['question']);
- $questionrowdata['help']=translateLinks('survey', $oldsid, $iNewSID, $questionrowdata['help']);
+ $questionrowdata['title']=translateLinks('survey', $iOldSID, $iNewSID, $questionrowdata['title']);
+ $questionrowdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $questionrowdata['question']);
+ $questionrowdata['help']=translateLinks('survey', $iOldSID, $iNewSID, $questionrowdata['help']);
$newvalues=array_values($questionrowdata);
$qres = Yii::app()->db->createCommand()->insert('{{questions}}', $questionrowdata);
@@ -617,7 +616,7 @@ function CSVImportGroup($sFullFilepath, $iNewSID)
$qres = Yii::app()->db->createCommand()->insert('{{defaultvalues}}', $insertdata);
}
// translate internal links
- $answerrowdata['answer']=translateLinks('survey', $oldsid, $iNewSID, $answerrowdata['answer']);
+ $answerrowdata['answer']=translateLinks('survey', $iOldSID, $iNewSID, $answerrowdata['answer']);
// Everything set - now insert it
$answerrowdata = array_map('convertCSVReturnToReturn', $answerrowdata);
@@ -838,14 +837,14 @@ function XMLImportGroup($sFullFilepath, $iNewSID)
{
$insertdata[(string)$key]=(string)$value;
}
- $oldsid=$insertdata['sid'];
+ $iOldSID=$insertdata['sid'];
$insertdata['sid']=$iNewSID;
$insertdata['group_order']=$newgrouporder;
$oldgid=$insertdata['gid']; unset($insertdata['gid']); // save the old qid
// now translate any links
- $insertdata['group_name']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['group_name']);
- $insertdata['description']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['description']);
+ $insertdata['group_name']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['group_name']);
+ $insertdata['description']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['description']);
// Insert the new question
if (isset($aGIDReplacements[$oldgid]))
{
@@ -876,16 +875,16 @@ function XMLImportGroup($sFullFilepath, $iNewSID)
{
$insertdata[(string)$key]=(string)$value;
}
- $oldsid=$insertdata['sid'];
+ $iOldSID=$insertdata['sid'];
$insertdata['sid']=$iNewSID;
if (!isset($aGIDReplacements[$insertdata['gid']]) || trim($insertdata['title'])=='') continue; // Skip questions with invalid group id
$insertdata['gid']=$aGIDReplacements[$insertdata['gid']];
$oldqid=$insertdata['qid']; unset($insertdata['qid']); // save the old qid
// now translate any links
- $insertdata['title']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['title']);
- $insertdata['question']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['question']);
- $insertdata['help']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['help']);
+ $insertdata['title']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['title']);
+ $insertdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['question']);
+ $insertdata['help']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['help']);
// Insert the new question
if (isset($aQIDReplacements[$oldqid]))
{
@@ -919,9 +918,9 @@ function XMLImportGroup($sFullFilepath, $iNewSID)
$insertdata['parent_qid']=$aQIDReplacements[(int)$insertdata['parent_qid']]; // remap the parent_qid
// now translate any links
- $insertdata['title']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['title']);
- $insertdata['question']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['question']);
- $insertdata['help']=translateLinks('survey', $oldsid, $iNewSID, !empty($insertdata['help']) ? $insertdata['help'] : '');
+ $insertdata['title']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['title']);
+ $insertdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['question']);
+ $insertdata['help']=translateLinks('survey', $iOldSID, $iNewSID, !empty($insertdata['help']) ? $insertdata['help'] : '');
if (isset($aQIDReplacements[$oldsqid])){
$insertdata['qid']=$aQIDReplacements[$oldsqid];
}
@@ -1427,7 +1426,7 @@ function CSVImportQuestion($sFullFilepath, $iNewSID, $newgid)
// replace the sid
$oldqid = $questionrowdata['qid'];
- $oldsid = $questionrowdata['sid'];
+ $iOldSID = $questionrowdata['sid'];
$oldgid = $questionrowdata['gid'];
// Remove qid field if there is no newqid; and set it to newqid if it's set
@@ -1471,8 +1470,8 @@ function CSVImportQuestion($sFullFilepath, $iNewSID, $newgid)
$questionrowdata=array_map('convertCSVReturnToReturn', $questionrowdata);
// translate internal links
- $questionrowdata['question']=translateLinks('survey', $oldsid, $iNewSID, $questionrowdata['question']);
- $questionrowdata['help']=translateLinks('survey', $oldsid, $iNewSID, $questionrowdata['help']);
+ $questionrowdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $questionrowdata['question']);
+ $questionrowdata['help']=translateLinks('survey', $iOldSID, $iNewSID, $questionrowdata['help']);
$newvalues=array_values($questionrowdata);
if ($xssfilter)
@@ -1587,7 +1586,7 @@ function CSVImportQuestion($sFullFilepath, $iNewSID, $newgid)
}
// translate internal links
- $answerrowdata['answer']=translateLinks('survey', $oldsid, $iNewSID, $answerrowdata['answer']);
+ $answerrowdata['answer']=translateLinks('survey', $iOldSID, $iNewSID, $answerrowdata['answer']);
// Everything set - now insert it
$answerrowdata = array_map('convertCSVReturnToReturn', $answerrowdata);
@@ -1752,16 +1751,16 @@ function XMLImportQuestion($sFullFilepath, $iNewSID, $newgid)
{
$insertdata[(string)$key]=(string)$value;
}
- $oldsid=$insertdata['sid'];
+ $iOldSID=$insertdata['sid'];
$insertdata['sid']=$iNewSID;
$insertdata['gid']=$newgid;
$insertdata['question_order']=$newquestionorder;
$oldqid=$insertdata['qid']; unset($insertdata['qid']); // save the old qid
// now translate any links
- $insertdata['title']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['title']);
- $insertdata['question']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['question']);
- $insertdata['help']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['help']);
+ $insertdata['title']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['title']);
+ $insertdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['question']);
+ $insertdata['help']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['help']);
// Insert the new question
if (isset($aQIDReplacements[$oldqid]))
{
@@ -1798,10 +1797,10 @@ function XMLImportQuestion($sFullFilepath, $iNewSID, $newgid)
// now translate any links
- $insertdata['question']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['question']);
+ $insertdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['question']);
if (isset($insertdata['help']))
{
- $insertdata['help']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['help']);
+ $insertdata['help']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['help']);
}
if (isset($aQIDReplacements[$oldsqid])){
$insertdata['qid']=$aQIDReplacements[$oldsqid];
@@ -2023,15 +2022,12 @@ function CSVImportLabelset($sFullFilepath, $options)
unset($labelsetrowdata['lid']);
- $newvalues=array_values($labelsetrowdata);
if ($xssfilter)
XSSFilterArray($newvalues);
- $lsainsert = "insert INTO {{labelsets}} (".implode(',',array_keys($labelsetrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix
- $lsiresult= Yii::app()->db->createCommand($lsainsert)->query();
+ // Insert the label set entry and get the new insert id for the labels inside this labelset
+ $newlid=Labelsets::model()->insertRecords($labelsetrowdata);
$results['labelsets']++;
- // Get the new insert id for the labels inside this labelset
- $newlid=Yii::app()->db->getLastInsertID();
if ($labelsarray) {
$count=0;
@@ -2054,12 +2050,9 @@ function CSVImportLabelset($sFullFilepath, $options)
$labelrowdata["assessment_value"]=(int)$labelrowdata["code"];
}
- $newvalues=array_values($labelrowdata);
if ($xssfilter)
XSSFilterArray($newvalues);
- $lainsert = "insert INTO {{labels}} (".implode(',',array_keys($labelrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix
- $liresult=Yii::app()->db->createCommand($lainsert)->query();
-
+ Label::model()->insertRecords($labelrowdata);
$results['labels']++;
}
}
@@ -2606,9 +2599,9 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
$sfieldorders =convertCSVRowToArray($surveyarray[0],',','"');
$sfieldcontents=convertCSVRowToArray($surveyarray[1],',','"');
$surveyrowdata=array_combine($sfieldorders,$sfieldcontents);
- $oldsid=$surveyrowdata["sid"];
+ $iOldSID=$surveyrowdata["sid"];
- if (!$oldsid)
+ if (!$iOldSID)
{
if ($importingfrom == "http")
{
@@ -2632,7 +2625,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
}
else
{
- $iNewSID = GetNewSurveyID($oldsid);
+ $iNewSID = GetNewSurveyID($iOldSID);
}
@@ -2665,7 +2658,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
$surveyrowdata['bounce_email']=$surveyrowdata['adminemail'];
if (empty($surveyrowdata['datecreated'])) {$surveyrowdata['datecreated'] = new CDbExpression('NOW()'); }
- $iNewSID = Survey::insertNewSurvey($surveyrowdata, $xssfilter) or safeDie (" ".$clang->gT("Import of this survey file failed")." {$surveyarray[0]}
\n" );
+ $iNewSID = Survey::model()->insertNewSurvey($surveyrowdata) or safeDie (" ".$clang->gT("Import of this survey file failed")." {$surveyarray[0]}
\n" );
// Now import the survey language settings
$fieldorders=convertCSVRowToArray($surveylsarray[0],',','"');
@@ -2680,19 +2673,19 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
// translate internal links
if ($bTranslateLinks)
{
- $surveylsrowdata['surveyls_title']=translateLinks('survey', $oldsid, $iNewSID, $surveylsrowdata['surveyls_title']);
- $surveylsrowdata['surveyls_description']=translateLinks('survey', $oldsid, $iNewSID, $surveylsrowdata['surveyls_description']);
- $surveylsrowdata['surveyls_welcometext']=translateLinks('survey', $oldsid, $iNewSID, $surveylsrowdata['surveyls_welcometext']);
- $surveylsrowdata['surveyls_urldescription']=translateLinks('survey', $oldsid, $iNewSID, $surveylsrowdata['surveyls_urldescription']);
- $surveylsrowdata['surveyls_email_invite']=translateLinks('survey', $oldsid, $iNewSID, $surveylsrowdata['surveyls_email_invite']);
- $surveylsrowdata['surveyls_email_remind']=translateLinks('survey', $oldsid, $iNewSID, $surveylsrowdata['surveyls_email_remind']);
- $surveylsrowdata['surveyls_email_register']=translateLinks('survey', $oldsid, $iNewSID, $surveylsrowdata['surveyls_email_register']);
- $surveylsrowdata['surveyls_email_confirm']=translateLinks('survey', $oldsid, $iNewSID, $surveylsrowdata['surveyls_email_confirm']);
+ $surveylsrowdata['surveyls_title']=translateLinks('survey', $iOldSID, $iNewSID, $surveylsrowdata['surveyls_title']);
+ $surveylsrowdata['surveyls_description']=translateLinks('survey', $iOldSID, $iNewSID, $surveylsrowdata['surveyls_description']);
+ $surveylsrowdata['surveyls_welcometext']=translateLinks('survey', $iOldSID, $iNewSID, $surveylsrowdata['surveyls_welcometext']);
+ $surveylsrowdata['surveyls_urldescription']=translateLinks('survey', $iOldSID, $iNewSID, $surveylsrowdata['surveyls_urldescription']);
+ $surveylsrowdata['surveyls_email_invite']=translateLinks('survey', $iOldSID, $iNewSID, $surveylsrowdata['surveyls_email_invite']);
+ $surveylsrowdata['surveyls_email_remind']=translateLinks('survey', $iOldSID, $iNewSID, $surveylsrowdata['surveyls_email_remind']);
+ $surveylsrowdata['surveyls_email_register']=translateLinks('survey', $iOldSID, $iNewSID, $surveylsrowdata['surveyls_email_register']);
+ $surveylsrowdata['surveyls_email_confirm']=translateLinks('survey', $iOldSID, $iNewSID, $surveylsrowdata['surveyls_email_confirm']);
}
unset($surveylsrowdata['lastpage']);
$surveylsrowdata['surveyls_survey_id']=$iNewSID;
- $lsiresult = Surveys_languagesettings::model()->insertNewSurvey($surveylsrowdata, $xssfilter) or safeDie(" ".$clang->gT("Import of this survey file failed")." ");
+ $lsiresult = Surveys_languagesettings::model()->insertNewSurvey($surveylsrowdata) or safeDie(" ".$clang->gT("Import of this survey file failed")." ");
}
@@ -2831,7 +2824,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
$grouprowdata=array_combine($gafieldorders,$gacfieldcontents);
//Now an additional integrity check if there are any groups not belonging into this survey
- if ($grouprowdata['sid'] != $oldsid)
+ if ($grouprowdata['sid'] != $iOldSID)
{
$results['fatalerror'] = $clang->gT("A group in the CSV/SQL file is not part of the same survey. The import of the survey was stopped.")." \n";
return $results;
@@ -2852,8 +2845,8 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
// translate internal links
if ($bTranslateLinks)
{
- $grouprowdata['group_name']=translateLinks('survey', $oldsid, $iNewSID, $grouprowdata['group_name']);
- $grouprowdata['description']=translateLinks('survey', $oldsid, $iNewSID, $grouprowdata['description']);
+ $grouprowdata['group_name']=translateLinks('survey', $iOldSID, $iNewSID, $grouprowdata['group_name']);
+ $grouprowdata['description']=translateLinks('survey', $iOldSID, $iNewSID, $grouprowdata['description']);
}
if (isset($grouprowdata['gid'])) switchMSSQLIdentityInsert('groups',true);
@@ -2929,8 +2922,8 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
// translate internal links
if ($bTranslateLinks)
{
- $questionrowdata['question']=translateLinks('survey', $oldsid, $iNewSID, $questionrowdata['question']);
- $questionrowdata['help']=translateLinks('survey', $oldsid, $iNewSID, $questionrowdata['help']);
+ $questionrowdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $questionrowdata['question']);
+ $questionrowdata['help']=translateLinks('survey', $iOldSID, $iNewSID, $questionrowdata['help']);
}
@@ -3060,7 +3053,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
// translate internal links
if ($bTranslateLinks)
{
- $answerrowdata['answer']=translateLinks('survey', $oldsid, $iNewSID, $answerrowdata['answer']);
+ $answerrowdata['answer']=translateLinks('survey', $iOldSID, $iNewSID, $answerrowdata['answer']);
}
// Everything set - now insert it
$answerrowdata = array_map('convertCSVReturnToReturn', $answerrowdata);
@@ -3168,7 +3161,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
$asrowdata["sid"]=$iNewSID;
unset($asrowdata["id"]);
- $result=Assesments::model()->insertRecords($asrowdata) or safeDie("Couldn't insert assessment ");
+ $result=Assessments::model()->insertRecords($asrowdata) or safeDie("Couldn't insert assessment ");
unset($newgid);
}
@@ -3183,9 +3176,9 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
$asrowdata=array_combine($fieldorders,$fieldcontents);
- $oldsid=$asrowdata["sid"];
+ $iOldSID=$asrowdata["sid"];
foreach ($substitutions as $subs) {
- if ($oldsid==$subs[0]) {$iNewSID=$subs[3];}
+ if ($iOldSID==$subs[0]) {$iNewSID=$subs[3];}
}
$asrowdata["sid"]=$iNewSID;
@@ -3208,14 +3201,14 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
$asrowdata=array_combine($fieldorders,$fieldcontents);
- $oldsid=$asrowdata["sid"];
+ $iOldSID=$asrowdata["sid"];
$newqid="";
$newquotaid="";
$oldqid=$asrowdata['qid'];
$oldquotaid=$asrowdata['quota_id'];
foreach ($substitutions as $subs) {
- if ($oldsid==$subs[0]) {$iNewSID=$subs[3];}
+ if ($iOldSID==$subs[0]) {$iNewSID=$subs[3];}
if ($oldqid==$subs[2]) {$newqid=$subs[5];}
}
@@ -3299,7 +3292,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
$conditionrowdata["qid"]=$aQIDReplacements[$conditionrowdata["qid"]];
$conditionrowdata["cqid"]=$aQIDReplacements[$conditionrowdata["cqid"]];
$oldcfieldname=$conditionrowdata["cfieldname"];
- $conditionrowdata["cfieldname"]=str_replace($oldsid.'X'.$oldgid.'X'.$oldcqid,$iNewSID.'X'.$aGIDReplacements[$oldgid].'X'.$conditionrowdata["cqid"],$conditionrowdata["cfieldname"]);
+ $conditionrowdata["cfieldname"]=str_replace($iOldSID.'X'.$oldgid.'X'.$oldcqid,$iNewSID.'X'.$aGIDReplacements[$oldgid].'X'.$conditionrowdata["cqid"],$conditionrowdata["cfieldname"]);
$result=Conditions::model()->insertRecords($conditionrowdata) or safeDie("Couldn't insert condition ");
@@ -3311,11 +3304,106 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
$importresults['importversion']=$importversion;
$importresults['newsid']=$iNewSID;
- $importresults['oldsid']=$oldsid;
+ $importresults['oldsid']=$iOldSID;
return $importresults;
}
+function importSurveyFile($sFullFilepath, $bTranslateLinksFields, $sNewSurveyName=NULL, $DestSurveyID=NULL)
+{
+ $aPathInfo = pathinfo($sFullFilepath);
+ if (isset($aPathInfo['extension']))
+ {
+ $sExtension = $aPathInfo['extension'];
+ }
+ else
+ {
+ $sExtension = "";
+ }
+ if (isset($sExtension) && strtolower($sExtension) == 'csv')
+ {
+ return CSVImportSurvey($sFullFilepath, $DestSurveyID, $bTranslateLinksFields);
+ }
+ elseif (isset($sExtension) && strtolower($sExtension) == 'lss')
+ {
+ return XMLImportSurvey($sFullFilepath, null, $sNewSurveyName, $DestSurveyID, $bTranslateLinksFields);
+ }
+ elseif (isset($sExtension) && strtolower($sExtension) == 'xls')
+ {
+ return ExcelImportSurvey($sFullFilepath);
+ }
+ elseif (isset($sExtension) && strtolower($sExtension) == 'zip') // Import a survey archive
+ {
+ Yii::import("application.libraries.admin.pclzip.pclzip", true);
+ $pclzip = new PclZip(array('p_zipname' => $sFullFilepath));
+ $aFiles = $pclzip->listContent();
+
+ if ($pclzip->extract(PCLZIP_OPT_PATH, Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR, PCLZIP_OPT_BY_EREG, '/(lss|lsr|lsi|lst)$/') == 0)
+ {
+ unset($pclzip);
+ }
+ // Step 1 - import the LSS file and activate the survey
+ foreach ($aFiles as $aFile)
+ {
+ if (pathinfo($aFile['filename'], PATHINFO_EXTENSION) == 'lss')
+ {
+ //Import the LSS file
+ $aImportResults = XMLImportSurvey(Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . $aFile['filename'], null, null, null, true);
+ // Activate the survey
+ Yii::app()->loadHelper("admin/activate");
+ $activateoutput = activateSurvey($aImportResults['newsid']);
+ unlink(Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . $aFile['filename']);
+ break;
+ }
+ }
+ // Step 2 - import the responses file
+ foreach ($aFiles as $aFile)
+ {
+ if (pathinfo($aFile['filename'], PATHINFO_EXTENSION) == 'lsr')
+ {
+ //Import the LSS file
+ $aResponseImportResults = XMLImportResponses(Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . $aFile['filename'], $aImportResults['newsid'], $aImportResults['FieldReMap']);
+ $aImportResults = array_merge($aResponseImportResults, $aImportResults);
+ unlink(Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . $aFile['filename']);
+ break;
+ }
+ }
+ // Step 3 - import the tokens file - if exists
+ foreach ($aFiles as $aFile)
+ {
+ if (pathinfo($aFile['filename'], PATHINFO_EXTENSION) == 'lst')
+ {
+ Yii::app()->loadHelper("admin/token");
+ if (createTokenTable($aImportResults['newsid']))
+ $aTokenCreateResults = array('tokentablecreated' => true);
+ $aImportResults = array_merge($aTokenCreateResults, $aImportResults);
+ $aTokenImportResults = XMLImportTokens(Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . $aFile['filename'], $aImportResults['newsid']);
+ $aImportResults = array_merge($aTokenImportResults, $aImportResults);
+ unlink(Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . $aFile['filename']);
+ break;
+ }
+ }
+ // Step 4 - import the timings file - if exists
+ foreach ($aFiles as $aFile)
+ {
+ if (pathinfo($aFile['filename'], PATHINFO_EXTENSION) == 'lsi' && tableExists("survey_{$aImportResults['newsid']}_timings"))
+ {
+ $aTimingsImportResults = XMLImportTimings(Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . $aFile['filename'], $aImportResults['newsid'], $aImportResults['FieldReMap']);
+ $aImportResults = array_merge($aTimingsImportResults, $aImportResults);
+ unlink(Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . $aFile['filename']);
+ break;
+ }
+ }
+ return $aImportResults;
+ }
+ else
+ {
+ return null;
+ }
+
+}
+
+
/**
* This function imports a LimeSurvey .lss survey XML file
@@ -3383,14 +3471,10 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
$insertdata[(string)$key]=(string)$value;
}
- $oldsid=$insertdata['sid'];
+ $iOldSID=$results['oldsid']=$insertdata['sid'];
if($iDesiredSurveyId!=NULL)
{
- $iNewSID=GetNewSurveyID($iDesiredSurveyId);
- }
- else
- {
- $iNewSID=GetNewSurveyID($oldsid);
+ $insertdata['wishSID']=GetNewSurveyID($iDesiredSurveyId);
}
if ($iDBVersion<=143)
@@ -3399,25 +3483,15 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
unset($insertdata['private']);
unset($insertdata['notification']);
}
- $insertdata['startdate']=NULL;
- //Now insert the new SID and change some values
- $insertdata['sid'] = $iNewSID;
+
+ unset($insertdata['expires']);
+ unset($insertdata['startdate']);
+
//Make sure it is not set active
$insertdata['active']='N';
//Set current user to be the owner
$insertdata['owner_id']=Yii::app()->session['loginID'];
- //Change creation date to import date
- $insertdata['datecreated'] = new CDbExpression('NOW()');
-
- if (isset($insertdata['expires']) && $insertdata['expires'] == '')
- {
- $insertdata['expires'] = NULL;
- }
- if (isset($insertdata['startdate']) && $insertdata['startdate'] == '')
- {
- $insertdata['startdate'] = NULL;
- }
if (isset($insertdata['bouncetime']) && $insertdata['bouncetime'] == '')
{
$insertdata['bouncetime'] = NULL;
@@ -3428,18 +3502,11 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
$insertdata['showxquestions']=$insertdata['showXquestions'];
unset($insertdata['showXquestions']);
}
-
- switchMSSQLIdentityInsert('surveys',true);
- if ($xssfilter)
- XSSFilterArray($insertdata);
- $iNewSID = Survey::model()->insertNewSurvey($insertdata) or safeDie($clang->gT("Error").": Failed to insert data ");
+ $iNewSID = $results['newsid'] = Survey::model()->insertNewSurvey($insertdata) or safeDie($clang->gT("Error").": Failed to insert data ");
$results['surveys']++;
- switchMSSQLIdentityInsert('surveys',false);
}
- $results['newsid']=$iNewSID;
- $results['oldsid']=$oldsid;
// Import survey languagesettings table ===================================================================================
@@ -3460,17 +3527,17 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
{
if ($sNewSurveyName == NULL)
{
- $insertdata['surveyls_title']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['surveyls_title']);
+ $insertdata['surveyls_title']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_title']);
} else {
- $insertdata['surveyls_title']=translateLinks('survey', $oldsid, $iNewSID, $sNewSurveyName);
- }
- $insertdata['surveyls_description']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['surveyls_description']);
- $insertdata['surveyls_welcometext']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['surveyls_welcometext']);
- $insertdata['surveyls_urldescription']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['surveyls_urldescription']);
- $insertdata['surveyls_email_invite']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['surveyls_email_invite']);
- $insertdata['surveyls_email_remind']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['surveyls_email_remind']);
- $insertdata['surveyls_email_register']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['surveyls_email_register']);
- $insertdata['surveyls_email_confirm']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['surveyls_email_confirm']);
+ $insertdata['surveyls_title']=translateLinks('survey', $iOldSID, $iNewSID, $sNewSurveyName);
+ }
+ $insertdata['surveyls_description']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_description']);
+ $insertdata['surveyls_welcometext']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_welcometext']);
+ $insertdata['surveyls_urldescription']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_urldescription']);
+ $insertdata['surveyls_email_invite']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_invite']);
+ $insertdata['surveyls_email_remind']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_remind']);
+ $insertdata['surveyls_email_register']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_register']);
+ $insertdata['surveyls_email_confirm']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_confirm']);
}
@@ -3491,15 +3558,15 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
$insertdata[(string)$key]=(string)$value;
}
if (!in_array($insertdata['language'],$aLanguagesSupported)) continue;
- $oldsid=$insertdata['sid'];
+ $iOldSID=$insertdata['sid'];
$insertdata['sid']=$iNewSID;
$oldgid=$insertdata['gid']; unset($insertdata['gid']); // save the old qid
// now translate any links
if ($bTranslateInsertansTags)
{
- $insertdata['group_name']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['group_name']);
- $insertdata['description']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['description']);
+ $insertdata['group_name']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['group_name']);
+ $insertdata['description']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['description']);
}
// Insert the new group
if (isset($aGIDReplacements[$oldgid]))
@@ -3536,7 +3603,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
$insertdata[(string)$key]=(string)$value;
}
if (!in_array($insertdata['language'],$aLanguagesSupported)) continue;
- $oldsid=$insertdata['sid'];
+ $iOldSID=$insertdata['sid'];
$insertdata['sid']=$iNewSID;
$insertdata['gid']=$aGIDReplacements[$insertdata['gid']];
$oldqid=$insertdata['qid']; unset($insertdata['qid']); // save the old qid
@@ -3544,8 +3611,8 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
// now translate any links
if ($bTranslateInsertansTags)
{
- $insertdata['question']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['question']);
- $insertdata['help']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['help']);
+ $insertdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['question']);
+ $insertdata['help']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['help']);
}
// Insert the new question
if (isset($aQIDReplacements[$oldqid]))
@@ -3589,8 +3656,8 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
// now translate any links
if ($bTranslateInsertansTags)
{
- $insertdata['question']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['question']);
- if (isset($insertdata['help'])) $insertdata['help']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['help']);
+ $insertdata['question']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['question']);
+ if (isset($insertdata['help'])) $insertdata['help']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['help']);
}
if (isset($aQIDReplacements[$oldsqid])){
$insertdata['qid']=$aQIDReplacements[$oldsqid];
@@ -3629,7 +3696,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
// now translate any links
if ($bTranslateInsertansTags)
{
- $insertdata['answer']=translateLinks('survey', $oldsid, $iNewSID, $insertdata['answer']);
+ $insertdata['answer']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['answer']);
}
if ($xssfilter)
XSSFilterArray($insertdata);
@@ -3693,7 +3760,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
$results['defaultvalues']++;
}
}
- $aOldNewFieldmap=reverseTranslateFieldNames($oldsid,$iNewSID,$aGIDReplacements,$aQIDReplacements);
+ $aOldNewFieldmap=reverseTranslateFieldNames($iOldSID,$iNewSID,$aGIDReplacements,$aQIDReplacements);
// Import conditions ---------------------------------------------------------
if(isset($xml->conditions))
@@ -3886,10 +3953,10 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
// Set survey rights
Survey_permissions::model()->giveAllSurveyPermissions(Yii::app()->session['loginID'],$iNewSID);
- $aOldNewFieldmap=reverseTranslateFieldNames($oldsid,$iNewSID,$aGIDReplacements,$aQIDReplacements);
+ $aOldNewFieldmap=reverseTranslateFieldNames($iOldSID,$iNewSID,$aGIDReplacements,$aQIDReplacements);
$results['FieldReMap']=$aOldNewFieldmap;
LimeExpressionManager::SetSurveyId($iNewSID);
- translateInsertansTags($iNewSID,$oldsid,$aOldNewFieldmap);
+ translateInsertansTags($iNewSID,$iOldSID,$aOldNewFieldmap);
LimeExpressionManager::RevertUpgradeConditionsToRelevance($iNewSID);
LimeExpressionManager::UpgradeConditionsToRelevance($iNewSID);
return $results;
@@ -3899,38 +3966,36 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
* This function returns a new random sid if the existing one is taken,
* otherwise it returns the old one.
*
-* @param mixed $oldsid
+* @param mixed $iOldSID
*/
-function GetNewSurveyID($oldsid)
+function GetNewSurveyID($iOldSID)
{
Yii::app()->loadHelper('database');
- $query = "SELECT sid FROM {{surveys}} WHERE sid=$oldsid";
+ $query = "SELECT sid FROM {{surveys}} WHERE sid=$iOldSID";
- $res = Yii::app()->db->createCommand($query)->query();
- $isresult = $res->read();
+ $aRow = Yii::app()->db->createCommand($query)->queryRow();
if(Yii::app()->getConfig('filterxsshtml') && Yii::app()->session['USER_RIGHT_SUPERADMIN'] != 1)
$xssfilter = true;
else
$xssfilter = false;
-
//if (!is_null($isresult))
- if($res->count() > 0)
+ if($aRow!==false)
{
// Get new random ids until one is found that is not used
do
{
$iNewSID = randomChars(5,'123456789');
$query = "SELECT sid FROM {{surveys}} WHERE sid=$iNewSID";
- $res = Yii::app()->db->createCommand($query)->query();
+ $aRow = Yii::app()->db->createCommand($query)->queryRow();
}
- while ($res->count());
+ while ($aRow!==false);
return $iNewSID;
}
else
{
- return $oldsid;
+ return $iOldSID;
}
}
@@ -4202,14 +4267,14 @@ function ExcelImportSurvey($sFullFilepath)
}
}
- $oldsid = 1;
+ $iOldSID = 1;
if (isset($surveyinfo['sid']))
{
- $oldsid = (int) $surveyinfo['sid'];
+ $iOldSID = (int) $surveyinfo['sid'];
}
// Create the survey entry
- $iNewSID=GetNewSurveyID($oldsid);
+ $iNewSID=GetNewSurveyID($iOldSID);
$surveyinfo['startdate']=NULL;
$surveyinfo['sid']=$iNewSID;
$surveyinfo['active']='N';
@@ -4258,10 +4323,10 @@ function ExcelImportSurvey($sFullFilepath)
$baselang = $surveyinfo['language']; // the base language
}
- $rownumber = 1;
+ $rownumber = 1;
foreach ($adata as $row)
{
- $rownumber += 1;
+ $rownumber += 1;
$row = str_replace(chr(0xA0),' ',$row);
switch($row['class'])
{
@@ -4332,11 +4397,11 @@ function ExcelImportSurvey($sFullFilepath)
$result = Questions::model()->insertRecords($insertdata); //or safeDie ($clang->gT("Error").": Failed to insert question ");
if(!$result){
- $results['error'][] = $clang->gT("Error")." : ".$clang->gT("Could not insert question").". ".$clang->gT("Excel row number ").$rownumber." (".$qname.")";
- break;
+ $results['error'][] = $clang->gT("Error")." : ".$clang->gT("Could not insert question").". ".$clang->gT("Excel row number ").$rownumber." (".$qname.")";
+ break;
}
- $newqid = $result;
+ $newqid = $result;
if (!isset($qinfo[$qname]))
{
$results['questions']++;
@@ -4481,7 +4546,7 @@ function ExcelImportSurvey($sFullFilepath)
$result = Answers::model()->insertRecords($insertdata); // or safeDie("Error: Failed to insert answer ");
if(!$result){
- $results['error'][] = $clang->gT("Error")." : ".$clang->gT("Could not insert answer").". ".$clang->gT("Excel row number ").$rownumber;
+ $results['error'][] = $clang->gT("Error")." : ".$clang->gT("Could not insert answer").". ".$clang->gT("Excel row number ").$rownumber;
}
$results['answers']++;
break;
@@ -4489,12 +4554,12 @@ function ExcelImportSurvey($sFullFilepath)
}
- // Delete the survey if error found
- if(is_array($results['error']))
- {
- $result = Survey::model()->deleteSurvey($iNewSID);
- }
-
+ // Delete the survey if error found
+ if(is_array($results['error']))
+ {
+ $result = Survey::model()->deleteSurvey($iNewSID);
+ }
+
return $results;
}
diff --git a/application/helpers/admin/label_helper.php b/application/helpers/admin/label_helper.php
index d294c2fc50e..3d47ea1a314 100644
--- a/application/helpers/admin/label_helper.php
+++ b/application/helpers/admin/label_helper.php
@@ -139,7 +139,7 @@ function modlabelsetanswers($lid)
}
//unescape single quotes
- $labeldata = CHttpRequest::getPost('dataToSend');
+ $labeldata = Yii::app()->getRequest()->getPost('dataToSend');
$labeldata = str_replace("\'","'",$labeldata);
diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
index 2f861b956b8..a2a74c99b91 100644
--- a/application/helpers/admin/statistics_helper.php
+++ b/application/helpers/admin/statistics_helper.php
@@ -17,18 +17,21 @@
/**
*
* Generate a chart for a question
-* @param mixed $qid ID of the question
-* @param mixed $sid ID of the survey
-* @param mixed $type Type of the chart to be created
-* @param mixed $cache
-* @param mixed $lbl
-* @param mixed $gdata
-* @param mixed $grawdata
-* @param mixed $cache
+* @param int $iQuestionID ID of the question
+* @param int $iSurveyID ID of the survey
+* @param mixed $type Type of the chart to be created - null produces bar chart, any other value produces pie chart
+* @param array $lbl An array containing the labels for the chart items
+* @param mixed $gdata An array containing the percentages for the chart items
+* @param mixed $grawdata An array containing the raw count for the chart items
+* @param mixed $cache An object containing [Hashkey] and [CacheFolder]
* @return Name
*/
-function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
+function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawdata, $cache)
{
+ /* This is a lazy solution to bug #6389. A better solution would be to find out how
+ the "T" gets passed to this function from the statistics.js file in the first place! */
+ if(substr($iSurveyID,0,1)=="T") {$iSurveyID=substr($iSurveyID,1);}
+
$rootdir = Yii::app()->getConfig("rootdir");
$homedir = Yii::app()->getConfig("homedir");
$homeurl = Yii::app()->getConfig("homeurl");
@@ -36,8 +39,11 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
$scriptname = Yii::app()->getConfig("scriptname");
$chartfontfile = Yii::app()->getConfig("chartfontfile");
$chartfontsize = Yii::app()->getConfig("chartfontsize");
- $language = Survey::model()->findByPk($sid)->language;
+ $language = Survey::model()->findByPk($iSurveyID)->language;
+ $statlang = new Limesurvey_lang($language);
+ $cachefilename = "";
+ /* Set the fonts for the chart */
if ($chartfontfile=='auto')
{
$chartfontfile='vera.ttf';
@@ -59,13 +65,10 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
}
}
- $cachefilename = "";
-
- if (array_sum($gdata ) > 0)
+ if (array_sum($gdata ) > 0) //Make sure that the percentages add up to more than 0
{
$graph = "";
$p1 = "";
-
$i = 0;
foreach ($gdata as $data)
{
@@ -75,8 +78,9 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
}
}
+ /* Totatllines is the number of entries to show in the key and we need to reduce the font
+ and increase the size of the chart if there are lots of them (ie more than 15) */
$totallines=$i;
-
if ($totallines>15)
{
$gheight=320+(6.7*($totallines-15));
@@ -114,20 +118,19 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
$counter++;
}
- if ($cache->IsInCache("graph".$sid,$DataSet->GetData()))
+ if ($cache->IsInCache("graph".$language.$iSurveyID,$DataSet->GetData()))
{
- $cachefilename=basename($cache->GetFileFromCache("graph".$sid,$DataSet->GetData()));
+ $cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData()));
}
else
{
$graph = new pChart(1,1);
-
$graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile, $chartfontsize);
$legendsize=$graph->getLegendBoxSize($DataSet->GetDataDescription());
if ($legendsize[1]<320) $gheight=420; else $gheight=$legendsize[1]+100;
$graph = new pChart(690+$legendsize[0],$gheight);
- $graph->loadColorPalette($rootdir.DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.$admintheme.DIRECTORY_SEPARATOR.'limesurvey.pal');
+ $graph->loadColorPalette($homedir.DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.$admintheme.DIRECTORY_SEPARATOR.'limesurvey.pal');
$graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
$graph->setGraphArea(50,30,500,$gheight-60);
$graph->drawFilledRoundedRectangle(7,7,523+$legendsize[0],$gheight-7,5,254,255,254);
@@ -146,8 +149,8 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
$graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile, $chartfontsize);
$graph->drawLegend(510,30,$DataSet->GetDataDescription(),255,255,255);
- $cache->WriteToCache("graph".$sid,$DataSet->GetData(),$graph);
- $cachefilename=basename($cache->GetFileFromCache("graph".$sid,$DataSet->GetData()));
+ $cache->WriteToCache("graph".$language.$iSurveyID,$DataSet->GetData(),$graph);
+ $cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData()));
unset($graph);
}
} //end if (bar chart)
@@ -156,11 +159,11 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
else
{
// this block is to remove the items with value == 0
- // and an unelegant way to remove comments from List with Comments questions
+ // and an inelegant way to remove comments from List with Comments questions
$i = 0;
while (isset ($gdata[$i]))
{
- if ($gdata[$i] == 0 || ($qtype == "O" && substr($lbl[$i],0,strlen($statlang->gT("Comments")))==$statlang->gT("Comments")))
+ if ($gdata[$i] == 0 || ($type == "O" && substr($lbl[$i],0,strlen($statlang->gT("Comments")))==$statlang->gT("Comments")))
{
array_splice ($gdata, $i, 1);
array_splice ($lbl, $i, 1);
@@ -203,9 +206,9 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
$DataSet->AddAllSeries();
$DataSet->SetAbsciseLabelSerie("Serie2");
- if ($cache->IsInCache("graph".$sid, $DataSet->GetData()))
+ if ($cache->IsInCache("graph".$language.$iSurveyID, $DataSet->GetData()))
{
- $cachefilename=basename($cache->GetFileFromCache("graph".$sid,$DataSet->GetData()));
+ $cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData()));
}
else
{
@@ -221,8 +224,8 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache)
$graph->drawPieGraph($DataSet->GetData(),$DataSet->GetDataDescription(),225,round($gheight/2),170,PIE_PERCENTAGE,TRUE,50,20,5);
$graph->setFontProperties($rootdir."/fonts/".$chartfontfile,$chartfontsize);
$graph->drawPieLegend(430,12,$DataSet->GetData(),$DataSet->GetDataDescription(),250,250,250);
- $cache->WriteToCache("graph".$sid,$DataSet->GetData(),$graph);
- $cachefilename=basename($cache->GetFileFromCache("graph".$sid,$DataSet->GetData()));
+ $cache->WriteToCache("graph".$language.$iSurveyID,$DataSet->GetData(),$graph);
+ $cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData()));
unset($graph);
}
} //end else -> pie charts
@@ -256,269 +259,59 @@ function getQuestionMapData($sField, $qsid)
return $d;
}
-
-/**
-* Generates statistics
+/** Builds the list of addon SQL select statements
+* that builds the query result set
+*
+* @param $allfields An array containing the names of the fields/answers we want to display in the statistics summary
+* @param $fieldmap The fieldmap for the survey
+* @param $language The language to use
+*
+* @return array $selects array of individual select statements that can be added/appended to
+* the 'where' portion of a SQL statement to restrict the result set
+* ie: array("`FIELDNAME`='Y'", "`FIELDNAME2`='Hello'");
*
-* @param int $surveyid The survey id
-* @param mixed $allfields
-* @param mixed $q2show
-* @param mixed $usegraph
-* @param string $outputType Optional - Can be xls, html or pdf - Defaults to pdf
-* @param string $pdfOutput Sets the target for the PDF output: DD=File download , F=Save file to local disk
-* @param string $statlangcode Lamguage for statistics
-* @param mixed $browse Show browse buttons
-* @return buffer
*/
-function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $outputType='pdf', $pdfOutput='I',$statlangcode=null, $browse = true)
-{
- //$allfields ="";
-
- global $rooturl, $rootdir, $homedir, $homeurl, $scriptname,
- $chartfontfile, $chartfontsize, $admintheme, $pdfdefaultfont, $pdffontsize;
-
- //load surveytranslator helper
- Yii::import('application.helpers.surveytranslator_helper', true);
-
- $imagedir = Yii::app()->getConfig("imagedir");
- $tempdir = Yii::app()->getConfig("tempdir");
- $tempurl = Yii::app()->getConfig("tempurl");
- $clang = Yii::app()->lang;
-
-
- $astatdata = array();
-
- // Used for getting coordinates for google maps
- $agmapdata = array();
-
- //pick the best font file if font setting is 'auto'
- if (is_null($statlangcode))
- {
- $statlang = getBaseLanguageFromSurveyID($surveyid);
- }
- else
- {
- $statlang = new Limesurvey_lang($statlangcode);
- }
-
- $fieldmap=createFieldMap($surveyid, "full", false, false, $statlang->getlangcode());
-
- /*
- * this variable is used in the function shortencode() which cuts off a question/answer title
- * after $maxchars and shows the rest as tooltip (in html mode)
- */
- $maxchars = 13;
- //we collect all the html-output within this variable
- $statisticsoutput ='';
- /**
- * $outputType: html || pdf ||
- */
- /**
- * get/set Survey Details
- */
-
- //no survey ID? -> come and get one
- if (!isset($surveyid)) {$surveyid=returnGlobal('sid');}
-
- //Get an array of codes of all available languages in this survey
- $surveylanguagecodes = Survey::model()->findByPk($surveyid)->additionalLanguages;
- $surveylanguagecodes[] = Survey::model()->findByPk($surveyid)->language;
-
- // Set language for questions and answers to base language of this survey
- $language=$statlangcode;
-
- if ($usegraph==1)
- {
- //for creating graphs we need some more scripts which are included here
- require_once(APPPATH.'/third_party/pchart/pchart/pChart.class');
- require_once(APPPATH.'/third_party/pchart/pchart/pData.class');
- require_once(APPPATH.'/third_party/pchart/pchart/pCache.class');
- $MyCache = new pCache($tempdir.'/');
- }
-
- if($q2show=='all' )
- {
- $summarySql=" SELECT gid, parent_qid, qid, type "
- ." FROM {{questions}} WHERE parent_qid=0"
- ." AND sid=$surveyid ";
-
- $summaryRs = Yii::app()->db->createCommand($summarySql)->query()->readAll();
-
- foreach($summaryRs as $field)
- {
- $myField = $surveyid."X".$field['gid']."X".$field['qid'];
-
- // Multiple choice get special treatment
- if ($field['type'] == "M") {$myField = "M$myField";}
- if ($field['type'] == "P") {$myField = "P$myField";}
- //numerical input will get special treatment (arihtmetic mean, standard derivation, ...)
- if ($field['type'] == "N") {$myField = "N$myField";}
-
- if ($field['type'] == "|") {$myField = "|$myField";}
-
- if ($field['type'] == "Q") {$myField = "Q$myField";}
- // textfields get special treatment
- if ($field['type'] == "S" || $field['type'] == "T" || $field['type'] == "U"){$myField = "T$myField";}
- //statistics for Date questions are not implemented yet.
- if ($field['type'] == "D") {$myField = "D$myField";}
- if ($field['type'] == "F" || $field['type'] == "H")
- {
- //Get answers. We always use the answer code because the label might be too long elsewise
- $query = "SELECT code, answer FROM {{answers}} WHERE qid='".$field['qid']."' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, answer";
- $result = Yii::app()->db->createCommand($query)->query();
- $counter2=0;
-
- //check all the answers
- foreach ($result->readAll() as $row)
- {
- $row=array_values($row);
- $myField = "$myField{$row[0]}";
- }
- //$myField = "{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]";
-
-
- }
- if($q2show=='all')
- $summary[]=$myField;
-
- //$allfields[]=$myField;
- }
- }
- else
- {
- // This gets all the 'to be shown questions' from the POST and puts these into an array
- if (!is_array($q2show))
- $summary=returnGlobal('summary');
- else
- $summary = $q2show;
-
- //print_r($_POST);
- //if $summary isn't an array we create one
- if (isset($summary) && !is_array($summary))
- {
- $summary = explode("+", $summary);
- }
- }
-
- /* Some variable depend on output type, actually : only line feed */
- switch($outputType)
- {
- case 'xls':
- $linefeed = "\n";
- break;
- case 'pdf':
- $linefeed = "\n";
- break;
- case 'html':
- $linefeed = " \n";
- break;
- default:
-
- break;
- }
-
- /**
- * pdf Config
- */
- if($outputType=='pdf')
- {
- //require_once('classes/tcpdf/config/lang/eng.php');
- global $l;
- $l['w_page'] = $statlang->gT("Page",'unescaped');
- //require_once('classes/tcpdf/mypdf.php');
- Yii::import('application.libraries.admin.pdf', true);
- // create new PDF document
- $pdf = new Pdf();
- $pdf->SetFont($pdfdefaultfont,'',$pdffontsize);
-
- $surveyInfo = getSurveyInfo($surveyid,$language);
-
- // set document information
- $pdf->SetCreator(PDF_CREATOR);
- $pdf->SetAuthor('LimeSurvey');
- $pdf->SetTitle('Statistic survey '.$surveyid);
- $pdf->SetSubject($surveyInfo['surveyls_title']);
- $pdf->SetKeywords('LimeSurvey, Statistics, Survey '.$surveyid.'');
- $pdf->SetDisplayMode('fullpage', 'two');
-
- // set header and footer fonts
- $pdf->setHeaderFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_MAIN));
- $pdf->setFooterFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_DATA));
-
- // set default header data
- $pdf->SetHeaderData("statistics.png", 10, $statlang->gT("Quick statistics",'unescaped') , $statlang->gT("Survey")." ".$surveyid." '".flattenText($surveyInfo['surveyls_title'],false,true,'UTF-8')."'");
-
-
- // set default monospaced font
- $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
- //set margins
- $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
- $pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
- $pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
-
- //set auto page breaks
- $pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
+function buildSelects($allfields, $surveyid, $language) {
- //set image scale factor
- $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
+ //Create required variables
+ $selects=array();
+ $aQuestionMap=array();
- //set some language-dependent strings
- $pdf->setLanguageArray($l);
- }
- if($outputType=='xls')
+ $fieldmap=createFieldMap($surveyid, "full", false, false, $language);
+ foreach ($fieldmap as $field)
{
- /**
- * Initiate the Spreadsheet_Excel_Writer
- */
- Yii::import('application.libraries.admin.pear.Spreadsheet.Excel.Xlswriter', true);
- if($pdfOutput=='F')
- $workbook = new Xlswriter($tempdir.'/statistic-survey'.$surveyid.'.xls');
- else
- $workbook = new Xlswriter();
-
- $workbook->setVersion(8);
- // Inform the module that our data will arrive as UTF-8.
- // Set the temporary directory to avoid PHP error messages due to open_basedir restrictions and calls to tempnam("", ...)
- if (!empty($tempdir)) {
- $workbook->setTempDir($tempdir);
- }
- if ($pdfOutput!='F')
- $workbook->send('statistic-survey'.$surveyid.'.xls');
-
- // Creating the first worksheet
- $sheet =& $workbook->addWorksheet(utf8_decode('results-survey'.$surveyid));
- $sheet->setInputEncoding('utf-8');
- $sheet->setColumn(0,20,20);
- $separator="~|";
- /**XXX*/
+ if(isset($field['qid']) && $field['qid']!='')
+ $aQuestionMap[]=$field['sid'].'X'.$field['gid'].'X'.$field['qid'];
}
- /**
- * Start generating
- */
// creates array of post variable names
for (reset($_POST); $key=key($_POST); next($_POST)) { $postvars[]=$key;}
- $aQuestionMap=array();
- foreach ($fieldmap as $field)
- {
- $q = $field['q'];
- if(isset($q->id) && $q->id!='')
- $aQuestionMap[]=$q->surveyid.'X'.$q->gid.'X'.$q->id;
- }
-
/*
* Iterate through postvars to create "nice" data for SQL later.
*
* Remember there might be some filters applied which have to be put into an SQL statement
+ *
+ * This foreach iterates through the name ($key) of each post value and builds a SELECT
+ * statement out of it. It returns an array called $selects[] which will have a select query
+ * for each filter chosen. ie: $select[0]="`74X71X428EXP` ='Y'";
+ *
+ * This array is used later to build the overall query used to limit the number of responses
+ *
*/
if(isset($postvars))
-
foreach ($postvars as $pv)
{
//Only do this if there is actually a value for the $pv
- if (in_array($pv, $allfields) || in_array(substr($pv,1),$aQuestionMap) || in_array($pv,$aQuestionMap) || (($pv[0]=='D' || $pv[0]=='N' || $pv[0]=='K') && in_array(substr($pv,1,strlen($pv)-2),$aQuestionMap)))
+ if (
+ in_array($pv, $allfields) || in_array(substr($pv,1),$aQuestionMap) || in_array($pv,$aQuestionMap)
+ || (
+ (
+ $pv[0]=='D' || $pv[0]=='N' || $pv[0]=='K'
+ )
+ && in_array(substr($pv,1,strlen($pv)-2),$aQuestionMap)
+ )
+ )
{
$firstletter=substr($pv,0,1);
/*
@@ -558,28 +351,24 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//create a list out of the $pv array
list($lsid, $lgid, $lqid) = explode("X", $pv);
- $aquery="SELECT title FROM {{questions}} WHERE parent_qid=$lqid AND language='{$language}' and scale_id=0 ORDER BY question_order";
- $aresult=Yii::app()->db->createCommand($aquery)->query();
-
- // go through every possible answer
- foreach ($aresult->readAll() as $arow)
+ $aresult=Questions::model()->findAll(array('order'=>'question_order', 'condition'=>'parent_qid=:parent_qid AND scale_id=0', 'params'=>array(":parent_qid"=>$lqid)));
+ foreach ($aresult as $arow)
{
- $arow=array_values($arow);
// only add condition if answer has been chosen
- if (in_array($arow[0], $_POST[$pv]))
+ if (in_array($arow['title'], $_POST[$pv]))
{
- $mselects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)).$arow[0])." = 'Y'";
+ $mselects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)).$arow['title'])." = 'Y'";
}
}
+ /* If there are mutliple conditions generated from this multiple choice question, join them using the boolean "OR" */
if ($mselects)
{
$thismulti=implode(" OR ", $mselects);
$selects[]="($thismulti)";
- $mselects = "";
+ unset($mselects);
}
}
-
//N - Numerical Input
//K - Multiple Numerical Input
elseif ($firstletter == "N" || $firstletter == "K")
@@ -695,240 +484,102 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
}
}
}
- else
- {
- $statisticsoutput .= "";
- }
-
} //end foreach -> loop through filter options to create SQL
- //count number of answers
- $query = "SELECT count(*) FROM {{survey_$surveyid}}";
-
- //if incompleted answers should be filtert submitdate has to be not null
- if (incompleteAnsFilterState() == "inc") {$query .= " WHERE submitdate is null";}
- elseif (incompleteAnsFilterState() == "filter") {$query .= " WHERE submitdate is not null";}
- $result = Yii::app()->db->createCommand($query)->query();
-
- //$total = total number of answers
- $row=$result->read(); $total=reset($row);
-
- //are there any filters that have to be taken care of?
- if (isset($selects) && $selects)
- {
- //filter incomplete answers?
- if (incompleteAnsFilterState() == "filter" || incompleteAnsFilterState() == "inc") {$query .= " AND ";}
-
- else {$query .= " WHERE ";}
-
- //add filter criteria to SQL
- $query .= implode(" AND ", $selects);
+ return $selects;
}
+/**
+* Builds an array containing information about this particular question/answer combination
+*
+* @param string $rt The code passed from the statistics form listing the field/answer (SGQA) combination to be displayed
+* @param mixed $language The language to present output in
+* @param mixed $surveyid The survey id
+* @param string $outputType
+*
+* @output array $output An array containing "alist"=>A list of answers to the question in the form of an array ($alist array
+* contains an array for every field to be displayed - with the Actual Question Code/Title, The text (flattened)
+* of the question, and the fieldname where the data is stored.
+* "qtitle"=>The title of the question,
+* "qquestion"=>The description of the question,
+* "qtype"=>The question type code
+*/
+function buildOutputList($rt, $language, $surveyid, $outputType, $sql) {
+
+ //Set up required variables
+ $alist=array();
+ $qtitle="";
+ $qquestion="";
+ $qtype="";
+ $statlangcode = getBaseLanguageFromSurveyID($surveyid);
+ $statlang = new Limesurvey_lang($statlangcode);
+ $firstletter = substr($rt, 0, 1);
+ $fieldmap=createFieldMap($surveyid, "full", false, false, $language);
+ $sDatabaseType = Yii::app()->db->getDriverName();
+ $statisticsoutput="";
- //get me some data Scotty
- $result=Yii::app()->db->createCommand($query)->query();
-
- //put all results into $results
- $row=$result->read(); $results=reset($row);
-
- if ($total)
- {
- $percent=sprintf("%01.2f", ($results/$total)*100);
-
- }
+ /* Some variable depend on output type, actually : only line feed */
switch($outputType)
{
- case "xls":
- $xlsRow = 0;
- $sheet->write($xlsRow,0,$statlang->gT("Number of records in this query:",'unescaped'));
- $sheet->write($xlsRow,1,$results);
- ++$xlsRow;
- $sheet->write($xlsRow,0,$statlang->gT("Total records in survey:",'unescaped'));
- $sheet->write($xlsRow,1,$total);
-
- if($total)
- {
- ++$xlsRow;
- $sheet->write($xlsRow,0,$statlang->gT("Percentage of total:",'unescaped'));
- $sheet->write($xlsRow,1,$percent."%");
- }
-
- break;
+ case 'xls':
case 'pdf':
-
- // add summary to pdf
- $array = array();
- //$array[] = array($statlang->gT("Results"),"");
- $array[] = array($statlang->gT("Number of records in this query:",'unescaped'), $results);
- $array[] = array($statlang->gT("Total records in survey:",'unescaped'), $total);
-
- if($total)
- $array[] = array($statlang->gT("Percentage of total:",'unescaped'), $percent."%");
-
- $pdf->addPage('P','A4');
-
- $pdf->Bookmark($pdf->delete_html($statlang->gT("Results",'unescaped')), 0, 0);
- $pdf->titleintopdf($statlang->gT("Results",'unescaped'),$statlang->gT("Survey",'unescaped')." ".$surveyid);
- $pdf->tableintopdf($array);
-
- $pdf->addPage('P','A4');
-
+ $linefeed = "\n";
break;
case 'html':
-
- $statisticsoutput .= " \n
\n"
- ."\t
".$statlang->gT("Results")."
\n"
- ."\t
".$statlang->gT("Number of records in this query:").'
'
- ."
$results
\n"
- ."\t
".$statlang->gT("Total records in survey:").'
'
- ."
$total
\n";
-
- //only calculate percentage if $total is set
- if ($total)
- {
- $percent=sprintf("%01.2f", ($results/$total)*100);
- $statisticsoutput .= "\t
".$statlang->gT("Percentage of total:").'
'
- ."
$percent%
\n";
- }
- $statisticsoutput .="
\n";
-
+ $linefeed = " \n";
break;
default:
-
-
break;
}
- //put everything from $selects array into a string connected by AND
- if (isset ($selects) && $selects) {$sql=implode(" AND ", $selects);}
-
- elseif (!empty($newsql)) {$sql = $newsql;}
-
- if (!isset($sql) || !$sql) {$sql="NULL";}
-
- //only continue if we have something to output
- if ($results > 0)
- {
- if($outputType=='html' && $browse === true)
- {
- //add a buttons to browse results
- $statisticsoutput .= "\n";
- }
- } //end if (results > 0)
-
- //Show Summary results
- if (isset($summary) && $summary)
- {
- //let's run through the survey
- $runthrough=$summary;
-
- //START Chop up fieldname and find matching questions
-
- //GET LIST OF LEGIT QIDs FOR TESTING LATER
- $lq = "SELECT DISTINCT qid FROM {{questions}} WHERE sid=$surveyid and parent_qid=0";
- $lr = Yii::app()->db->createCommand($lq)->query();
-
- //loop through the IDs
- foreach ($lr->readAll() as $lw)
- {
- //this creates an array of question id's'
- $legitqids[] = $lw['qid'];
- }
-
-
- //loop through all selected questions
- foreach ($runthrough as $rt)
- {
- $firstletter = substr($rt, 0, 1);
- // 1. Get answers for question ##############################################################
-
- //M - Multiple choice, therefore multiple fields
+ //M - Multiple choice, therefore multiple fields - one for each answer
if ($firstletter == "M" || $firstletter == "P")
{
//get SGQ data
list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3);
//select details for this question
- $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'";
- $nresult = Yii::app()->db->createCommand($nquery)->query();
-
- //loop through question data
- foreach ($nresult->readAll() as $nrow)
- {
- $nrow=array_values($nrow);
- $qtitle=$nrow[0];
- $qtype=$nrow[1];
- $qquestion=flattenText($nrow[2]);
- $qlid=$nrow[3];
- $qother=$nrow[4];
- }
+ $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$qqid));
+ $qtitle=$nresult->title;
+ $qtype=$nresult->type;
+ $qquestion=flattenText($nresult->question);
+ $qlid=$nresult->parent_qid;
+ $qother=$nresult->other;
//1. Get list of answers
- $query="SELECT title, question FROM {{questions}} WHERE parent_qid='$qqid' AND language='{$language}' and scale_id=0 ORDER BY question_order";
- $result=Yii::app()->db->createCommand($query)->query();
-
- //loop through multiple answers
- foreach ($result->readAll() as $row)
+ $result=Questions::model()->findAll(array('order'=>'question_order',
+ 'condition'=>'language=:language AND parent_qid=:qid AND scale_id=0',
+ 'params'=>array(':language'=>$language, ':qid'=>$qqid)
+ ));
+ foreach ($result as $row)
{
- $row=array_values($row);
- $mfield=substr($rt, 1, strlen($rt))."$row[0]";
-
- //create an array containing answer code, answer and fieldname(??)
- $alist[]=array("$row[0]", flattenText($row[1]), $mfield);
+ $mfield=substr($rt, 1, strlen($rt)).$row['title'];
+ $alist[]=array($row['title'], flattenText($row['question']), $mfield);
}
- //check "other" field. is it set?
+ //Add the "other" answer if it exists
if ($qother == "Y")
{
$mfield=substr($rt, 1, strlen($rt))."other";
-
- //create an array containing answer code, answer and fieldname(??)
$alist[]=array($statlang->gT("Other"), $statlang->gT("Other"), $mfield);
}
}
-
- //S - Short Free Text
- //T - Long Free Text
+ //S - Short Free Text and T - Long Free Text
elseif ($firstletter == "T" || $firstletter == "S") //Short and long text
{
-
//search for key
$fld = substr($rt, 1, strlen($rt));
$q=$fieldmap[$fld]['q'];
- //get SGQA IDs
- $qsid=$q->surveyid;
- $qgid=$q->gid;
- $qqid=$q->id;
-
-
list($qanswer, $qlid)=isset($q->aid) ? explode("_", $q->aid) : array("", "");
- //get SGQ data
- //list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3);
-
//get question data
- $nquery = "SELECT title, type, question, other, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'";
- $nresult = Yii::app()->db->createCommand($nquery)->query();
-
- //loop through question data
- foreach ($nresult->readAll() as $nrow)
- {
- $nrow=array_values($nrow);
- $qtitle=flattenText($nrow[0]);
- $qtype=$nrow[1];
- $qquestion=flattenText($nrow[2]);
- $nlid=$nrow[4];
- }
+ $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$fielddata['qid']));
+ $qtitle=$nresult->title;
+ $qtype=$nresult->type;
+ $qquestion=flattenText($nresult->question);
+ $qlid=$nresult->parent_qid;
$mfield=substr($rt, 1, strlen($rt));
@@ -940,53 +591,41 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$alist[]=array("NoAnswer", $statlang->gT("No answer"), $mfield);
}
-
- //Multiple short text
+ //Q - Multiple short text
elseif ($firstletter == "Q")
{
+ //Build an array of legitimate qid's for testing later
+ $qidquery = Questions::model()->findAll("sid=:surveyid AND parent_qid=0", array(":surveyid"=>$surveyid));
+ foreach ($qidquery as $row) { $legitqids[] = $row['qid']; }
//get SGQ data
list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3);
-
//separating another ID
$tmpqid=substr($qqid, 0, strlen($qqid)-1);
- //check if we have legid QIDs. if not create them by substringing
+ //check if we have a QID that actually exists. if not create them by substringing. Note that
+ //all of this is due to the fact that when we create a field for an subquestion, we don't seperate
+ //the question id from the subquestion id - and this is a weird, backwards way of doing that.
while (!in_array ($tmpqid,$legitqids)) $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1);
-
//length of QID
- $qidlength=strlen($tmpqid);
-
+ $iQuestionIDlength=strlen($tmpqid);
//we somehow get the answer code (see SQL later) from the $qqid
- $qaid=substr($qqid, $qidlength, strlen($qqid)-$qidlength);
+ $qaid=substr($qqid, $iQuestionIDlength, strlen($qqid)-$iQuestionIDlength);
- //get some question data
- $nquery = "SELECT title, type, question, other FROM {{questions}} WHERE qid='".substr($qqid, 0, $qidlength)."' AND parent_qid=0 AND language='{$language}'";
- $nresult = Yii::app()->db->createCommand($nquery)->query();
+ //get question data
+ $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>substr($qqid, 0, $iQuestionIDlength)));
+ $qtitle=$nresult->title;
+ $qtype=$nresult->type;
+ $qquestion=flattenText($nresult->question);
//more substrings
$count = substr($qqid, strlen($qqid)-1);
- //loop through question data
- foreach ($nresult->readAll() as $nrow)
- {
- $nrow=array_values($nrow);
- $qtitle=flattenText($nrow[0]).'-'.$count;
- $qtype=$nrow[1];
- $qquestion=flattenText($nrow[2]);
- }
-
//get answers
- $qquery = "SELECT title as code, question as answer FROM {{questions}} WHERE parent_qid='".substr($qqid, 0, $qidlength)."' AND title='$qaid' AND language='{$language}' ORDER BY question_order";
- $qresult=Yii::app()->db->createCommand($qquery)->query();
-
- //loop through answer data
- foreach ($qresult->readAll() as $qrow)
- {
- $qrow=array_values($qrow);
- //store each answer here
- $atext=flattenText($qrow[1]);
- }
-
+ $nresult = Questions::model()->find(array('order'=>'question_order',
+ 'condition'=>'language=:language AND parent_qid=:parent_qid AND title=:title',
+ 'params'=>array(':language'=>$language, ':parent_qid'=>substr($qqid, 0, $iQuestionIDlength), ':title'=>$qaid)
+ ));
+ $atext=flattenText($nresult->question);
//add this to the question title
$qtitle .= " [$atext]";
@@ -1001,8 +640,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$alist[]=array("NoAnswer", $statlang->gT("No answer"), $mfield);
}
-
- //RANKING OPTION THEREFORE CONFUSING
+ //RANKING OPTION
elseif ($firstletter == "R")
{
//getting the needed IDs somehow
@@ -1043,20 +681,12 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3);
//select details for this question
- $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'";
- $nresult = Yii::app()->db->createCommand($nquery)->query();
-
- //loop through question data
- foreach ($nresult->readAll() as $nrow)
- {
- $nrow=array_values($nrow);
- $qtitle=$nrow[0];
- $qtype=$nrow[1];
- $qquestion=flattenText($nrow[2]);
- $qlid=$nrow[3];
- $qother=$nrow[4];
- }
-
+ $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>substr($qqid, 0, $iQuestionIDlength)));
+ $qtitle=$nresult->title;
+ $qtype=$nresult->type;
+ $qquestion=flattenText($nresult->question);
+ $qlid=$nresult->parent_qid;
+ $qother=$nresult->other;
/*
4) Average size of file per respondent
5) Average no. of files
@@ -1092,7 +722,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
foreach ($result->readAll() as $row)
{
-
$json = $row['json'];
$phparray = json_decode($json);
@@ -1146,7 +775,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
break;
case 'pdf':
-
$headPDF = array();
$tablePDF = array();
$footPDF = array();
@@ -1202,6 +830,9 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//multiple numerical input
if($firstletter == "K")
{
+ //Build an array of legitimate qid's for testing later
+ $qidquery = Questions::model()->findAll("sid=:surveyid AND parent_qid=0", array(":surveyid"=>$surveyid));
+ foreach ($qidquery as $row) { $legitqids[] = $row['qid']; }
// This is a multiple numerical question so we need to strip of the answer id to find the question title
$tmpqid=substr($qqid, 0, strlen($qqid)-1);
@@ -1210,25 +841,27 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1);
//check lenght of ID
- $qidlength=strlen($tmpqid);
+ $iQuestionIDlength=strlen($tmpqid);
//get answer ID from qid
- $qaid=substr($qqid, $qidlength, strlen($qqid)-$qidlength);
+ $qaid=substr($qqid, $iQuestionIDlength, strlen($qqid)-$iQuestionIDlength);
//get question details from DB
- $nquery = "SELECT title, type, question, qid, parent_qid
+ $nresult=Questions::model()->findAll('parent_qid=0 AND qid=:qid AND language=:language', array(':qid'=>substr($qqid, 0, $iQuestionIDlength), ':language'=>$language));
+ /* $nquery = "SELECT title, type, question, qid, parent_qid
FROM {{questions}}
- WHERE parent_qid=0 AND qid='".substr($qqid, 0, $qidlength)."'
+ WHERE parent_qid=0 AND qid='".substr($qqid, 0, $iQuestionIDlength)."'
AND language='{$language}'";
- $nresult = Yii::app()->db->createCommand($nquery)->query();
+ $nresult = Yii::app()->db->createCommand($nquery)->query(); */
}
//probably question type "N" = numerical input
else
{
+ $nresult=Questions::model()->findAll('parent_qid=0 AND qid=:qid AND language=:language', array(':qid'=>$qqid, ':language'=>$language));
//we can use the qqid without any editing
- $nquery = "SELECT title, type, question, qid, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'";
- $nresult = Yii::app()->db->createCommand($nquery)->query();
+ /* $nquery = "SELECT title, type, question, qid, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'";
+ $nresult = Yii::app()->db->createCommand($nquery)->query(); */
}
//loop through results
@@ -1311,7 +944,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$fieldname=substr($rt, 1, strlen($rt));
//special treatment for MS SQL databases
- $sDatabaseType = Yii::app()->db->getDriverName();
if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv')
{
//standard deviation
@@ -1370,10 +1002,10 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
if ($sql != "NULL") {$query .= " AND $sql";}
//execute query
- $result=Yii::app()->db->createCommand($query)->query();
+ $result=Yii::app()->db->createCommand($query)->queryAll();
//get calculated data
- foreach ($nresult->readAll() as $row)
+ foreach ($result as $row)
{
//put translation of mean and calculated data into $showem array
$showem[]=array($statlang->gT("Sum"), $row['sum']);
@@ -1429,10 +1061,24 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//no more comment from Mazi regarding the calculation
+ /* IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT */
+ /* IF YOU DON'T UNDERSTAND WHAT QUARTILES ARE DO NOT MODIFY THIS CODE */
+ /* Quartiles and Median values are NOT related to average, and the sum is irrelevent */
+
// Calculating only makes sense with more than one result
if ($medcount>1)
{
//1ST QUARTILE (Q1)
+ /* L=(1/4)(n+1), U=(3/4)(n+1) */
+ /* Minitab linear interpolation between the two
+ closest data points. Minitab would let L = 2.5 and find the value half way between the
+ 2nd and 3rd data points. In our example, that would be (4+9)/2 =
+ 6.5. Similarly, the upper quartile value would be half way between
+ the 7th and 8th data points, which would be (49+64)/2 = 56.5. If L
+ were 2.25, Minitab would find the value one fourth of the way
+ between the 2nd and 3rd data points and if L were 2.75, Minitab
+ would find the value three fourths of the way between the 2nd and
+ 3rd data points. */
$q1=(1/4)*($medcount+1);
$q1b=(int)((1/4)*($medcount+1));
$q1c=$q1b-1;
@@ -1442,36 +1088,31 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
// fix if there are too few values to evaluate.
if ($q1c<0) {$q1c=0;}
- if ($q1 != $q1b)
+ if ($q1 != $q1b) //The value will be between two of the individual results
{
- //ODD NUMBER
$query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 ";
- $result=Yii::app()->db->createCommand($query)->limit(2, $q1c)->query();
-
- foreach ($result->readAll() as $row)
+ $result = Yii::app()->db->createCommand($query)->query();
+ $i=0;
+ foreach ($result as $row)
{
- if ($total == 0) {$total=$total-$row[$fieldname];}
-
- else {$total=$total+$row[$fieldname];}
-
- $lastnumber=$row[$fieldname];
+ if($row[$fieldname]) {$i++;}
+ if($i==$q1c) {$secondlastnumber=$row[$fieldname];}
+ if($i==$q1b) {$lastnumber=$row[$fieldname];}
}
-
- $q1total=$lastnumber-((1-$q1diff)*$total);
-
- if ($q1total < $minimum) {$q1total=$minimum;}
+ $q1total=$lastnumber-((1-$q1diff)*$secondlastnumber);
+ //if ($q3total < $maximum) {$q1total=$maximum;} //What the? If the 3rd quartiel is higher than the highest, then make the 1st quartile the highest? This makes no sense!
$showem[]=array($statlang->gT("1st quartile (Q1)"), $q1total);
}
else
{
- //EVEN NUMBER
$query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 ";
- $result=Yii::app()->db->createCommand($query)->limit(1, $q1c)->query();
+ $result = Yii::app()->db->createCommand($query)->query();
- foreach ($result->readAll() as $row)
+ foreach ($result as $row)
{
- $showem[]=array($statlang->gT("1st quartile (Q1)"), $row[$fieldname]);
+ if($row[$fieldname]) {$i++;}
+ if($i==$q1b) {$showem[]=array($statlang->gT("1st quartile (Q1)"), $row[$fieldname]);}
}
}
@@ -1488,22 +1129,31 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
{
//remainder
$query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 ";
- $result=Yii::app()->db->createCommand($query)->limit(2, $medianc)->query();
+ $result=Yii::app()->db->createCommand($query)->query();
- foreach ($result->readAll() as $row) {$total=$total+$row[$fieldname];}
+ $i=0;
+ foreach ($result as $row) {
+ if($row[$fieldname]) {$i++;}
+ if($i==$medianc) {$secondlastnumber=$row[$fieldname];}
+ if($i==$medianb) {$lastnumber=$row[$fieldname];}
- $showem[]=array($statlang->gT("2nd quartile (Median)"), $total/2);
}
+ $mediantotal=$lastnumber-((1-$mediandiff)*$secondlastnumber);
+ //if ($q3total < $maximum) {$q1total=$maximum;} //What the? If the 3rd quartiel is higher than the highest, then make the 1st quartile the highest? This makes no sense!
+
+ $showem[]=array($statlang->gT("2nd quartile (Median)"), $mediantotal);
+
+ }
else
{
- //EVEN NUMBER
$query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 ";
- $result = Yii::app()->db->createCommand($query)->limit(1, $medianc-1)->query();
+ $result = Yii::app()->db->createCommand($query)->query();
- foreach ($result->readAll() as $row)
+ foreach ($result as $row)
{
- $showem[]=array($statlang->gT("Median value"), $row[$fieldname]);
+ if($row[$fieldname]) {$i++;}
+ if($i==$medianb) {$showem[]=array($statlang->gT("2nd quartile (Median)"), $row[$fieldname]);}
}
}
@@ -1511,39 +1161,46 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//3RD QUARTILE (Q3)
- $q3=(3/4)*($medcount+1);
- $q3b=(int)((3/4)*($medcount+1));
- $q3c=$q3b-1;
+ /* L=(1/4)(n+1), U=(3/4)(n+1) */
+ /* Minitab linear interpolation between the two
+ closest data points. Minitab would let L = 2.5 and find the value half way between the
+ 2nd and 3rd data points. In our example, that would be (4+9)/2 =
+ 6.5. Similarly, the upper quartile value would be half way between
+ the 7th and 8th data points, which would be (49+64)/2 = 56.5. If L
+ were 2.25, Minitab would find the value one fourth of the way
+ between the 2nd and 3rd data points and if L were 2.75, Minitab
+ would find the value three fourths of the way between the 2nd and
+ 3rd data points. */
+ $q3=(3/4)*($medcount+1); //Find the 75th percentile according to count of items
+ $q3b=(int)((3/4)*($medcount+1)); //The int version of $q3
+ $q3c=$q3b-1; //The number before the int version of $q3
$q3diff=$q3-$q3b;
- if ($q3 != $q3b)
+ if ($q3 != $q3b) //The value will be between two of the individual results
{
$query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 ";
- $result = Yii::app()->db->createCommand($query)->limit(2,$q3c)->query();
-
- foreach ($result->readAll() as $row)
+ $result = Yii::app()->db->createCommand($query)->query();
+ $i=0;
+ foreach ($result as $row)
{
- if ($total == 0) {$total=$total-$row[$fieldname];}
-
- else {$total=$total+$row[$fieldname];}
-
- $lastnumber=$row[$fieldname];
+ if($row[$fieldname]) {$i++;}
+ if($i==$q3c) {$secondlastnumber=$row[$fieldname];}
+ if($i==$q3b) {$lastnumber=$row[$fieldname];}
}
- $q3total=$lastnumber-((1-$q3diff)*$total);
-
- if ($q3total < $maximum) {$q1total=$maximum;}
+ $q3total=$lastnumber-((1-$q3diff)*$secondlastnumber);
+ //if ($q3total < $maximum) {$q1total=$maximum;} //What the? If the 3rd quartiel is higher than the highest, then make the 1st quartile the highest? This makes no sense!
$showem[]=array($statlang->gT("3rd quartile (Q3)"), $q3total);
}
-
else
{
$query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1";
- $result = Yii::app()->db->createCommand($query)->limit(1, $q3c);
+ $result = Yii::app()->db->createCommand($query)->query();
- foreach ($result->readAll() as $row)
+ foreach ($result as $row)
{
- $showem[]=array($statlang->gT("3rd quartile (Q3)"), $row[$fieldname]);
+ if($row[$fieldname]) {$i++;}
+ if($i==$q3b) {$showem[]=array($statlang->gT("3rd quartile (Q3)"), $row[$fieldname]);}
}
}
@@ -1620,7 +1277,14 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
."\t\t\t".sprintf($statlang->gT("Q1 and Q3 calculated using %s"), "".$statlang->gT("minitab method")."")
."\n"
."\t\t\n"
- ."\t\n
\n";
+ ."\t\n";
+ $statisticsoutput .= "\t
\n"
+ ."\t\t
+
\n
";
+ $statisticsoutput .= "
+
";
+ $statisticsoutput .= "\n";
break;
default:
@@ -1695,21 +1359,16 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
*/
}
-
// NICE SIMPLE SINGLE OPTION ANSWERS
else
{
//search for key
$q=$fieldmap[$rt]['q'];
- //print_r($fielddata);
//get SGQA IDs
$qsid=$q->surveyid;
$qqid=$q->id;
$qanswer=$q->aid;
-
- //question type
$qtype=$fielddata['type'];
-
//get question data
$nquery = "SELECT title, type, question, qid, parent_qid, other FROM {{questions}} WHERE qid='{$q->id}' AND parent_qid=0 and language='{$language}'";
$nresult = Yii::app()->db->createCommand($nquery)->query();
@@ -1826,8 +1485,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
{
$qrow=array_values($qrow);
$fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND code = '{$licode}' AND language='{$language}'ORDER BY sortorder, code";
- $fresult = dbExecuteAssoc($fquery);
- foreach ($result->readAll() as $frow)
+ $fresult = Yii::app()->db->createCommand($fquery)->query();
+ foreach ($fresult->readAll() as $frow)
{
$alist[]=array($frow['code'], $frow['answer']);
$ltext=$frow['answer'];
@@ -1839,33 +1498,32 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$qtitle .= "($qanswer)";
break;
-
case ":": //Array (Multiple Flexi) (Numbers)
- $qidattributes=getQuestionAttributeValues($qiqid);
- if (trim($qidattributes['multiflexible_max'])!='') {
- $maxvalue=$qidattributes['multiflexible_max'];
+ $aQuestionAttributes=getQuestionAttributeValues($qiqid);
+ if (trim($aQuestionAttributes['multiflexible_max'])!='') {
+ $maxvalue=$aQuestionAttributes['multiflexible_max'];
}
else {
$maxvalue=10;
}
- if (trim($qidattributes['multiflexible_min'])!='')
+ if (trim($aQuestionAttributes['multiflexible_min'])!='')
{
- $minvalue=$qidattributes['multiflexible_min'];
+ $minvalue=$aQuestionAttributes['multiflexible_min'];
}
else {
$minvalue=1;
}
- if (trim($qidattributes['multiflexible_step'])!='')
+ if (trim($aQuestionAttributes['multiflexible_step'])!='')
{
- $stepvalue=$qidattributes['multiflexible_step'];
+ $stepvalue=$aQuestionAttributes['multiflexible_step'];
}
else {
$stepvalue=1;
}
- if ($qidattributes['multiflexible_checkbox']!=0) {
+ if ($aQuestionAttributes['multiflexible_checkbox']!=0) {
$minvalue=0;
$maxvalue=1;
$stepvalue=1;
@@ -1887,13 +1545,13 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$qresult=Yii::app()->db->createCommand($qquery)->query();
//loop through answers
- foreach ($result->readAll() as $qrow)
+ foreach ($qresult->readAll() as $qrow)
{
$qrow=array_values($qrow);
//this question type uses its own labels
$fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND language='{$language}'ORDER BY sortorder, code";
- $fresult = dbExecuteAssoc($fquery);
+ $fresult = Yii::app()->db->createCommand($fquery)->query();
//add code and title to results for outputting them later
foreach ($fresult->readAll() as $frow)
@@ -1947,10 +1605,11 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$sSubquestionQuery = "SELECT question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order";
$questionDesc = Yii::app()->db->createCommand($sSubquestionQuery)->query()->read();
- $sSubquestion = flattenText($questionDesc["question"]);
+ $sSubquestion = flattenText($questionDesc['question']);
//get question attributes
- $qidattributes=getQuestionAttributeValues($qqid);
+ $aQuestionAttributes=getQuestionAttributeValues($qqid);
+
//check last character -> label 1
if (substr($rt,-1,1) == 0)
@@ -1959,9 +1618,9 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$fquery = "SELECT * FROM {{answers}} WHERE qid='{$qqid}' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, code";
//header available?
- if (trim($qidattributes['dualscale_headerA'][$language])!='') {
+ if (trim($aQuestionAttributes['dualscale_headerA'][$language])!='') {
//output
- $labelheader= "[".$qidattributes['dualscale_headerA'][$language]."]";
+ $labelheader= "[".$aQuestionAttributes['dualscale_headerA'][$language]."]";
}
//no header
@@ -1981,9 +1640,9 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$fquery = "SELECT * FROM {{answers}} WHERE qid='{$qqid}' AND scale_id=1 AND language='{$language}' ORDER BY sortorder, code";
//header available?
- if (trim($qidattributes['dualscale_headerB'][$language])!='') {
+ if (trim($aQuestionAttributes['dualscale_headerB'][$language])!='') {
//output
- $labelheader= "[".$qidattributes['dualscale_headerB'][$language]."]";
+ $labelheader= "[".$aQuestionAttributes['dualscale_headerB'][$language]."]";
}
//no header
@@ -2044,26 +1703,50 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//put data into array
$alist[]=array("", $statlang->gT("No answer"));
- } //end else -> single option answers
-
- //foreach ($alist as $al) {$statisticsoutput .= "$al[0] - $al[1] ";} //debugging line
- //foreach ($fvalues as $fv) {$statisticsoutput .= "$fv | ";} //debugging line
+ }
+ return array("alist"=>$alist, "qtitle"=>$qtitle, "qquestion"=>$qquestion, "qtype"=>$qtype, "statisticsoutput"=>$statisticsoutput);
+}
+/**
+* displayResults builds html output to display the actual results from a survey
+*
+* @param mixed $outputs
+* @param INT $results The number of results being displayed overall
+* @param mixed $rt
+* @param mixed $outputType
+* @param mixed $surveyid
+* @param mixed $sql
+* @param mixed $usegraph
+*/
+function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $usegraph, $browse, $pdf) {
+
+ /* Set up required variables */
+ $TotalCompleted = 0; //Count of actually completed answers
+ $statlangcode = getBaseLanguageFromSurveyID($surveyid);
+ $statlang = new Limesurvey_lang($statlangcode);
+ $statisticsoutput="";
+ $sDatabaseType = Yii::app()->db->getDriverName();
+ $tempdir = Yii::app()->getConfig("tempdir");
+ $tempurl = Yii::app()->getConfig("tempurl");
+ $firstletter = substr($rt, 0, 1);
+ $astatdata=array();
- //2. Collect and Display results #######################################################################
- if (isset($alist) && $alist) //Make sure there really is an answerlist, and if so:
+ if ($usegraph==1)
{
+ //for creating graphs we need some more scripts which are included here
+ require_once(APPPATH.'/third_party/pchart/pchart/pChart.class');
+ require_once(APPPATH.'/third_party/pchart/pchart/pData.class');
+ require_once(APPPATH.'/third_party/pchart/pchart/pCache.class');
+ $MyCache = new pCache($tempdir.'/');
+ }
-
- // this will count the answers considered completed
- $TotalCompleted = 0;
switch($outputType)
{
case 'xls':
- $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8'));
- $xlsDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8');
+ $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($outputs['qtitle'],ENT_QUOTES,'UTF-8'));
+ $xlsDesc = html_entity_decode($outputs['qquestion'],ENT_QUOTES,'UTF-8');
++$xlsRow;
++$xlsRow;
@@ -2079,8 +1762,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
break;
case 'pdf':
- $sPDFQuestion=flattenText($qquestion,false,true);
- $pdfTitle = $pdf->delete_html(sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')));
+ $sPDFQuestion=flattenText($outputs['qquestion'],false,true);
+ $pdfTitle = $pdf->delete_html(sprintf($statlang->gT("Field summary for %s"),html_entity_decode($outputs['qtitle'],ENT_QUOTES,'UTF-8')));
$titleDesc = $sPDFQuestion;
$pdf->addPage('P','A4');
@@ -2096,12 +1779,12 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
."\t
"
//headline
- .sprintf($statlang->gT("Field summary for %s"),$qtitle).""
+ .sprintf($statlang->gT("Field summary for %s"),$outputs['qtitle']).""
."
\n"
."\t
"
//question title
- .$qquestion."
\n"
+ .$outputs['qquestion']."\n"
."\t
\n\t\t
";
break;
default:
@@ -2112,16 +1795,16 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
echo '';
//loop thorugh the array which contains all answer data
- foreach ($alist as $al)
+ foreach ($outputs['alist'] as $al)
{
- //picks out alist that come from the multiple list above
+ //picks out answer list ($outputs['alist']/$al)) that come from the multiple list above
if (isset($al[2]) && $al[2])
{
- //handling for "other" option
+ //handling for "other" option
if ($al[0] == $statlang->gT("Other"))
{
- if($qtype=='!' || $qtype=='L')
+ if($outputs['qtype']=='!' || $outputs['qtype']=='L')
{
// It is better for single choice question types to filter on the number of '-oth-' entries, than to
// just count the number of 'other' values - that way with failing Javascript the statistics don't get messed up
@@ -2143,8 +1826,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
* S = short free text
* Q = multiple short text
*/
-
- elseif ($qtype == "U" || $qtype == "T" || $qtype == "S" || $qtype == "Q" || $qtype == ";")
+ elseif ($outputs['qtype'] == "U" || $outputs['qtype'] == "T" || $outputs['qtype'] == "S" || $outputs['qtype'] == "Q" || $outputs['qtype'] == ";")
{
$sDatabaseType = Yii::app()->db->getDriverName();
@@ -2161,7 +1843,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." = '')" : " (".Yii::app()->db->quoteColumnName($al[2])." LIKE ''))";
}
}
- elseif ($qtype == "O")
+ elseif ($outputs['qtype'] == "O")
{
$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( ";
$query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." <> '')" : " (".Yii::app()->db->quoteColumnName($al[2])." NOT LIKE ''))";
@@ -2181,7 +1863,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$query .= " 'Y'";
}
}
-
} //end if -> alist set
else
@@ -2255,15 +1936,16 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//"other" handling
//"Answers" means that we show an option to list answer to "other" text field
- elseif ($al[0] === $statlang->gT("Other") || $al[0] === "Answers" || ($qtype === "O" && $al[0] === $statlang->gT("Comments")) || $qtype === "P")
+ elseif ($al[0] === $statlang->gT("Other") || $al[0] === "Answers" || ($outputs['qtype'] === "O" && $al[0] === $statlang->gT("Comments")) || $outputs['qtype'] === "P")
{
- if ($qtype == "P") $ColumnName_RM = $al[2]."comment";
+ if ($outputs['qtype'] == "P") $ColumnName_RM = $al[2]."comment";
else $ColumnName_RM = $al[2];
- if ($qtype=='O') {
+ if ($outputs['qtype']=='O') {
$TotalCompleted -=$row[0];
}
$fname="$al[1]";
- if ($browse===true) $fname .= " ";
+ if ($browse===true) $fname .= " ";
}
/*
@@ -2274,7 +1956,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
* S = short free text
* Q = multiple short text
*/
- elseif ($qtype == "S" || $qtype == "U" || $qtype == "T" || $qtype == "Q")
+ elseif ($outputs['qtype'] == "S" || $outputs['qtype'] == "U" || $outputs['qtype'] == "T" || $outputs['qtype'] == "Q")
{
$headPDF = array();
$headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage"));
@@ -2283,9 +1965,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
if ($al[0] == "Answers")
{
$fname= "$al[1]";
- if ($browse===true) $fname .= " ";
+ if ($browse===true) $fname .= " ";
}
elseif ($al[0] == "NoAnswer")
{
@@ -2306,7 +1987,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
{
if(!isset($showheadline) || $showheadline != false)
{
- if($qtype == "5" || $qtype == "A")
+ if($outputs['qtype'] == "5" || $outputs['qtype'] == "A")
{
switch($outputType)
{
@@ -2345,7 +2026,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
break;
}
-
$showheadline = false;
}
else
@@ -2353,7 +2033,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
switch($outputType)
{
case 'xls':
-
$headXLS = array();
$headXLS[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage"));
@@ -2381,7 +2060,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
break;
default:
-
break;
}
@@ -2394,7 +2072,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$fname="$al[1] ($al[0])";
//these question types get special treatment by Yii::app()->getConfig('showaggregateddata')
- if($qtype == "5" || $qtype == "A")
+ if($outputs['qtype'] == "5" || $outputs['qtype'] == "A")
{
//put non-edited data in here because $row will be edited later
$grawdata[]=$row[0];
@@ -2549,15 +2227,15 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
} //end foreach -> loop through answer data
//no filtering of incomplete answers and NO multiple option questions
- //if ((incompleteAnsFilterState() != "filter") and ($qtype != "M") and ($qtype != "P"))
+ //if ((incompleteAnsFilterState() != "filter") and ($outputs['qtype'] != "M") and ($outputs['qtype'] != "P"))
//error_log("TIBO ".print_r($showaggregated_indice_table,true));
- if (($qtype != "M") and ($qtype != "P"))
+ if (($outputs['qtype'] != "M") and ($outputs['qtype'] != "P"))
{
//is the checkbox "Don't consider NON completed responses (only works when Filter incomplete answers is Disable)" checked?
- //if (isset($_POST["noncompleted"]) and ($_POST["noncompleted"] == "on") && (isset(Yii::app()->getConfig('showaggregateddata')) && Yii::app()->getConfig('showaggregateddata') == 0))
+ //if (isset($_POST[''noncompleted']) and ($_POST['noncompleted'] == "on") && (isset(Yii::app()->getConfig('showaggregateddata')) && Yii::app()->getConfig('showaggregateddata') == 0))
// TIBO: TODO WE MUST SKIP THE FOLLOWING SECTION FOR TYPE A and 5 when
// showaggreagated data is set and set to 1
- if (isset($_POST["noncompleted"]) and ($_POST["noncompleted"] == "on") )
+ if (isset($_POST['noncompleted']) and ($_POST['noncompleted'] == "on") )
{
//counter
$i=0;
@@ -2661,10 +2339,20 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
* 3 (25%) = percentage
*/
$statisticsoutput .= "\t
\n\t\t
" . $label[$i] ."\n"
- ."\t\t
\n"
+ ."\t\t\n";
+ /*
+ * If there is a "browse" button in this label, let's make sure there's an extra row afterwards
+ * to store the columnlist
+ *
+ * */
+ if(strpos($label[$i], "class='statisticsbrowsebutton'"))
+ {
+ $extraline="
+
\n";
+ }
//output absolute number of records
- ."\t\t
" . $grawdata[$i] . "\n
";
+ $statisticsoutput .= "\t\t
" . $grawdata[$i] . "\n
";
//no data
@@ -2697,14 +2385,16 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$gdata[$i] = 0;
//check if we have to adjust ouput due to Yii::app()->getConfig('showaggregateddata') setting
- if(Yii::app()->getConfig('showaggregateddata') == 1 && ($qtype == "5" || $qtype == "A"))
+ if(Yii::app()->getConfig('showaggregateddata') == 1 && ($outputs['qtype'] == "5" || $outputs['qtype'] == "A"))
{
$statisticsoutput .= "\t\t";
}
- elseif ($qtype == "S" || $qtype == "U" || $qtype == "T" || $qtype == "Q")
+ elseif ($outputs['qtype'] == "S" || $outputs['qtype'] == "U" || $outputs['qtype'] == "T" || $outputs['qtype'] == "Q")
{
- $statisticsoutput .= "\n\t\n";
+ $statisticsoutput .= "\n\t";
}
+ $statisticsoutput .= "\n"; //Close the row
+ if(isset($extraline)) {$statisticsoutput .= $extraline;}
break;
default:
@@ -2718,7 +2408,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
else
{
//check if data should be aggregated
- if(Yii::app()->getConfig('showaggregateddata') == 1 && ($qtype == "5" || $qtype == "A"))
+ if(Yii::app()->getConfig('showaggregateddata') == 1 && ($outputs['qtype'] == "5" || $outputs['qtype'] == "A"))
{
//mark that we have done soemthing special here
$aggregated = true;
@@ -3102,6 +2792,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$statisticsoutput .= "\t\t";
//end output per line. there has to be a whitespace within the table cell to display correctly
$statisticsoutput .= "\t\t \n\t\n";
+ if(isset($extraline)) {$statisticsoutput .= $extraline;}
break;
default:
@@ -3120,6 +2811,9 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$itemcounter++;
+ //Clear extraline
+ unset($extraline);
+
} //end while
//only show additional values when this setting is enabled
@@ -3128,7 +2822,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//it's only useful to calculate standard deviation and arithmetic means for question types
//5 = 5 Point Scale
//A = Array (5 Point Choice)
- if($qtype == "5" || $qtype == "A")
+ if($outputs['qtype'] == "5" || $outputs['qtype'] == "A")
{
$stddev = 0;
$am = 0;
@@ -3270,10 +2964,10 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//PCHART has to be enabled and we need some data
if ($usegraph == 1) {
$bShowGraph = $aattr["statistics_showgraph"] == "1";
- $bAllowPieChart = ($qtype != "M" && $qtype != "P");
+ $bAllowPieChart = ($outputs['qtype'] != "M" && $outputs['qtype'] != "P");
$bAllowMap = (isset($aattr["location_mapservice"]) && $aattr["location_mapservice"] == "1");
$bShowMap = ($bAllowMap && $aattr["statistics_showmap"] == "1");
- $bShowPieChart = ($bAllowPieChart && $aattr["statistics_graphtype"] == "1");
+ $bShowPieChart = ($bAllowPieChart && (isset($aattr["statistics_graphtype"]) && $aattr["statistics_graphtype"] == "1"));
$astatdata[$rt] = array(
'id' => $rt,
@@ -3284,11 +2978,13 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
'sp' => $bShowPieChart
);
- Yii::app()->session['stats'][$rt] = array(
+ $stats=Yii::app()->session['stats'];
+ $stats[$rt]=array(
'lbl' => $lbl,
'gdata' => $gdata,
'grawdata' => $grawdata
);
+ Yii::app()->session['stats'] = $stats;
if (array_sum($gdata)>0 && $bShowGraph == true)
{
@@ -3312,7 +3008,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
$pdf->AddPage('P','A4');
$pdf->titleintopdf($pdfTitle,$titleDesc);
- $pdf->Image($tempdir."/".$cachefilename, 0, 70, 180, 0, '', $homeurl."/admin.php?sid=$surveyid", 'B', true, 150,'C',false,false,0,true);
+ $pdf->Image($tempdir."/".$cachefilename, 0, 70, 180, 0, '', Yii::app()->getController()->createUrl("admin/survey/view/surveyid/".$surveyid), 'B', true, 150,'C',false,false,0,true);
break;
case 'html':
@@ -3341,39 +3037,401 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//close table/output
if($outputType=='html') {
- if ($usegraph) {
+ if ($usegraph==1) {
$sImgUrl = Yii::app()->getConfig('adminimageurl');
$statisticsoutput .= "
";
}
$statisticsoutput .= " \n";
}
- } //end if -> collect and display results
-
-
+ return array("statisticsoutput"=>$statisticsoutput, "pdf"=>$pdf, "astatdata"=>$astatdata);
- //delete data
- unset($gdata);
- unset($grawdata);
- unset($label);
- unset($lbl);
- unset($lblrtl);
- unset($lblout);
- unset($justcode);
- unset ($alist);
-
- } // end foreach -> loop through all questions
+}
- //output
+/**
+* Generates statistics
+*
+* @param int $surveyid The survey id
+* @param mixed $allfields
+* @param mixed $q2show
+* @param mixed $usegraph
+* @param string $outputType Optional - Can be xls, html or pdf - Defaults to pdf
+* @param string $pdfOutput Sets the target for the PDF output: DD=File download , F=Save file to local disk
+* @param string $statlangcode Lamguage for statistics
+* @param mixed $browse Show browse buttons
+* @return buffer
+*/
+function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $outputType='pdf', $pdfOutput='I',$statlangcode=null, $browse = true)
+{
+ global $pdfdefaultfont, $pdffontsize;
+
+ $astatdata=array(); //astatdata generates data for the output page's javascript so it can rebuild graphs on the fly
+
+ //load surveytranslator helper
+ Yii::import('application.helpers.surveytranslator_helper', true);
+
+ $statisticsoutput = ""; //This string carries all the actual HTML code to print.
+ $imagedir = Yii::app()->getConfig("imagedir");
+ $tempdir = Yii::app()->getConfig("tempdir");
+ $tempurl = Yii::app()->getConfig("tempurl");
+ $clang = Yii::app()->lang;
+ $pdf=array(); //Make sure $pdf exists - it will be replaced with an object if a $pdf is actually being created
+
+
+ // Used for getting coordinates for google maps
+ $agmapdata = array();
+
+ //pick the best font file if font setting is 'auto'
+ if (is_null($statlangcode))
+ {
+ $statlangcode = getBaseLanguageFromSurveyID($surveyid);
+ }
+ else
+ {
+ $statlang = new Limesurvey_lang($statlangcode);
+ }
+
+ /*
+ * this variable is used in the function shortencode() which cuts off a question/answer title
+ * after $maxchars and shows the rest as tooltip (in html mode)
+ */
+ $maxchars = 13;
+ //we collect all the html-output within this variable
+ $statisticsoutput ='';
+ /**
+ * $outputType: html || pdf ||
+ */
+ /**
+ * get/set Survey Details
+ */
+
+ //no survey ID? -> come and get one
+ if (!isset($surveyid)) {$surveyid=returnGlobal('sid');}
+
+ //Get an array of codes of all available languages in this survey
+ $surveylanguagecodes = Survey::model()->findByPk($surveyid)->additionalLanguages;
+ $surveylanguagecodes[] = Survey::model()->findByPk($surveyid)->language;
+
+ $fieldmap=createFieldMap($surveyid, "full", false, false, $statlang->getlangcode());
+
+ // Set language for questions and answers to base language of this survey
+ $language=$statlangcode;
+
+ if($q2show=='all' )
+ {
+ $summarySql=" SELECT gid, parent_qid, qid, type "
+ ." FROM {{questions}} WHERE parent_qid=0"
+ ." AND sid=$surveyid ";
+
+ $summaryRs = Yii::app()->db->createCommand($summarySql)->query()->readAll();
+
+ foreach($summaryRs as $field)
+ {
+ $myField = $surveyid."X".$field['gid']."X".$field['qid'];
+
+ // Multiple choice get special treatment
+ if ($field['type'] == "M") {$myField = "M$myField";}
+ if ($field['type'] == "P") {$myField = "P$myField";}
+ //numerical input will get special treatment (arihtmetic mean, standard derivation, ...)
+ if ($field['type'] == "N") {$myField = "N$myField";}
+
+ if ($field['type'] == "|") {$myField = "|$myField";}
+
+ if ($field['type'] == "Q") {$myField = "Q$myField";}
+ // textfields get special treatment
+ if ($field['type'] == "S" || $field['type'] == "T" || $field['type'] == "U"){$myField = "T$myField";}
+ //statistics for Date questions are not implemented yet.
+ if ($field['type'] == "D") {$myField = "D$myField";}
+ if ($field['type'] == "F" || $field['type'] == "H")
+ {
+ //Get answers. We always use the answer code because the label might be too long elsewise
+ $query = "SELECT code, answer FROM {{answers}} WHERE qid='".$field['qid']."' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, answer";
+ $result = Yii::app()->db->createCommand($query)->query();
+ $counter2=0;
+
+ //check all the answers
+ foreach ($result->readAll() as $row)
+ {
+ $row=array_values($row);
+ $myField = "$myField{$row[0]}";
+ }
+ //$myField = "{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]";
+
+
+ }
+ if($q2show=='all')
+ $summary[]=$myField;
+
+ //$allfields[]=$myField;
+ }
+ }
+ else
+ {
+ // This gets all the 'to be shown questions' from the POST and puts these into an array
+ if (!is_array($q2show))
+ $summary=returnGlobal('summary');
+ else
+ $summary = $q2show;
+
+ //print_r($_POST);
+ //if $summary isn't an array we create one
+ if (isset($summary) && !is_array($summary))
+ {
+ $summary = explode("+", $summary);
+ }
+ }
+
+ /**
+ * pdf Config
+ */
+ if($outputType=='pdf')
+ {
+ //require_once('classes/tcpdf/config/lang/eng.php');
+ global $l;
+ $l['w_page'] = $statlang->gT("Page",'unescaped');
+ //require_once('classes/tcpdf/mypdf.php');
+ Yii::import('application.libraries.admin.pdf', true);
+ // create new PDF document
+ $pdf = new Pdf();
+ $pdf->SetFont($pdfdefaultfont,'',$pdffontsize);
+
+ $surveyInfo = getSurveyInfo($surveyid,$language);
+
+ // set document information
+ $pdf->SetCreator(PDF_CREATOR);
+ $pdf->SetAuthor('LimeSurvey');
+ $pdf->SetTitle('Statistic survey '.$surveyid);
+ $pdf->SetSubject($surveyInfo['surveyls_title']);
+ $pdf->SetKeywords('LimeSurvey, Statistics, Survey '.$surveyid.'');
+ $pdf->SetDisplayMode('fullpage', 'two');
+
+ // set header and footer fonts
+ $pdf->setHeaderFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_MAIN));
+ $pdf->setFooterFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_DATA));
+
+ // set default header data
+ $pdf->SetHeaderData("statistics.png", 10, $statlang->gT("Quick statistics",'unescaped') , $statlang->gT("Survey")." ".$surveyid." '".flattenText($surveyInfo['surveyls_title'],false,true,'UTF-8')."'");
+
+
+ // set default monospaced font
+ $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
+
+ //set margins
+ $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
+ $pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
+ $pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
+
+ //set auto page breaks
+ $pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
+
+ //set image scale factor
+ $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
+
+ //set some language-dependent strings
+ $pdf->setLanguageArray($l);
+ }
+ if($outputType=='xls')
+ {
+ /**
+ * Initiate the Spreadsheet_Excel_Writer
+ */
+ Yii::import('application.libraries.admin.pear.Spreadsheet.Excel.Xlswriter', true);
+ if($pdfOutput=='F')
+ $workbook = new Xlswriter($tempdir.'/statistic-survey'.$surveyid.'.xls');
+ else
+ $workbook = new Xlswriter();
+
+ $workbook->setVersion(8);
+ // Inform the module that our data will arrive as UTF-8.
+ // Set the temporary directory to avoid PHP error messages due to open_basedir restrictions and calls to tempnam("", ...)
+ if (!empty($tempdir)) {
+ $workbook->setTempDir($tempdir);
+ }
+ if ($pdfOutput!='F')
+ $workbook->send('statistic-survey'.$surveyid.'.xls');
+
+ // Creating the first worksheet
+ $sheet =& $workbook->addWorksheet(utf8_decode('results-survey'.$surveyid));
+ $sheet->setInputEncoding('utf-8');
+ $sheet->setColumn(0,20,20);
+ $separator="~|";
+ /**XXX*/
+ }
+ /**
+ * Start generating
+ */
+
+
+
+ $selects=buildSelects($allfields, $surveyid, $language);
+
+ //count number of answers
+ $query = "SELECT count(*) FROM {{survey_$surveyid}}";
+
+ //if incompleted answers should be filtert submitdate has to be not null
+ if (incompleteAnsFilterState() == "inc") {$query .= " WHERE submitdate is null";}
+ elseif (incompleteAnsFilterState() == "filter") {$query .= " WHERE submitdate is not null";}
+ $result = Yii::app()->db->createCommand($query)->query();
+
+ //$total = total number of answers
+ $row=$result->read(); $total=reset($row);
+
+ //are there any filters that have to be taken care of?
+ if (isset($selects) && $selects)
+ {
+ //filter incomplete answers?
+ if (incompleteAnsFilterState() == "filter" || incompleteAnsFilterState() == "inc") {$query .= " AND ";}
+
+ else {$query .= " WHERE ";}
+
+ //add filter criteria to SQL
+ $query .= implode(" AND ", $selects);
+ }
+
+
+ //get me some data Scotty
+ $result=Yii::app()->db->createCommand($query)->query();
+
+ //put all results into $results
+ $row=$result->read(); $results=reset($row);
+
+ if ($total)
+ {
+ $percent=sprintf("%01.2f", ($results/$total)*100);
+
+ }
+ switch($outputType)
+ {
+ case "xls":
+ $xlsRow = 0;
+ $sheet->write($xlsRow,0,$statlang->gT("Number of records in this query:",'unescaped'));
+ $sheet->write($xlsRow,1,$results);
+ ++$xlsRow;
+ $sheet->write($xlsRow,0,$statlang->gT("Total records in survey:",'unescaped'));
+ $sheet->write($xlsRow,1,$total);
+
+ if($total)
+ {
+ ++$xlsRow;
+ $sheet->write($xlsRow,0,$statlang->gT("Percentage of total:",'unescaped'));
+ $sheet->write($xlsRow,1,$percent."%");
+ }
+
+ break;
+ case 'pdf':
+
+ // add summary to pdf
+ $array = array();
+ //$array[] = array($statlang->gT("Results"),"");
+ $array[] = array($statlang->gT("Number of records in this query:",'unescaped'), $results);
+ $array[] = array($statlang->gT("Total records in survey:",'unescaped'), $total);
+
+ if($total)
+ $array[] = array($statlang->gT("Percentage of total:",'unescaped'), $percent."%");
+
+ $pdf->addPage('P','A4');
+
+ $pdf->Bookmark($pdf->delete_html($statlang->gT("Results",'unescaped')), 0, 0);
+ $pdf->titleintopdf($statlang->gT("Results",'unescaped'),$statlang->gT("Survey",'unescaped')." ".$surveyid);
+ $pdf->tableintopdf($array);
+
+ $pdf->addPage('P','A4');
+
+ break;
+ case 'html':
+
+ $statisticsoutput .= " \n
\n"
+ ."\t
".$statlang->gT("Results")."
\n"
+ ."\t
".$statlang->gT("Number of records in this query:").'
'
+ ."
$results
\n"
+ ."\t
".$statlang->gT("Total records in survey:").'
'
+ ."
$total
\n";
+
+ //only calculate percentage if $total is set
+ if ($total)
+ {
+ $percent=sprintf("%01.2f", ($results/$total)*100);
+ $statisticsoutput .= "\t
".$statlang->gT("Percentage of total:").'
'
+ ."
$percent%
\n";
+ }
+ $statisticsoutput .="
\n";
+
+ break;
+ default:
+
+
+ break;
+ }
+
+ //put everything from $selects array into a string connected by AND
+ //This string ($sql) can then be passed on to other functions so you can
+ //browse these results
+ if (isset ($selects) && $selects) {$sql=implode(" AND ", $selects);}
+
+ elseif (!empty($newsql)) {$sql = $newsql;}
+
+ if (!isset($sql) || !$sql) {$sql="NULL";}
+
+ //only continue if we have something to output
+ if ($results > 0)
+ {
+ if($outputType=='html' && $browse === true)
+ {
+ //add a buttons to browse results
+ $statisticsoutput .= "\n";
+ }
+ } //end if (results > 0)
+
+ /* Show Summary results
+ * The $summary array contains each fieldname that we want to display statistics for
+ *
+ * */
+
+ if (isset($summary) && $summary)
+ {
+ //let's run through the survey
+ $runthrough=$summary;
+
+ //START Chop up fieldname and find matching questions
+
+ //loop through all selected questions
+ foreach ($runthrough as $rt)
+ {
+
+ //Step 1: Get information about this response field (SGQA) for the summary
+ $outputs=buildOutputList($rt, $language, $surveyid, $outputType, $sql);
+ $statisticsoutput .= $outputs['statisticsoutput'];
+ //2. Collect and Display results #######################################################################
+ if (isset($outputs['alist']) && $outputs['alist']) //Make sure there really is an answerlist, and if so:
+ {
+ $display=displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $usegraph, $browse, $pdf);
+ $statisticsoutput .= $display['statisticsoutput'];
+ $astatdata = array_merge($astatdata, $display['astatdata']);
+ } //end if -> collect and display results
+
+
+ //Delete Build Outputs data
+ unset($outputs);
+ unset($display);
+ } // end foreach -> loop through all questions
+
+ //output
if($outputType=='html')
$statisticsoutput .= " \n";
@@ -3408,7 +3466,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
break;
case 'html':
- $statisticsoutput .= ""
+ $statisticsoutput .= "\n"
."";
return $statisticsoutput;
@@ -3421,7 +3479,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
}
-
/**
* Simple function to square a value
*
diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
index 0a4d24d833e..353ebc03d1b 100644
--- a/application/helpers/admin/token_helper.php
+++ b/application/helpers/admin/token_helper.php
@@ -23,20 +23,21 @@
*/
function createTokenTable($iSurveyID, $aAttributeFields=array())
{
+ Yii::app()->loadHelper('database');
$fields = array(
'tid' => 'pk',
- 'participant_id' => 'VARCHAR(50)',
- 'firstname' => 'VARCHAR(40)',
- 'lastname' => 'VARCHAR(40)',
+ 'participant_id' => 'varchar(50)',
+ 'firstname' => 'varchar(40)',
+ 'lastname' => 'varchar(40)',
'email' => 'text',
'emailstatus' => 'text',
- 'token' => 'VARCHAR(35)',
- 'language' => 'VARCHAR(25)',
- 'blacklisted' => 'CHAR(17)',
- 'sent' => "VARCHAR(17) DEFAULT 'N'",
- 'remindersent' => "VARCHAR(17) DEFAULT 'N'",
+ 'token' => 'varchar(35)',
+ 'language' => 'varchar(25)',
+ 'blacklisted' => 'varchar(17)',
+ 'sent' => "varchar(17) DEFAULT 'N'",
+ 'remindersent' => "varchar(17) DEFAULT 'N'",
'remindercount' => 'integer DEFAULT 0',
- 'completed' => "VARCHAR(17) DEFAULT 'N'",
+ 'completed' => "varchar(17) DEFAULT 'N'",
'usesleft' => 'integer DEFAULT 1',
'validfrom' => 'datetime',
'validuntil' => 'datetime',
@@ -47,7 +48,7 @@ function createTokenTable($iSurveyID, $aAttributeFields=array())
$fields[$sAttributeField]='string';
}
try{
- Yii::app()->db->createCommand()->createTable("{{tokens_".intval($iSurveyID)."}}", $fields);
+ createTable("{{tokens_".intval($iSurveyID)."}}", $fields);
return true;
} catch(Exception $e) {
return false;
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 0993a954271..f7e0e9e1866 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -386,7 +386,7 @@ function getQuestions($surveyid,$gid,$selectedqid)
{
$clang = Yii::app()->lang;
$s_lang = Survey::model()->findByPk($surveyid)->language;
- $qrows = Questions::model()->findAllByAttributes(array('sid' => $surveyid, 'gid' => $gid, 'language' => $s_lang, 'parent_qid' => 0));
+ $qrows = Questions::model()->findAllByAttributes(array('sid' => $surveyid, 'gid' => $gid, 'language' => $s_lang, 'parent_qid' => 0),array('order'=>'question_order'));
if (!isset($sQuestionselecter)) {$sQuestionselecter="";}
foreach ($qrows as $qrow)
@@ -1464,12 +1464,7 @@ function getQuestion($fieldcode)
foreach($fields as $field)
{
$q=$field['q'];
- //try {
- //echo 'test';
if($q->id==$qid && $q->surveyid==$sid && $q->gid==$gid) return $q;
- //} catch(Exception $e) {
- // var_dump($q);die();
- //}
}
return false;
}
@@ -1728,22 +1723,26 @@ function stripComments($comment, $email, $replace=''){
}
-function validateTemplateDir($templatename)
+function validateTemplateDir($sTemplateName)
{
$usertemplaterootdir = Yii::app()->getConfig('usertemplaterootdir');
$standardtemplaterootdir = Yii::app()->getConfig('standardtemplaterootdir');
- $defaulttemplate = Yii::app()->getConfig('defaulttemplate');
- if (is_dir("$usertemplaterootdir/{$templatename}/"))
+ $sDefaultTemplate = Yii::app()->getConfig('defaulttemplate');
+ if (is_dir("$usertemplaterootdir/{$sTemplateName}/"))
{
- return $templatename;
+ return $sTemplateName;
}
- elseif (is_dir("$standardtemplaterootdir/{$templatename}/"))
+ elseif (is_dir("$standardtemplaterootdir/{$sTemplateName}/"))
{
- return $templatename;
+ return $sTemplateName;
}
- elseif (is_dir("$usertemplaterootdir/{$defaulttemplate}/"))
+ elseif (is_dir("$standardtemplaterootdir/{$sDefaultTemplate}/"))
{
- return $defaulttemplate;
+ return $sDefaultTemplate;
+ }
+ elseif (is_dir("$usertemplaterootdir/{$sDefaultTemplate}/"))
+ {
+ return $sDefaultTemplate;
}
else
{
@@ -2115,7 +2114,7 @@ function buildLabelSetCheckSumArray()
/**$query = "SELECT lid
FROM ".db_table_name('labelsets')."
ORDER BY lid"; */
- $result = Labelsets::getLID();//($query) or safeDie("safe_died collecting labelset ids $query "); //Checked)
+ $result = Labelsets::model()->getLID();//($query) or safeDie("safe_died collecting labelset ids $query "); //Checked)
$csarray=array();
foreach($result as $row)
{
@@ -2217,6 +2216,14 @@ function questionAttributes()
"help"=>$clang->gT('Set the percentage width of the answer column (1-100)'),
"caption"=>$clang->gT('Answer width'));
+ $qattributes["repeat_headings"]=array(
+ 'category'=>$clang->gT('Display'),
+ 'sortorder'=>100,
+ 'inputtype'=>'integer',
+ 'default'=>'',
+ "help"=>$clang->gT('Repeat headings every X subquestions (Set to 0 to deactivate heading repeat, deactivate minimum repeat headings from config).'),
+ "caption"=>$clang->gT('Repeat headers'));
+
$qattributes["array_filter"]=array(
'category'=>$clang->gT('Logic'),
'sortorder'=>100,
@@ -2628,7 +2635,7 @@ function questionAttributes()
$qattributes["numbers_only"]=array(
'category'=>$clang->gT('Other'),
- 'sortorder'=>100,
+ 'sortorder'=>150,
'inputtype'=>'singleselect',
'options'=>array(
0=>$clang->gT('No'),
@@ -2641,7 +2648,7 @@ function questionAttributes()
$qattributes['show_totals'] = array(
'category' => $clang->gT('Other'),
- 'sortorder' => 100,
+ 'sortorder' => 151,
'inputtype' => 'singleselect',
'options' => array(
'X' => $clang->gT('Off'),
@@ -2656,7 +2663,7 @@ function questionAttributes()
$qattributes['show_grand_total'] = array(
'category' => $clang->gT('Other'),
- 'sortorder' => 100,
+ 'sortorder' => 152,
'inputtype' => 'singleselect',
'options' => array(
0 => $clang->gT('No'),
@@ -2745,6 +2752,34 @@ function questionAttributes()
"help"=>$clang->gT('Present answers in random order'),
"caption"=>$clang->gT('Random answer order'));
+ $qattributes["showpopups"]=array(
+ 'category'=>$clang->gT('Display'),
+ 'sortorder'=>110,
+ 'inputtype'=>'singleselect',
+ 'options'=>array(0=>$clang->gT('No'),
+ 1=>$clang->gT('Yes')),
+ 'default'=>1,
+ "caption"=>$clang->gT('Show javascript alert'),
+ "help"=>$clang->gT('Show an alert if answers exceeds the number of max answers'));
+ $qattributes["samechoiceheight"]=array(
+ 'category'=>$clang->gT('Display'),
+ 'sortorder'=>120,
+ 'inputtype'=>'singleselect',
+ 'options'=>array(0=>$clang->gT('No'),
+ 1=>$clang->gT('Yes')),
+ 'default'=>1,
+ "caption"=>$clang->gT('Same height for all choice'),
+ "help"=>$clang->gT('Force each choice to have the same height'));
+ $qattributes["samelistheight"]=array(
+ 'category'=>$clang->gT('Display'),
+ 'sortorder'=>121,
+ 'inputtype'=>'singleselect',
+ 'options'=>array(0=>$clang->gT('No'),
+ 1=>$clang->gT('Yes')),
+ 'default'=>1,
+ "caption"=>$clang->gT('Same height for lists'),
+ "help"=>$clang->gT('Force the choice list and the rank list to have the same height'));
+
$qattributes["parent_order"]=array(
'category'=>$clang->gT('Display'),
'sortorder'=>100,
@@ -2888,6 +2923,24 @@ function questionAttributes()
"help"=>$clang->gT("Set a specific SPSS export scale type for this question"),
"caption"=>$clang->gT('SPSS export scale type'));
+ $qattributes["choice_title"]=array(
+ 'category'=>$clang->gT('Other'),
+ 'sortorder'=>200,
+ "inputtype"=>"text",
+ 'i18n'=>true,
+ 'default'=>"",
+ "help"=>sprintf($clang->gT("Replace choice header (default: \"%s\")",'js'),$clang->gT("Your Choices")),
+ "caption"=>$clang->gT("Choice header"));
+
+ $qattributes["rank_title"]=array(
+ 'category'=>$clang->gT('Other'),
+ 'sortorder'=>201,
+ "inputtype"=>"text",
+ 'i18n'=>true,
+ 'default'=>"",
+ "help"=>sprintf($clang->gT("Replace rank header (default: \"%s\")",'js'),$clang->gT("Your Ranking")),
+ "caption"=>$clang->gT("Rank header"));
+
//Timer attributes
$qattributes["time_limit"]=array(
'category'=>$clang->gT('Timer'),
@@ -3374,7 +3427,6 @@ function SendEmailMessage($body, $subject, $to, $from, $sitename, $ishtml=false,
ob_end_clean();
}
$maildebugbody=$mail->Body;
- //if(!$sent) var_dump($maildebug);
return $sent;
}
@@ -3673,7 +3725,7 @@ function createPassword()
for ($i=0; $i<$password_length; $i++)
{
- $passwd .= $pwchars[floor(rand(0,strlen($pwchars)-1))];
+ $passwd .= $pwchars[(int)floor(rand(0,strlen($pwchars)-1))];
}
return $passwd;
}
@@ -3767,7 +3819,7 @@ function incompleteAnsFilterState()
{
global $filterout_incomplete_answers;
$letsfilter='';
- $letsfilter = returnGlobal('filterinc'); //read get/post filterinc
+ $letsfilter = returnGlobal('completionstate'); //read get/post completionstate
// first let's initialize the incompleteanswers session variable
@@ -3780,14 +3832,8 @@ function incompleteAnsFilterState()
Yii::app()->session['incompleteanswers'] = $filterout_incomplete_answers;
}
- if (Yii::app()->session['incompleteanswers']=='filter') {
- return "filter"; //COMPLETE ANSWERS ONLY
- }
- elseif (Yii::app()->session['incompleteanswers']=='show') {
- return false; //ALL ANSWERS
- }
- elseif (Yii::app()->session['incompleteanswers']=='incomplete') {
- return "inc"; //INCOMPLETE ANSWERS ONLY
+ if (Yii::app()->session['incompleteanswers']=='complete' || Yii::app()->session['incompleteanswers']=='all' || Yii::app()->session['incompleteanswers']=='incomplete') {
+ return Yii::app()->session['incompleteanswers'];
}
else
{ // last resort is to prevent filtering
@@ -3950,7 +3996,7 @@ function hasTemplateManageRights($userid, $templatefolder) {
$criteria = new CDbCriteria;
$criteria->addColumnCondition(array('uid' => $userid));
$criteria->addSearchCondition('folder', $templatefolder);
- $query=Templates_rights_model::model()->find($criteria);
+ $query=Templates_rights::model()->find($criteria);
//if ($result->RecordCount() == 0) return false;
if (is_null($query)) return false;
@@ -4334,14 +4380,14 @@ function cleanTempDirectory()
$dir = Yii::app()->getConfig('tempdir').'/';
$dp = opendir($dir) or show_error('Could not open temporary directory');
while ($file = readdir($dp)) {
- if (is_file($dir.$file) && (filemtime($dir.$file)) < (strtotime('-1 days')) && $file!='index.html' && $file!='.gitignore' && $file!='readme.txt' && $file!='..' && $file!='.' && $file!='.svn') {
+ if (is_file($dir.$file) && (filemtime($dir.$file)) < (strtotime('-1 days')) && $file!='index.html' && $file!='.gitignore' && $file!='readme.txt') {
@unlink($dir.$file);
}
}
$dir= Yii::app()->getConfig('tempdir').'/uploads/';
$dp = opendir($dir) or die ('Could not open temporary directory');
while ($file = readdir($dp)) {
- if (is_file($dir.$file) && (filemtime($dir.$file)) < (strtotime('-1 days')) && $file!='index.html' && $file!='.gitignore' && $file!='readme.txt' && $file!='..' && $file!='.' && $file!='.svn') {
+ if (is_file($dir.$file) && (filemtime($dir.$file)) < (strtotime('-1 days')) && $file!='index.html' && $file!='.gitignore' && $file!='readme.txt') {
@unlink($dir.$file);
}
}
@@ -4495,30 +4541,33 @@ function getTokenData($surveyid, $token)
*
* @param mixed $sTemplateName
*/
-function getTemplatePath($sTemplateName)
+function getTemplatePath($sTemplateName = false)
{
+ if (!$sTemplateName)
+ {
+ $sTemplateName=Yii::app()->getConfig('defaulttemplate'); // if $sTemplateName is NULL or false or ""
+ }
if (isStandardTemplate($sTemplateName))
{
- return Yii::app()->getConfig("standardtemplaterootdir").'/'.$sTemplateName;
+ return Yii::app()->getConfig("standardtemplaterootdir").DIRECTORY_SEPARATOR.$sTemplateName;
}
else
{
- if (file_exists(Yii::app()->getConfig("usertemplaterootdir").'/'.$sTemplateName))
+ if (is_dir(Yii::app()->getConfig("usertemplaterootdir").DIRECTORY_SEPARATOR.$sTemplateName))
{
- return Yii::app()->getConfig("usertemplaterootdir").'/'.$sTemplateName;
+ return Yii::app()->getConfig("usertemplaterootdir").DIRECTORY_SEPARATOR.$sTemplateName;
}
- elseif (file_exists(Yii::app()->getConfig("usertemplaterootdir").'/'.Yii::app()->getConfig('defaulttemplate')))
+ elseif (isStandardTemplate(Yii::app()->getConfig('defaulttemplate')))
{
- return Yii::app()->getConfig("usertemplaterootdir").'/'.Yii::app()->getConfig('defaulttemplate');
+ return Yii::app()->getConfig("standardtemplaterootdir").DIRECTORY_SEPARATOR.$sTemplateName;
}
- elseif (file_exists(Yii::app()->getConfig("standardtemplaterootdir").'/'.Yii::app()->getConfig('defaulttemplate')))
+ elseif (file_exists(Yii::app()->getConfig("usertemplaterootdir").DIRECTORY_SEPARATOR.Yii::app()->getConfig('defaulttemplate')))
{
- return Yii::app()->getConfig("standardtemplaterootdir").'/'.Yii::app()->getConfig('defaulttemplate');
+ return Yii::app()->getConfig("usertemplaterootdir").DIRECTORY_SEPARATOR.Yii::app()->getConfig('defaulttemplate');
}
else
{
-
- return Yii::app()->getConfig("standardtemplaterootdir").'/default';
+ return Yii::app()->getConfig("standardtemplaterootdir").DIRECTORY_SEPARATOR.'default';
}
}
}
@@ -4607,7 +4656,7 @@ function getXMLWriter() {
/**
-* Returns true when a token can not be used (either doesn't exist or has less then one usage left
+* Returns true when a token can not be used (either doesn't exist, has less then one usage left )
*
* @param mixed $tid Token
*/
@@ -4616,7 +4665,6 @@ function usedTokens($token, $surveyid)
$utresult = true;
Tokens_dynamic::sid($surveyid);
$query=Tokens_dynamic::model()->findAllByAttributes(array("token"=>$token));
-
if (count($query) > 0) {
$row = $query[0];
if ($row->usesleft > 0) $utresult = false;
@@ -4725,6 +4773,8 @@ function getQuotaCompletedCount($iSurveyId, $quotaid)
function getFullResponseTable($iSurveyID, $iResponseID, $sLanguageCode, $bHonorConditions=false)
{
$aFieldMap = createFieldMap($iSurveyID,'full',false,false,$sLanguageCode); //AJS#
+ $oLanguage = new Limesurvey_lang($sLanguageCode);
+
//Get response data
$idrow = Survey_dynamic::model($iSurveyID)->findByAttributes(array('id'=>$iResponseID));
@@ -4775,7 +4825,7 @@ function getFullResponseTable($iSurveyID, $iResponseID, $sLanguageCode, $bHonorC
}
else
{
- $answer = getExtendedAnswer($iSurveyID,$q->fieldname, $idrow[$q->fieldname],$sLanguageCode);
+ $answer = getExtendedAnswer($iSurveyID,$q->fieldname, $idrow[$q->fieldname],$oLanguage);
$aResultTable[$q->fieldname]=array($question,'',$answer);
continue;
}
@@ -4783,7 +4833,7 @@ function getFullResponseTable($iSurveyID, $iResponseID, $sLanguageCode, $bHonorC
}
else
{
- $answer=getExtendedAnswer($iSurveyID,$q->fieldname, $idrow[$q->fieldname],$sLanguageCode);
+ $answer=getExtendedAnswer($iSurveyID,$q->fieldname, $idrow[$q->fieldname],$oLanguage);
$aResultTable[$fname['fieldname']]=array($question,'',$answer);
continue;
}
@@ -4796,7 +4846,7 @@ function getFullResponseTable($iSurveyID, $iResponseID, $sLanguageCode, $bHonorC
if (isset($fname['subquestion2']))
$subquestion .= "[{$fname['subquestion2']}]";
- $answer = getExtendedAnswer($iSurveyID,$q->fieldname, $idrow[$q->fieldname],$sLanguageCode);
+ $answer = getExtendedAnswer($iSurveyID,$q->fieldname, $idrow[$q->fieldname],$oLanguage);
$aResultTable[$q->fieldname]=array('',$subquestion,$answer);
}
return $aResultTable;
@@ -4942,7 +4992,7 @@ function translateInsertansTags($newsid,$oldsid,$fieldnames)
# translate 'quotals_urldescrip' and 'quotals_url' INSERTANS tags in quota_languagesettings
$sql = "SELECT quotals_id, quotals_urldescrip, quotals_url from {{quota_languagesettings}} qls, {{quota}} q
WHERE sid=".$newsid." AND q.id=qls.quotals_quota_id AND (quotals_urldescrip LIKE '%{$oldsid}X%' OR quotals_url LIKE '%{$oldsid}X%')";
- $res = dbExecuteAssoc($sql) or safeDie("Can't read quota table in transInsertAns"); // Checked
+ $result = dbExecuteAssoc($sql) or safeDie("Can't read quota table in transInsertAns"); // Checked
foreach ($result->readAll() as $qentry)
{
@@ -6420,7 +6470,7 @@ function ellipsize($str, $max_length, $position = 1, $ellipsis = '…')
$str = trim(strip_tags($str));
// Is the string long enough to ellipsize?
- if (strlen($str) <= $max_length)
+ if (strlen($str) <= $max_length+3)
{
return $str;
}
diff --git a/application/helpers/database_helper.php b/application/helpers/database_helper.php
index 9e9503bd165..bae7090650c 100644
--- a/application/helpers/database_helper.php
+++ b/application/helpers/database_helper.php
@@ -171,7 +171,7 @@ function dbRandom()
$srandom= 0 + lcg_value()*(abs(1));
break;
}
-
+
return $srandom;
}
@@ -209,3 +209,32 @@ function dbGetTablesLike($table)
{
return (array) Yii::app()->db->createCommand(dbSelectTablesLike("{{{$table}}}"))->queryAll();
}
+
+/**
+* Creates a table using the YII DB Schema function but properly handles custom field types for the various DB types
+*
+* @param mixed $sTableName
+* @param mixed $aColumns
+* @param mixed $aOptions
+*/
+function createTable($sTableName, $aColumns, $aOptions=null)
+{
+ $sDBDriverName=Yii::app()->db->getDriverName();
+
+ if ($sDBDriverName=='sqlsrv' || $sDBDriverName=='mssql')
+ {
+ foreach ($aColumns as $sName=>&$sType)
+ {
+ $sType=str_replace('text','varchar(max)',$sType);
+ $sType=str_replace('binary','text',$sType);
+ }
+ }
+ if ($sDBDriverName=='pgsql')
+ {
+ foreach ($aColumns as $sName=>&$sType)
+ {
+ $sType=str_replace('varchar','character varying',$sType);
+ }
+ }
+ Yii::app()->db->createCommand()->createTable($sTableName,$aColumns,$aOptions);
+}
diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php
index b915aebe5ca..7446da8ea8d 100644
--- a/application/helpers/export_helper.php
+++ b/application/helpers/export_helper.php
@@ -466,14 +466,14 @@ function surveyGetXMLStructure($iSurveyID, $xmlwriter, $exclude=array())
$platform = Yii::app()->db->getDriverName();
if ($platform == 'mssql' || $platform =='sqlsrv')
{
- $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value
+ $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value, qa.language
FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID}
- where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000))";
+ where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000)), qa.language";
}
else {
- $query="SELECT qa.qid, qa.attribute, qa.value
+ $query="SELECT qa.qid, qa.attribute, qa.value, qa.language
FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID}
- where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value";
+ where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value, qa.language";
}
buildXMLFromQuery($xmlwriter,$query,'question_attributes');
@@ -663,65 +663,11 @@ function QueXMLFixedArray($array)
* @return bool|string Text of item to skip to otherwise false if nothing to skip to
* @author Adam Zammit
* @since 2010-10-28
+* @TODO Correctly handle conditions in a database agnostic way
*/
function QueXMLSkipTo($qid,$value,$cfieldname = "")
{
- global $iSurveyID, $quexmllang;
- $qlang = new limesurvey_lang($quexmllang);
-
- $zeros = "0000000000";
-
- $Query = "SELECT q.*," . concat("RIGHT(" . concat($zeros,'g.gid') . ",10)","RIGHT(". concat($zeros,'q.question_order') .",10)") ." as globalorder
- FROM {{questions}} as q, {{questions}} as q2, {{groups}} as g, {{groups}} as g2
- WHERE q.parent_qid = 0
- AND q2.parent_qid = 0
- AND q.sid=$iSurveyID
- AND q2.sid=$iSurveyID
- AND q2.qid = $qid
- AND g2.gid =q2.gid
- AND g.gid = q.gid
- AND " . concat("RIGHT(" . concat($zeros,'g.gid') . ",10)","RIGHT(". concat($zeros,'q.question_order') .",10)") ." > " . concat("RIGHT(" . concat($zeros,'g2.gid') . ",10)","RIGHT(". concat($zeros,'q2.question_order') .",10)") ."
- ORDER BY globalorder";
-
- $QueryResult = Yii::app()->db->createCommand($Query)->query();
-
- $nextqid="";
- $nextorder="";
-
- $Row = $QueryResult->read();
- if ($Row)
- {
- $nextqid = $Row['qid'];
- $nextorder = $Row['globalorder'];
- }
- else
- return false;
-
-
- $Query = "SELECT q.*
- FROM {{questions}} as q
- JOIN {{groups}} as g ON (g.gid = q.gid)
- LEFT JOIN {{conditions}} as c ON (c.cqid = '$qid' AND c.qid = q.qid AND c.method LIKE '==' AND c.value NOT LIKE '$value' $cfieldname)
- WHERE q.sid = $iSurveyID
- AND q.parent_qid = 0
- AND " . concat("RIGHT(" . concat($zeros,'g.gid') . ",10)","RIGHT(". concat($zeros,'q.question_order') .",10)") ." >= $nextorder
- AND c.cqid IS NULL
- ORDER BY " . concat("RIGHT(" . concat($zeros,'g.gid') . ",10)","RIGHT(". concat($zeros,'q.question_order') .",10)");
-
-
- $QueryResult = Yii::app()->db->createCommand($Query)->query();
-
- $Row = $QueryResult->read();
- if ($Row)
- {
- if ($nextqid == $Row['qid'])
- return false;
- else
- return $Row['title'];
- }
- else
- return $qlang->gT("End");
-
+ return false;
}
/**
@@ -1518,14 +1464,14 @@ function groupGetXMLStructure($xml,$gid)
$platform = Yii::app()->db->getDriverName();
if ($platform == 'mssql' || $platform =='sqlsrv')
{
- $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value
+ $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value, qa.language
FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} and q.gid={$gid}
- where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000))";
+ where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000)), qa.language";
}
else {
- $query="SELECT qa.qid, qa.attribute, qa.value
+ $query="SELECT qa.qid, qa.attribute, qa.value, qa.language
FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} and q.gid={$gid}
- where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value";
+ where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value, qa.language";
}
buildXMLFromQuery($xml,$query,'question_attributes');
@@ -1551,25 +1497,14 @@ function questionExport($action, $iSurveyID, $gid, $qid)
$fn = "limesurvey_question_$qid.lsq";
$xml = getXMLWriter();
- if($action=='exportstructureLsrcCsvQuestion')
- {
- include_once(APPPATH.'/remotecontrol/lsrc.config.php');
- //Select title as Filename and save
- $question = Questions::model()->findByAttributes(array('sid' => $iSurveyID, 'gid' => $gid, 'qid' => $qid));
- $questionTitle = $question->title;
- $xml->openURI('remotecontrol/'.$queDir.substr($questionTitle,0,20).".lsq");
- }
- else
- {
- header("Content-Type: text/html/force-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: cache");
- // HTTP/1.0
- $xml->openURI('php://output');
- }
+ header("Content-Type: text/html/force-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: cache");
+ // HTTP/1.0
+ $xml->openURI('php://output');
$xml->setIndent(true);
$xml->startDocument('1.0', 'UTF-8');
@@ -1619,14 +1554,14 @@ function questionGetXMLStructure($xml,$gid,$qid)
$platform = Yii::app()->db->getDriverName();
if ($platform == 'mssql' || $platform =='sqlsrv')
{
- $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value
+ $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value, qa.language
FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} and q.qid={$qid}
- where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000))";
+ where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000)), qa.language";
}
else {
- $query="SELECT qa.qid, qa.attribute, qa.value
+ $query="SELECT qa.qid, qa.attribute, qa.value, qa.language
FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} and q.qid={$qid}
- where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value";
+ where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value, qa.language";
}
buildXMLFromQuery($xml,$query);
diff --git a/application/helpers/expressions/em_core_helper.php b/application/helpers/expressions/em_core_helper.php
index 2d1a82636ac..d37180f1830 100644
--- a/application/helpers/expressions/em_core_helper.php
+++ b/application/helpers/expressions/em_core_helper.php
@@ -29,7 +29,7 @@
class ExpressionManager {
// These are the allowable suffixes for variables - each represents an attribute of a variable.
- private static $RDP_regex_var_attr = 'code|gid|grelevance|gseq|jsName|mandatory|NAOK|qid|qseq|question|readWrite|relevanceStatus|relevance|rowdivid|sgqa|shown|type|valueNAOK|value';
+ static $RDP_regex_var_attr = 'code|gid|grelevance|gseq|jsName|mandatory|NAOK|qid|qseq|question|readWrite|relevanceStatus|relevance|rowdivid|sgqa|shown|type|valueNAOK|value';
// These three variables are effectively static once constructed
private $RDP_ExpressionRegex;
@@ -80,9 +80,9 @@ function __construct()
$RDP_regex_inc_dec = '\+\+|--';
$RDP_regex_binary = '[+*/-]';
$RDP_regex_compare = '<=|<|>=|>|==|!=|\ble\b|\blt\b|\bge\b|\bgt\b|\beq\b|\bne\b';
- $RDP_regex_assign = '=|\+=|-=|\*=|/=';
+ $RDP_regex_assign = '='; // '=|\+=|-=|\*=|/=';
$RDP_regex_sgqa = '(?:INSERTANS:)?[0-9]+X[0-9]+X[0-9]+[A-Z0-9_]*\#?[01]?(?:\.(?:' . ExpressionManager::$RDP_regex_var_attr . '))?';
- $RDP_regex_word = '(?:TOKEN:)?(?:[A-Z][A-Z0-9_]*)?(?:\.(?:' . ExpressionManager::$RDP_regex_var_attr . '))?';
+ $RDP_regex_word = '(?:TOKEN:)?(?:[A-Z][A-Z0-9_]*)?(?:\.(?:[A-Z][A-Z0-9_]*))*(?:\.(?:' . ExpressionManager::$RDP_regex_var_attr . '))?';
$RDP_regex_number = '[0-9]+\.?[0-9]*|\.[0-9]+';
$RDP_regex_andor = '\band\b|\bor\b|&&|\|\|';
$RDP_regex_lcb = '{';
@@ -163,6 +163,8 @@ function __construct()
'checkdate' => array('checkdate', 'checkdate', $this->gT('Returns true(1) if it is a valid date in gregorian calendar'), 'bool checkdate(month,day,year)', 'http://www.php.net/manual/en/function.checkdate.php', 3),
'cos' => array('cos', 'Math.cos', $this->gT('Cosine'), 'number cos(number)', 'http://www.php.net/manual/en/function.cos.php', 1),
'count' => array('exprmgr_count', 'LEMcount', $this->gT('Count the number of answered questions in the list'), 'number count(arg1, arg2, ... argN)', '', -1),
+'countif' => array('exprmgr_countif', 'LEMcountif', $this->gT('Count the number of answered questions in the list equal the first argument'), 'number countif(matches, arg1, arg2, ... argN)', '', -2),
+'countifop' => array('exprmgr_countifop', 'LEMcountifop', $this->gT('Count the number of answered questions in the list which pass the critiera (arg op value)'), 'number countifop(op, value, arg1, arg2, ... argN)', '', -3),
'date' => array('date', 'date', $this->gT('Format a local date/time'), 'string date(format [, timestamp=time()])', 'http://www.php.net/manual/en/function.date.php', 1,2),
'exp' => array('exp', 'Math.exp', $this->gT('Calculates the exponent of e'), 'number exp(number)', 'http://www.php.net/manual/en/function.exp.php', 1),
'fixnum' => array('exprmgr_fixnum', 'LEMfixnum', $this->gT('Display numbers with comma as decimal separator, if needed'), 'string fixnum(number)', '', 1),
@@ -221,6 +223,7 @@ function __construct()
'strtoupper' => array('strtoupper', 'LEMstrtoupper', $this->gT('Make a string uppercase'), 'string strtoupper(string)', 'http://www.php.net/manual/en/function.strtoupper.php', 1),
'substr' => array('substr', 'substr', $this->gT('Return part of a string'), 'string substr(string, start [, length])', 'http://www.php.net/manual/en/function.substr.php', 2,3),
'sum' => array('array_sum', 'LEMsum', $this->gT('Calculate the sum of values in an array'), 'number sum(arg1, arg2, ... argN)', '', -2),
+'sumifop' => array('exprmgr_sumifop', 'LEMsumifop', $this->gT('Sum the values of answered questions in the list which pass the critiera (arg op value)'), 'number sumifop(op, value, arg1, arg2, ... argN)', '', -3),
'tan' => array('tan', 'Math.tan', $this->gT('Tangent'), 'number tan(arg)', 'http://www.php.net/manual/en/function.tan.php', 1),
'time' => array('time', 'time', $this->gT('Return current UNIX timestamp'), 'number time()', 'http://www.php.net/manual/en/function.time.php', 0),
'trim' => array('trim', 'trim', $this->gT('Strip whitespace (or other characters) from the beginning and end of a string'), 'string trim(string [, charlist])', 'http://www.php.net/manual/en/function.trim.php', 1,2),
@@ -1310,7 +1313,10 @@ public function GetJavaScriptEquivalentOfExpression()
{
if (!preg_match("/^.*\.(NAOK|relevanceStatus)$/", $var))
{
- $nonNAvarsUsed[] = $var;
+ if ($this->GetVarAttribute($var,'jsName','') != '')
+ {
+ $nonNAvarsUsed[] = $var;
+ }
}
}
$mainClause = implode('', $stringParts);
@@ -1752,6 +1758,7 @@ public function ProcessBooleanExpression($expr,$groupSeq=-1,$questionSeq=-1)
$this->groupSeq = $groupSeq;
$this->questionSeq = $questionSeq;
+ $expr = $this->ExpandThisVar($expr);
$status = $this->RDP_Evaluate($expr);
if (!$status) {
return false; // if there are errors in the expression, hide it?
@@ -1820,6 +1827,7 @@ public function sProcessStringContainingExpressions($src, $questionNum=0, $numRe
$this->groupSeq = $groupSeq;
$result = $src;
$prettyPrint = '';
+ $errors = array();
for($i=1;$i<=$numRecursionLevels;++$i)
{
@@ -1829,8 +1837,10 @@ public function sProcessStringContainingExpressions($src, $questionNum=0, $numRe
{
$prettyPrint = $this->prettyPrintSource;
}
+ $errors = array_merge($errors, $this->RDP_errs);
}
$this->prettyPrintSource = $prettyPrint; // ensure that if doing recursive substition, can get original source to pretty print
+ $this->RDP_errs = $errors;
return $result;
}
@@ -1858,7 +1868,8 @@ public function sProcessStringContainingExpressionsHelper($src, $questionNum, $s
}
else {
++$this->substitutionNum;
- if ($this->RDP_Evaluate(substr($stringPart[0],1,-1)))
+ $expr = $this->ExpandThisVar(substr($stringPart[0],1,-1));
+ if ($this->RDP_Evaluate($expr))
{
$resolvedPart = $this->GetResult();
}
@@ -1886,7 +1897,7 @@ public function sProcessStringContainingExpressionsHelper($src, $questionNum, $s
'raw' => $stringPart[0],
'result' => $resolvedPart,
'vars' => implode('|',$jsVarsUsed),
- 'js' => $this->GetJavaScriptFunctionForReplacement($questionNum, $idName, substr($stringPart[0],1,-1)),
+ 'js' => $this->GetJavaScriptFunctionForReplacement($questionNum, $idName, $expr),
);
}
else
@@ -1901,6 +1912,30 @@ public function sProcessStringContainingExpressionsHelper($src, $questionNum, $s
return $result; // recurse in case there are nested ones, avoiding infinite loops?
}
+ /**
+ * If the equation contains refernece to this, expand to comma separated list if needed.
+ * @param type $eqn
+ */
+ function ExpandThisVar($src)
+ {
+ $splitter = '(?:\b(?:self|that))(?:\.(?:[A-Z0-9_]+))*';
+ $parts = preg_split("/(" . $splitter . ")/i",$src,-1,(PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE));
+ $result = '';
+ foreach ($parts as $part)
+ {
+ if (preg_match("/" . $splitter . "/",$part))
+ {
+ $result .= LimeExpressionManager::GetAllVarNamesForQ($this->questionSeq,$part);
+ }
+ else
+ {
+ $result .= $part;
+ }
+ }
+
+ return $result;
+ }
+
/**
* Get info about all elements needed for dynamic tailoring
* @return
@@ -3125,6 +3160,7 @@ static function UnitTestEvaluator()
$pre .= "\n\n";
print $pre;
@@ -3215,6 +3251,92 @@ function exprmgr_count($args)
return $j;
}
+/**
+ * Count the number of answered questions (non-empty) which match the first argument
+ * @param $args
+ * @return int
+ */
+function exprmgr_countif($args)
+{
+ $j=0; // keep track of how many non-null values seen
+ $match = array_shift($args);
+ foreach ($args as $arg)
+ {
+ if ($arg == $match) {
+ ++$j;
+ }
+ }
+ return $j;
+}
+
+/**
+ * Count the number of answered questions (non-empty) which meet the criteria (arg op value)
+ * @param $args
+ * @return int
+ */
+function exprmgr_countifop($args)
+{
+ $j=0;
+ $op = array_shift($args);
+ $value = array_shift($args);
+ foreach ($args as $arg)
+ {
+ switch($op)
+ {
+ case '==': case 'eq': if ($arg == $value) { ++$j; } break;
+ case '>=': case 'ge': if ($arg >= $value) { ++$j; } break;
+ case '>': case 'gt': if ($arg > $value) { ++$j; } break;
+ case '<=': case 'le': if ($arg <= $value) { ++$j; } break;
+ case '<': case 'lt': if ($arg < $value) { ++$j; } break;
+ case '!=': case 'ne': if ($arg != $value) { ++$j; } break;
+ case 'RX':
+ try {
+ if (@preg_match($value, $arg))
+ {
+ ++$j;
+ }
+ }
+ catch (Exception $e) { }
+ break;
+ }
+ }
+ return $j;
+}
+
+/**
+ * Sum of values of answered questions which meet the criteria (arg op value)
+ * @param $args
+ * @return int
+ */
+function exprmgr_sumifop($args)
+{
+ $result=0;
+ $op = array_shift($args);
+ $value = array_shift($args);
+ foreach ($args as $arg)
+ {
+ switch($op)
+ {
+ case '==': case 'eq': if ($arg == $value) { $result += $arg; } break;
+ case '>=': case 'ge': if ($arg >= $value) { $result += $arg; } break;
+ case '>': case 'gt': if ($arg > $value) { $result += $arg; } break;
+ case '<=': case 'le': if ($arg <= $value) { $result += $arg; } break;
+ case '<': case 'lt': if ($arg < $value) { $result += $arg; } break;
+ case '!=': case 'ne': if ($arg != $value) { $result += $arg; } break;
+ case 'RX':
+ try {
+ if (@preg_match($value, $arg))
+ {
+ $result += $arg;
+ }
+ }
+ catch (Exception $e) { }
+ break;
+ }
+ }
+ return $result;
+}
+
/**
* If $test is true, return $ok, else return $error
* @param $test
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
index 24f2531534b..e480fac0816 100644
--- a/application/helpers/expressions/em_manager_helper.php
+++ b/application/helpers/expressions/em_manager_helper.php
@@ -630,6 +630,11 @@ class LimeExpressionManager {
* @var type
*/
private $qid2exclusiveAuto = array();
+ /**
+ * Array of values to be updated
+ * @var type
+ */
+ private $updatedValues = array();
/**
* A private constructor; prevents direct creation of object
@@ -814,6 +819,7 @@ public static function ConvertConditionsToRelevance($surveyId=NULL, $qid=NULL)
$_qid = $row['qid'];
$_scenario = $row['scenario'];
$_cqid = $row['cqid'];
+ $_subqid = -1;
$relAndList = array();
$relOrList = array();
$scenarios = array();
@@ -830,24 +836,34 @@ public static function ConvertConditionsToRelevance($surveyId=NULL, $qid=NULL)
$relOrList = array();
$_scenario = $row['scenario'];
$_cqid = $row['cqid'];
+ $_subqid = -1;
}
if ($row['cqid'] != $_cqid)
{
$relAndList[] = '(' . implode(' or ', $relOrList) . ')';
$relOrList = array();
$_cqid = $row['cqid'];
+ $_subqid = -1;
}
// fix fieldnames
if ($row['class'] == '') {
$fieldname = substr($row['cfieldname'],1,-1); // {TOKEN:xxxx}
+ $subqid = $fieldname;
$value = $row['value'];
} else {
$q = createQuestion($row['class']);
$newrow = $q->prepareConditions($row);
$fieldname = $newrow['cfieldname'] . '.NAOK';
$value = $newrow['matchvalue'];
+ $subqid = $newrow['subqid'];
+ }
+ if ($_subqid != -1 && $_subqid != $subqid)
+ {
+ $relAndList[] = '(' . implode(' or ', $relOrList) . ')';
+ $relOrList = array();
}
+ $_subqid = $subqid;
// fix values
if (preg_match('/^@\d+X\d+X\d+.*@$/',$value)) {
@@ -874,7 +890,7 @@ public static function ConvertConditionsToRelevance($surveyId=NULL, $qid=NULL)
else
{
// Conditions uses ' ' to mean not answered, but internally it is really stored as ''. Fix this
- if ($value === '" "') {
+ if ($value === '" "' || $value == '""') {
if ($row['method'] == '==')
{
$relOrList[] = "is_empty(" . $fieldname . ")";
@@ -1049,7 +1065,24 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
$cascadedAFE = array_reverse($cascadedAFE);
$subqs = $qinfo['subqs'];
+ if ($type == 'R') {
+ $subqs = array();
+ foreach ($this->qans[$qinfo['qid']] as $k=>$v)
+ {
+ $_code = explode('~',$k);
+ $subqs[] = array(
+ 'rowdivid'=>$qinfo['sgqa'] . $_code[1],
+ 'sqsuffix'=>'_' . $_code[1],
+ );
+ }
+ }
+ $last_rowdivid = '--';
foreach ($subqs as $sq) {
+ if ($sq['rowdivid'] == $last_rowdivid)
+ {
+ continue;
+ }
+ $last_rowdivid = $sq['rowdivid'];
$af_names = array();
$afe_names = array();
switch ($type)
@@ -1067,46 +1100,129 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
case 'P': //Multiple choice with comments checkbox + text
case 'K': //MULTIPLE NUMERICAL QUESTION
case 'Q': //MULTIPLE SHORT TEXT
- if ($this->sgqaNaming)
- {
+// case 'R': //Ranking
+// if ($this->sgqaNaming)
+// {
foreach ($cascadedAF as $_caf)
{
$sgq = ((isset($this->qcode2sgq[$_caf])) ? $this->qcode2sgq[$_caf] : $_caf);
- $sgq .= substr($sq['sqsuffix'],1);
- if (isset($this->knownVars[$sgq]))
+ $fqid = explode('X',$sgq);
+ if (!isset($fqid[2]))
{
- $af_names[] = $sgq . '.NAOK';
+ continue;
}
+ $fqid = $fqid[2];
+ if ($this->q2subqInfo[$fqid]['type'] == 'R')
+ {
+ $rankables = array();
+ foreach ($this->qans[$fqid] as $k=>$v)
+ {
+ $rankable = explode('~',$k);
+ $rankables[] = '_' . $rankable[1];
}
- foreach ($cascadedAFE as $_cafe)
+ if (array_search($sq['sqsuffix'],$rankables) === false)
{
- $sgq = ((isset($this->qcode2sgq[$_cafe])) ? $this->qcode2sgq[$_cafe] : $_cafe);
- $sgq .= substr($sq['sqsuffix'],1);
- if (isset($this->knownVars[$sgq]))
+ continue;
+ }
+ }
+ $fsqs = array();
+ foreach ($this->q2subqInfo[$fqid]['subqs'] as $fsq)
{
- $afe_names[] = $sgq . '.NAOK';
+ if ($this->q2subqInfo[$fqid]['type'] == 'R')
+ {
+ // we know the suffix exists
+ $fsqs[] = '(' . $sgq . $fsq['csuffix'] . ".NAOK == '" . substr($sq['sqsuffix'],1) . "')";
}
+ else if ($this->q2subqInfo[$fqid]['type'] == ':' && isset($this->qattr[$fqid]['multiflexible_checkbox']) && $this->qattr[$fqid]['multiflexible_checkbox']=='1')
+ {
+ if ($fsq['sqsuffix'] == $sq['sqsuffix'])
+ {
+ $fsqs[] = $sgq . $fsq['csuffix'] . '.NAOK=="1"';
}
}
else
{
- foreach ($cascadedAF as $_caf)
+ if ($fsq['sqsuffix'] == $sq['sqsuffix'])
{
- $sgq = $_caf . $sq['sqsuffix'];
- if (isset($this->knownVars[$sgq]))
+ $fsqs[] = '!is_empty(' . $sgq . $fsq['csuffix'] . '.NAOK)';
+ }
+ }
+ }
+ if (count($fsqs) > 0)
{
- $af_names[] = $sgq . '.NAOK';
+ $af_names[] = '(' . implode(' or ', $fsqs) . ')';
}
}
foreach ($cascadedAFE as $_cafe)
{
- $sgq = $_cafe . $sq['sqsuffix'];
- if (isset($this->knownVars[$sgq]))
+ $sgq = ((isset($this->qcode2sgq[$_cafe])) ? $this->qcode2sgq[$_cafe] : $_cafe);
+ $fqid = explode('X',$sgq);
+ if (!isset($fqid[2]))
{
- $afe_names[] = $sgq . '.NAOK';
+ continue;
}
+ $fqid = $fqid[2];
+ if ($this->q2subqInfo[$fqid]['type'] == 'R')
+ {
+ $rankables = array();
+ foreach ($this->qans[$fqid] as $k=>$v)
+ {
+ $rankable = explode('~',$k);
+ $rankables[] = '_' . $rankable[1];
}
+ if (array_search($sq['sqsuffix'],$rankables) === false)
+ {
+ continue;
}
+ }
+ $fsqs = array();
+ foreach ($this->q2subqInfo[$fqid]['subqs'] as $fsq)
+ {
+ if ($this->q2subqInfo[$fqid]['type'] == 'R')
+ {
+ // we know the suffix exists
+ $fsqs[] = '(' . $sgq . $fsq['csuffix'] . ".NAOK != '" . substr($sq['sqsuffix'],1) . "')";
+ }
+ else if ($this->q2subqInfo[$fqid]['type'] == ':' && isset($this->qattr[$fqid]['multiflexible_checkbox']) && $this->qattr[$fqid]['multiflexible_checkbox']=='1')
+ {
+ if ($fsq['sqsuffix'] == $sq['sqsuffix'])
+ {
+ $fsqs[] = $sgq . $fsq['csuffix'] . '.NAOK!="1"';
+ }
+ }
+ else
+ {
+ if ($fsq['sqsuffix'] == $sq['sqsuffix'])
+ {
+ $fsqs[] = 'is_empty(' . $sgq . $fsq['csuffix'] . '.NAOK)';
+ }
+ }
+ }
+ if (count($fsqs) > 0)
+ {
+ $afe_names[] = '(' . implode(' and ', $fsqs) . ')';
+ }
+ }
+// }
+// else // TODO - implement qcode naming for this
+// {
+// foreach ($cascadedAF as $_caf)
+// {
+// $sgq = $_caf . $sq['sqsuffix'];
+// if (isset($this->knownVars[$sgq]))
+// {
+// $af_names[] = $sgq . '.NAOK';
+// }
+// }
+// foreach ($cascadedAFE as $_cafe)
+// {
+// $sgq = $_cafe . $sq['sqsuffix'];
+// if (isset($this->knownVars[$sgq]))
+// {
+// $afe_names[] = $sgq . '.NAOK';
+// }
+// }
+// }
break;
default:
break;
@@ -1118,7 +1234,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
$afs_eqn = '';
if (count($af_names) > 0)
{
- $afs_eqn .= implode(' != "" && ', $af_names) . ' != ""';
+ $afs_eqn .= implode(' && ', $af_names);
}
if (count($afe_names) > 0)
{
@@ -1126,7 +1242,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
{
$afs_eqn .= ' && ';
}
- $afs_eqn .= implode(' == "" && ', array_unique($afe_names)) . ' == ""';
+ $afs_eqn .= implode(' && ', $afe_names);
}
$subQrels[] = array(
@@ -1250,8 +1366,16 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
}
switch ($type)
{
+ case ':': //ARRAY (Multi Flexi) 1 to 10
+ case 'A': //ARRAY (5 POINT CHOICE) radio-buttons
+ case 'B': //ARRAY (10 POINT CHOICE) radio-buttons
+ case 'C': //ARRAY (YES/UNCERTAIN/NO) radio-buttons
+ case 'E': //ARRAY (Increase/Same/Decrease) radio-buttons
+ case 'F': //ARRAY (Flexible) - Row Format
case 'M': //Multiple choice checkbox
case 'P': //Multiple choice with comments checkbox + text
+ case 'K': //MULTIPLE NUMERICAL QUESTION
+ case 'Q': //MULTIPLE SHORT TEXT
if ($this->sgqaNaming)
{
$sq_name = $qinfo['sgqa'] . trim($exclusive_option) . '.NAOK';
@@ -1269,7 +1393,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
'qtype' => $type,
'type' => 'exclude_all_others',
'rowdivid' => $sq['rowdivid'],
- 'eqn' => '(' . $sq_name . ' == "")',
+ 'eqn' => 'is_empty(' . $sq_name . ')',
'qid' => $questionNum,
'sgqa' => $qinfo['sgqa'],
);
@@ -1298,6 +1422,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
switch ($type)
{
case 'M': //Multiple choice checkbox
+ case 'P': //Multiple choice with comments checkbox + text
if ($this->sgqaNaming)
{
$sq_name = substr($sq['jsVarName'],4);
@@ -1325,7 +1450,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
if (count($sq_names) > 0) {
$relpart = "sum(" . implode(".relevanceStatus, ", $sq_names) . ".relevanceStatus)";
$checkedpart = "count(" . implode(".NAOK, ", $sq_names) . ".NAOK)";
- $eoRelevantAndUnchecked = "(" . $eoVarName . ".relevanceStatus && " . $eoVarName . "=='')";
+ $eoRelevantAndUnchecked = "(" . $eoVarName . ".relevanceStatus && is_empty(" . $eoVarName . "))";
$eoEqn = "(" . $eoRelevantAndUnchecked . " && (" . $relpart . " == " . $checkedpart . "))";
$this->em->ProcessBooleanExpression($eoEqn, $qinfo['gseq'], $qinfo['qseq']);
@@ -1391,6 +1516,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
case 'K': //MULTIPLE NUMERICAL QUESTION
case 'Q': //MULTIPLE SHORT TEXT
case 'M': //Multiple choice checkbox
+ case 'R': //RANKING STYLE
if ($this->sgqaNaming)
{
$sq_name = substr($sq['jsVarName'],4) . '.NAOK';
@@ -1412,10 +1538,6 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
}
}
break;
- case 'R': //RANKING STYLE
- // TODO - does not have sub-questions, so how should this be done?
- // Current JavaScript works fine, but can't use expression value
- break;
default:
break;
}
@@ -1432,7 +1554,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
'qtype' => $type,
'type' => 'min_answers',
'class' => 'num_answers',
- 'eqn' => '(count(' . implode(', ', $sq_names) . ') >= (' . $min_answers . '))',
+ 'eqn' => 'if(is_empty('.$min_answers.'),1,(count(' . implode(', ', $sq_names) . ') >= (' . $min_answers . ')))',
'qid' => $questionNum,
);
}
@@ -1480,6 +1602,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
case 'K': //MULTIPLE NUMERICAL QUESTION
case 'Q': //MULTIPLE SHORT TEXT
case 'M': //Multiple choice checkbox
+ case 'R': //RANKING STYLE
if ($this->sgqaNaming)
{
$sq_name = substr($sq['jsVarName'],4) . '.NAOK';
@@ -1501,10 +1624,6 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
}
}
break;
- case 'R': //RANKING STYLE
- // TODO - does not have sub-questions, so how should this be done?
- // Current JavaScript works fine, but can't use expression value
- break;
default:
break;
}
@@ -1521,7 +1640,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
'qtype' => $type,
'type' => 'max_answers',
'class' => 'num_answers',
- 'eqn' => '(count(' . implode(', ', $sq_names) . ') <= (' . $max_answers . '))',
+ 'eqn' => '(if(is_empty('.$max_answers.'),1,count(' . implode(', ', $sq_names) . ') <= (' . $max_answers . ')))',
'qid' => $questionNum,
);
}
@@ -2005,13 +2124,12 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
$sgqa = $qinfo['sgqa'];
switch ($type)
{
- // TODO oddly, the other field has value of 0 when empty instead of "", so cheating and looking for strlen > 1
case '!': //List - dropdown
case 'L': //LIST drop-down/radio-button list
- $eqn = "(" . $sgqa . ".NAOK!='-oth-' || (" . $sgqa . ".NAOK=='-oth-' && strlen(trim(" . $sgqa . "other.NAOK))>1))";
+ $eqn = "(" . $sgqa . ".NAOK!='-oth-' || (" . $sgqa . ".NAOK=='-oth-' && !is_empty(trim(" . $sgqa . "other.NAOK))))";
break;
case 'P': //Multiple choice with comments checkbox + text
- $eqn = "(is_empty(trim(" . $sgqa . "other.NAOK)) || (!is_empty(trim(" . $sgqa . "other.NAOK)) && strlen(trim(" . $sgqa . "othercomment.NAOK))>1))";
+ $eqn = "(is_empty(trim(" . $sgqa . "other.NAOK)) || (!is_empty(trim(" . $sgqa . "other.NAOK)) && !is_empty(trim(" . $sgqa . "othercomment.NAOK))))";
break;
default:
break;
@@ -2159,11 +2277,19 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
$sq_name = NULL;
switch ($type)
{
+ case 'A': //ARRAY (5 POINT CHOICE) radio-buttons
+ case 'B': //ARRAY (10 POINT CHOICE) radio-buttons
+ case 'C': //ARRAY (YES/UNCERTAIN/NO) radio-buttons
+ case 'E': //ARRAY (Increase/Same/Decrease) radio-buttons
+ case 'F': //ARRAY (Flexible) - Row Format
case 'K': //MULTIPLE NUMERICAL QUESTION
case 'Q': //MULTIPLE SHORT TEXT
case ';': //ARRAY (Multi Flexi) Text
case ':': //ARRAY (Multi Flexi) 1 to 10
+ case 'M': //Multiple choice checkbox
case 'N': //NUMERICAL QUESTION TYPE
+ case 'P': //Multiple choice with comments checkbox + text
+ case 'R': //RANKING STYLE
case 'S': //SHORT FREE TEXT
case 'T': //LONG FREE TEXT
case 'U': //HUGE FREE TEXT
@@ -2776,7 +2902,7 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
}
$this->qid2code[$questionNum] = $codeList;
- $readWrite = 'N';
+ $readWrite = 'Y';
$ansArray = $q->getAnswerArray($this);
@@ -2846,7 +2972,7 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
$varName = $q->title . '_' . $q->aid;
$question = $q->sq;
// $question = $q->text . ': ' . $q->sq;
- if ($type != 'H' && $type != 'R') {
+ if ($type != 'H') {
if ($type == 'P' && preg_match("/comment$/", $sgqa)) {
// $rowdivid = substr($sgqa,0,-7);
}
@@ -2901,7 +3027,7 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
switch($type)
{
case 'R': //RANKING STYLE
- $jsVarName_on = 'fvalue_' . $fieldNameParts[2];
+ $jsVarName_on = 'answer' . $sgqa;
$jsVarName = 'java' . $sgqa;
break;
case 'D': //DATE
@@ -3577,6 +3703,133 @@ static function GetLastPrettyPrintExpression()
return $LEM->em->GetLastPrettyPrintExpression();
}
+ /**
+ * Expand "self.suffix" and "that.qcode.suffix" into canonical list of variable names
+ * @param type $qseq
+ * @param type $varname
+ */
+ static function GetAllVarNamesForQ($qseq,$varname)
+ {
+ $LEM =& LimeExpressionManager::singleton();
+
+ $parts = explode('.',$varname);
+ $qroot = '';
+ $suffix = '';
+ $sqpatts = array();
+ $nosqpatts = array();
+ $sqpatt = '';
+ $nosqpatt = '';
+ $comments = '';
+
+ if ($parts[0] == 'self')
+ {
+ $type = 'self';
+ }
+ else
+ {
+ $type = 'that';
+ array_shift($parts);
+ if (isset($parts[0]))
+ {
+ $qroot = $parts[0];
+ }
+ else
+ {
+ return $varname;
+ }
+ }
+ array_shift($parts);
+
+ if (count($parts) > 0)
+ {
+ if (preg_match('/^' . ExpressionManager::$RDP_regex_var_attr . '$/',$parts[count($parts)-1]))
+ {
+ $suffix = '.' . $parts[count($parts)-1];
+ array_pop($parts);
+ }
+ }
+
+ foreach($parts as $part)
+ {
+ if ($part == 'nocomments')
+ {
+ $comments = 'N';
+ }
+ else if ($part == 'comments')
+ {
+ $comments = 'Y';
+ }
+ else if (preg_match('/^sq_.+$/',$part))
+ {
+ $sqpatts[] = substr($part,3);
+ }
+ else if (preg_match('/^nosq_.+$/',$part))
+ {
+ $nosqpatts[] = substr($part,5);
+ }
+ else
+ {
+ return $varname; // invalid
+ }
+ }
+ $sqpatt = implode('|',$sqpatts);
+ $nosqpatt = implode('|',$nosqpatts);
+ $vars = array();
+
+ foreach ($LEM->knownVars as $kv)
+ {
+ if ($type == 'self')
+ {
+ if (!isset($kv['qseq']) || $kv['qseq'] != $qseq || trim($kv['sgqa']) == '')
+ {
+ continue;
+ }
+ }
+ else
+ {
+ if (!isset($kv['rootVarName']) || $kv['rootVarName'] != $qroot)
+ {
+ continue;
+ }
+ }
+ if ($comments != '')
+ {
+ if ($comments == 'Y' && !preg_match('/comment$/',$kv['sgqa']))
+ {
+ continue;
+ }
+ if ($comments == 'N' && preg_match('/comment$/',$kv['sgqa']))
+ {
+ continue;
+ }
+ }
+ $sgq = $LEM->sid . 'X' . $kv['gid'] . 'X' . $kv['qid'];
+ $ext = substr($kv['sgqa'],strlen($sgq));
+
+ if ($sqpatt != '')
+ {
+ if (!preg_match('/'.$sqpatt.'/',$ext))
+ {
+ continue;
+ }
+ }
+ if ($nosqpatt != '')
+ {
+ if (preg_match('/'.$nosqpatt.'/',$ext))
+ {
+ continue;
+ }
+ }
+
+ $vars[] = $kv['sgqa'] . $suffix;
+ }
+ if (count($vars) > 0)
+ {
+ return implode(',',$vars);
+ }
+ return $varname; // invalid
+ }
+
/**
* Should be first function called on each page - sets/clears internally needed variables
* @param $allOnOnePage - true if StartProcessingGroup will be called multiple times on this page - does some optimizatinos
@@ -3594,6 +3847,11 @@ static function StartProcessingPage($allOnOnePage=false,$initializeVars=false)
$LEM->surveyOptions['hyperlinkSyntaxHighlighting']=true; // this will be temporary - should be reset in running survey
$LEM->qid2exclusiveAuto=array();
+ $surveyinfo = (isset($LEM->sid) ? getSurveyInfo($LEM->sid) : null);
+ if (isset($surveyinfo['assessments']) && $surveyinfo['assessments']=='Y')
+ {
+ $LEM->surveyOptions['assessments']=true;
+ }
// $LEM->runtimeTimings[] = array(__METHOD__,(microtime(true) - $now));
$LEM->initialized=true;
@@ -3673,8 +3931,63 @@ static function StartSurvey($surveyid,$surveyMode='group',$options=NULL,$forceRe
if (isset($_SESSION[$LEM->sessid]['startingValues']) && is_array($_SESSION[$LEM->sessid]['startingValues']) && count($_SESSION[$LEM->sessid]['startingValues']) > 0)
{
- $startingValues = $_SESSION[$LEM->sessid]['startingValues'];
- $LEM->_UpdateValuesInDatabase($startingValues);
+ $startingValues = array();
+ foreach ($_SESSION[$LEM->sessid]['startingValues'] as $k=>$value)
+ {
+ if (isset($LEM->knownVars[$k]))
+ {
+ $knownVar = $LEM->knownVars[$k];
+ }
+ else if (isset($LEM->qcode2sgqa[$k]))
+ {
+ $knownVar = $LEM->knownVars[$LEM->qcode2sgqa[$k]];
+ }
+ else if (isset($LEM->tempVars[$k]))
+ {
+ $knownVar = $LEM->tempVar[$k];
+ }
+ else
+ {
+ continue;
+ }
+ if (!isset($knownVar['jsName']))
+ {
+ continue;
+ }
+ switch ($knownVar['type'])
+ {
+ case 'D': //DATE
+ if (trim($value)=="")
+ {
+ $value = NULL;
+ }
+ else
+ {
+ $dateformatdatat=getDateFormatData($LEM->surveyOptions['surveyls_dateformat']);
+ $datetimeobj = new Date_Time_Converter($value, $dateformatdatat['phpdate']);
+ $value=$datetimeobj->convert("Y-m-d");
+ }
+ break;
+ case 'N': //NUMERICAL QUESTION TYPE
+ case 'K': //MULTIPLE NUMERICAL QUESTION
+ if (trim($value)=="") {
+ $value = NULL;
+ }
+ else {
+ $value = sanitize_float($value);
+ }
+ break;
+ case '|': //File Upload
+ $value=NULL; // can't upload a file via GET
+ break;
+ }
+ $_SESSION[$LEM->sessid][$knownVar['sgqa']] = $value;
+ $LEM->updatedValues[$knownVar['sgqa']]=array(
+ 'type'=>$knownVar['type'],
+ 'value'=>$value,
+ );
+ }
+ $LEM->_UpdateValuesInDatabase(NULL);
}
return array(
@@ -3689,6 +4002,7 @@ static function NavigateBackwards()
$LEM =& LimeExpressionManager::singleton();
$LEM->ParseResultCache=array(); // to avoid running same test more than once for a given group
+ $LEM->updatedValues = array();
switch ($LEM->surveyMode)
{
@@ -3821,6 +4135,7 @@ static function NavigateForwards($force=false) {
$LEM =& LimeExpressionManager::singleton();
$LEM->ParseResultCache=array(); // to avoid running same test more than once for a given group
+ $LEM->updatedValues = array();
switch ($LEM->surveyMode)
{
@@ -4038,6 +4353,9 @@ static function NavigateForwards($force=false) {
*/
private function _UpdateValuesInDatabase($updatedValues, $finished=false)
{
+ // TODO - now that using $this->updatedValues, may be able to remove local copies of it (unless needed by other sub-systems)
+ $updatedValues = $this->updatedValues;
+
$message = '';
$_SESSION[$this->sessid]['datestamp']=dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", $this->surveyOptions['timeadjust']);
if ($this->surveyOptions['active'] && !isset($_SESSION[$this->sessid]['srid']))
@@ -4142,6 +4460,12 @@ private function _UpdateValuesInDatabase($updatedValues, $finished=false)
}
// otherwise will already be in yyyy-mm-dd format after ProcessCurrentResponses()
break;
+ case '|': //File upload
+ // This block can be removed once we require 5.3 or later
+ if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
+ $val=addslashes($val);
+ }
+ break;
case 'N': //NUMERICAL QUESTION TYPE
case 'K': //MULTIPLE NUMERICAL QUESTION
if (trim($val)=='') {
@@ -4270,6 +4594,7 @@ static function JumpTo($seq,$preview=false,$processPOST=true,$force=false,$chang
}
$LEM->ParseResultCache=array(); // to avoid running same test more than once for a given group
+ $LEM->updatedValues = array();
--$seq; // convert to 0-based numbering
switch ($LEM->surveyMode)
@@ -4380,8 +4705,10 @@ static function JumpTo($seq,$preview=false,$processPOST=true,$force=false,$chang
else
{
// display new group
+ if(!$preview){ // Save only if not in preview mode
$message .= $LEM->_UpdateValuesInDatabase($updatedValues,false);
$LEM->runtimeTimings[] = array(__METHOD__,(microtime(true) - $now));
+ }
$LEM->lastMoveResult = array(
'finished'=>false,
'message'=>$message,
@@ -5362,6 +5689,7 @@ function _ValidateQuestion($questionSeq)
{
$_SESSION[$LEM->sessid][$sgqa] = NULL;
$updatedValues[$sgqa] = NULL;
+ $LEM->updatedValues[$sgqa] = NULL;
}
}
else if ($qInfo['type'] == '*')
@@ -5371,10 +5699,13 @@ function _ValidateQuestion($questionSeq)
$sgqa = $LEM->qid2code[$qid]; // there will be only one, since Equation
// Store the result of the Equation in the SESSION
$_SESSION[$LEM->sessid][$sgqa] = $result;
- $updatedValues[$sgqa] = array(
+ $_update = array(
'type'=>'*',
'value'=>$result,
);
+ $updatedValues[$sgqa] = $_update;
+ $LEM->updatedValues[$sgqa] = $_update;
+
if (($LEM->debugLevel & LEM_DEBUG_VALIDATION_DETAIL) == LEM_DEBUG_VALIDATION_DETAIL)
{
$prettyPrintEqn = $LEM->em->GetPrettyPrintString();
@@ -5386,6 +5717,7 @@ function _ValidateQuestion($questionSeq)
// NULL irrelevant sub-questions
$_SESSION[$LEM->sessid][$sq] = NULL;
$updatedValues[$sq] = NULL;
+ $LEM->updatedValues[$sq]= NULL;
}
// Regardless of whether relevant or hidden, if there is a default value and $_SESSION[$LEM->sessid][$sgqa] is NULL, then use the default value in $_SESSION, but don't write to database
@@ -5787,14 +6119,14 @@ static function GetRelevanceAndTailoringJavaScript()
$relChangeVars[] = " relChange" . $arg['qid'] . "=false;\n"; // detect change in relevance status
- if (($relevance == '' || $relevance == '1') && count($tailorParts) == 0 && count($subqParts) == 0 && count($subqValidations) == 0 && count($validationEqns) == 0)
+ if (($relevance == '' || $relevance == '1' || ($arg['result'] == true && $arg['numJsVars']==0)) && count($tailorParts) == 0 && count($subqParts) == 0 && count($subqValidations) == 0 && count($validationEqns) == 0)
{
// Only show constitutively true relevances if there is tailoring that should be done.
$relParts[] = "$('#relevance" . $arg['qid'] . "').val('1'); // always true\n";
$GalwaysRelevant[$arg['gseq']] = true;
continue;
}
- $relevance = ($relevance == '') ? '1' : $relevance;
+ $relevance = ($relevance == '' || ($arg['result'] == true && $arg['numJsVars']==0)) ? '1' : $relevance;
$relParts[] = "\nif (" . $relevance . ")\n{\n";
////////////////////////////////////////////////////////////////////////
// DO ALL ARRAY FILTERING FIRST - MAY AFFECT VALIDATION AND TAILORING //
@@ -5805,6 +6137,7 @@ static function GetRelevanceAndTailoringJavaScript()
* $afHide - if true, then use jQuery.show(). If false, then disable/enable the row
*/
$afHide = (isset($LEM->qattr[$arg['qid']]['array_filter_style']) ? ($LEM->qattr[$arg['qid']]['array_filter_style'] == '0') : true);
+ $inputSelector = (($arg['type'] == 'R') ? '' : ' :input:not(:hidden)');
foreach ($subqParts as $sq)
{
$rowdividList[$sq['rowdivid']] = $sq['result'];
@@ -5816,15 +6149,15 @@ static function GetRelevanceAndTailoringJavaScript()
}
else
{
- $relParts[] = " $('#javatbd" . $sq['rowdivid'] . " :input:not(:hidden)').removeAttr('disabled');\n";
+ $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "$inputSelector').removeAttr('disabled');\n";
}
if ($sq['isExclusiveJS'] != '')
{
$relParts[] = " if ( " . $sq['isExclusiveJS'] . " ) {\n";
- $relParts[] = " $('#javatbd" . $sq['rowdivid'] . " :input:not(:hidden)').attr('disabled','disabled');\n";
+ $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "$inputSelector').attr('disabled','disabled');\n";
$relParts[] = " }\n";
$relParts[] = " else {\n";
- $relParts[] = " $('#javatbd" . $sq['rowdivid'] . " :input:not(:hidden)').removeAttr('disabled');\n";
+ $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "$inputSelector').removeAttr('disabled');\n";
$relParts[] = " }\n";
}
$relParts[] = " relChange" . $arg['qid'] . "=true;\n";
@@ -5835,23 +6168,23 @@ static function GetRelevanceAndTailoringJavaScript()
if ($sq['irrelevantAndExclusiveJS'] != '')
{
$relParts[] = " if ( " . $sq['irrelevantAndExclusiveJS'] . " ) {\n";
- $relParts[] = " $('#javatbd" . $sq['rowdivid'] . " :input:not(:hidden)').attr('disabled','disabled');\n";
+ $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "$inputSelector').attr('disabled','disabled');\n";
$relParts[] = " }\n";
$relParts[] = " else {\n";
- $relParts[] = " $('#javatbd" . $sq['rowdivid'] . " :input:not(:hidden)').removeAttr('disabled');\n";
+ $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "$inputSelector').removeAttr('disabled');\n";
if ($afHide)
{
$relParts[] = " $('#javatbd" . $sq['rowdivid'] . "').hide();\n";
}
else
{
- $relParts[] = " $('#javatbd" . $sq['rowdivid'] . " :input:not(:hidden)').attr('disabled','disabled');\n";
+ $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "$inputSelector').attr('disabled','disabled');\n";
}
$relParts[] = " }\n";
}
else
{
- $relParts[] = " $('#javatbd" . $sq['rowdivid'] . " :input:not(:hidden)').attr('disabled','disabled');\n";
+ $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "$inputSelector').attr('disabled','disabled');\n";
}
}
else
@@ -5862,7 +6195,7 @@ static function GetRelevanceAndTailoringJavaScript()
}
else
{
- $relParts[] = " $('#javatbd" . $sq['rowdivid'] . " :input:not(:hidden)').attr('disabled','disabled');\n";
+ $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "$inputSelector').attr('disabled','disabled');\n";
}
}
$relParts[] = " relChange" . $arg['qid'] . "=true;\n";
@@ -5902,7 +6235,7 @@ static function GetRelevanceAndTailoringJavaScript()
if ($_veq['subqValidSelector'] == '') {
continue;
}
- $isValid = $LEM->em->ProcessBooleanExpression($_veq['subqValidEqn']);
+ $isValid = $LEM->em->ProcessBooleanExpression($_veq['subqValidEqn'],$arg['gseq'],$LEM->questionId2questionSeq[$arg['qid']]);
$_sqValidVars = $LEM->em->GetJSVarsUsed();
$allJsVarsUsed = array_merge($allJsVarsUsed,$_sqValidVars);
$valJsVarsUsed = array_merge($valJsVarsUsed,$_sqValidVars);
@@ -5941,7 +6274,7 @@ static function GetRelevanceAndTailoringJavaScript()
$_hasOtherValidation = true;
}
- $_isValid = $LEM->em->ProcessBooleanExpression($validationEqn);
+ $_isValid = $LEM->em->ProcessBooleanExpression($validationEqn,$arg['gseq'],$LEM->questionId2questionSeq[$arg['qid']]);
$_vars = $LEM->em->GetJSVarsUsed();
$allJsVarsUsed = array_merge($allJsVarsUsed,$_vars);
$valJsVarsUsed = array_merge($valJsVarsUsed,$_vars);
@@ -6042,7 +6375,7 @@ static function GetRelevanceAndTailoringJavaScript()
$relParts[] = " $('#question" . $arg['qid'] . "').hide();\n";
}
else {
- if (!($relevance == '' || $relevance == '1'))
+ if (!($relevance == '' || $relevance == '1' || ($arg['result'] == true && $arg['numJsVars']==0)))
{
// In such cases, PHP will make the question visible by default. By not forcing a re-show(), template.js can hide questions with impunity
$relParts[] = " $('#question" . $arg['qid'] . "').show();\n";
@@ -6070,7 +6403,7 @@ static function GetRelevanceAndTailoringJavaScript()
$relParts[] = " $('#relevance" . $arg['qid'] . "').val('1');\n";
$relParts[] = "}\n";
- if (!($relevance == '' || $relevance == '1'))
+ if (!($relevance == '' || $relevance == '1' || ($arg['result'] == true && $arg['numJsVars']==0)))
{
if (!isset($dynamicQinG[$arg['gseq']]))
{
@@ -6356,6 +6689,34 @@ static function GetRelevanceAndTailoringJavaScript()
foreach ($undeclaredJsVars as $jsVar)
{
// TODO - is different type needed for text? Or process value to striphtml?
+ if ($jsVar == '') continue;
+ $jsParts[] = "\n";
+ }
+ }
+ else
+ {
+ // For all-in-one mode, declare the always-hidden variables, since qanda will not be called for them.
+ foreach ($LEM->knownVars as $key=>$knownVar)
+ {
+ if (!is_numeric($key[0])) {
+ continue;
+ }
+ if ($knownVar['jsName'] == '') {
+ continue;
+ }
+ if ($knownVar['hidden'])
+ {
+ $jsVar = $knownVar['jsName'];
+ $undeclaredJsVars[] = $jsVar;
+ $sgqa = $knownVar['sgqa'];
+ $codeValue = (isset($_SESSION[$LEM->sessid][$sgqa])) ? $_SESSION[$LEM->sessid][$sgqa] : '';
+ $undeclaredVal[$jsVar] = $codeValue;
+ }
+ }
+
+ $undeclaredJsVars = array_unique($undeclaredJsVars);
+ foreach ($undeclaredJsVars as $jsVar)
+ {
if ($jsVar == '') continue;
$jsParts[] = "\n";
}
@@ -6745,7 +7106,7 @@ public function gT($string)
// eventually replace this with i8n
if (isset(Yii::app()->lang))
{
- return Yii::app()->lang->gT($string);
+ return htmlspecialchars(Yii::app()->lang->gT($string),ENT_QUOTES);
}
else
{
@@ -6802,8 +7163,17 @@ private static function getConditionsForEM($surveyid=NULL, $qid=NULL)
." from {{conditions}} as c"
.", {{questions}} as q"
." where ". $where
- ." c.cqid = 0 and c.qid = q.qid"
- ." order by sid, qid, scenario, cqid, cfieldname, value";
+ ." c.cqid = 0 and c.qid = q.qid";
+
+ $databasetype = Yii::app()->db->getDriverName();
+ if ($databasetype=='mssql')
+ {
+ $query .= " order by sid, c.qid, scenario, cqid, cfieldname, value";
+ }
+ else
+ {
+ $query .= " order by sid, qid, scenario, cqid, cfieldname, value";
+ }
$data = dbExecuteAssoc($query);
@@ -6891,7 +7261,7 @@ private function getQuestionAttributesForEM($surveyid=NULL,$qid=NULL, $lang=NULL
$databasetype = Yii::app()->db->getDriverName();
if ($databasetype=='mssql' || $databasetype=="sqlsrv")
{
- $query = "select distinct a.qid, a.attribute, CAST(a.value as varchar) as value";
+ $query = "select distinct a.qid, a.attribute, CAST(a.value as varchar(max)) as value";
}
else
{
@@ -7035,7 +7405,7 @@ static function ProcessCurrentResponses()
$type = $qinfo['info']['type'];
if ($relevant && $grelevant && $sqrelevant)
{
- if ($qinfo['info']['hidden'])
+ if ($qinfo['info']['hidden'] && !isset($_POST[$sq]))
{
$value = (isset($_SESSION['survey_'.$LEM->sessid][$sq]) ? $_SESSION['survey_'.$LEM->sessid][$sq] : ''); // if always hidden, use the default value, if any
}
@@ -7107,18 +7477,22 @@ static function ProcessCurrentResponses()
break;
}
$_SESSION[$LEM->sessid][$sq] = $value;
- $updatedValues[$sq] = array (
+ $_update = array (
'type'=>$type,
'value'=>$value,
);
+ $updatedValues[$sq] = $_update;
+ $LEM->updatedValues[$sq] = $_update;
}
else { // irrelevant, so database will be NULLed separately
// Must unset the value, rather than setting to '', so that EM can re-use the default value as needed.
unset($_SESSION[$LEM->sessid][$sq]);
- $updatedValues[$sq] = array (
+ $_update = array (
'type'=>$type,
'value'=>NULL,
);
+ $updatedValues[$sq] = $_update;
+ $LEM->updatedValues[$sq] = $_update;
}
}
}
@@ -7443,38 +7817,61 @@ public static function SetVariableValue($op,$name,$value)
$LEM->tempVars[$name]['code'] -= $value;
break;
}
- return $LEM->tempVars[$name]['code'];
+ $_result = $LEM->tempVars[$name]['code'];
+ $_SESSION[$LEM->sessid][$name] = $_result;
+ $LEM->updatedValues[$name] = array(
+ 'type'=>'*',
+ 'value'=>$_result,
+ );
+ return $_result;
}
else
{
- if (isset($LEM->knownVars[$name]))
+ if (!isset($LEM->knownVars[$name]))
{
- $vname = $name;
+ if (isset($LEM->qcode2sgqa[$name]))
+ {
+ $name = $LEM->qcode2sgqa[$name];
}
- else if (isset($LEM->qcode2sgqa[$name]))
+ else
{
- $vname = $LEM->qcode2sgqa[$name];
+ return ''; // shouldn't happen
}
+ }
+ if (isset($_SESSION[$LEM->sessid][$name]))
+ {
+ $_result = $_SESSION[$LEM->sessid][$name];
+ }
+ else
+ {
+ $_result = (isset($LEM->knownVars[$name]['default']) ? $LEM->knownVars[$name]['default'] : 0);
+ }
switch($op)
{
case '=':
- $LEM->knownVars[$name]['code'] = $value;
+ $_result = $value;
break;
case '*=':
- $LEM->knownVars[$name]['code'] *= $value;
+ $_result *= $value;
break;
case '/=':
- $LEM->knownVars[$name]['code'] /= $value;
+ $_result /= $value;
break;
case '+=':
- $LEM->knownVars[$name]['code'] += $value;
+ $_result += $value;
break;
case '-=':
- $LEM->knownVars[$name]['code'] -= $value;
+ $_result -= $value;
break;
}
- return $LEM->knownVars[$name]['code'];
+ $_SESSION[$LEM->sessid][$name] = $_result;
+ $_type = $LEM->knownVars[$name]['type'];
+ $LEM->updatedValues[$name] = array(
+ 'type'=>$_type,
+ 'value'=>$_result,
+ );
+ return $_result;
}
}
@@ -7498,6 +7895,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
$LEM =& LimeExpressionManager::singleton();
$allErrors = array();
+ $warnings = 0;
$surveyOptions = array(
'assessments'=>$assessments,
@@ -7529,8 +7927,6 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
$qtypes=getQuestionTypeList();
- templatereplace('{SITENAME}'); // to ensure that lime replacement fields loaded
-
if (is_null($moveResult) || is_null($LEM->currentQset) || count($LEM->currentQset) == 0) {
return array(
'errors'=>1,
@@ -7538,8 +7934,43 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
);
}
- $out = "
"
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
index 244b8a896de..f0def20c90e 100644
--- a/application/helpers/update/updatedb_helper.php
+++ b/application/helpers/update/updatedb_helper.php
@@ -21,36 +21,16 @@ function db_upgrade_all($oldversion) {
/// This function does anything necessary to upgrade
/// older versions to match current functionality
global $modifyoutput, $usertemplaterootdir, $standardtemplaterootdir;
+ Yii::app()->loadHelper('database');
+
$usertemplaterootdir = Yii::app()->getConfig('usertemplaterootdir');
$standardtemplaterootdir = Yii::app()->getConfig('standardtemplaterootdir');
$clang = Yii::app()->lang;
echo str_pad($clang->gT('The LimeSurvey database is being upgraded').' ('.date('Y-m-d H:i:s').')',14096).".
". $clang->gT('Please be patient...')."
\n";
- $sDBDriverName=Yii::app()->db->getDriverName();
- if ($sDBDriverName=='mysqli') $sDBDriverName='mysql';
- if ($sDBDriverName=='sqlsrv') $sDBDriverName='mssql';
-
- // Special customization because Yii is too limited to handle a varchar field of a length other than 255 in a cross-DB compatible way
- // see http://www.yiiframework.com/forum/index.php/topic/32289-cross-db-compatible-varchar-field-length-definitions/
- // and http://github.com/yiisoft/yii/issues/765
- if ($sDBDriverName=='pgsql')
- {
- Yii::app()->setConfig('char',$sChar='character');
- Yii::app()->setConfig('varchar',$sVarchar='character varying');
- Yii::app()->setConfig('autoincrement', $sAutoIncrement='serial');
- }
- elseif ($sDBDriverName=='mssql')
- {
- Yii::app()->setConfig('char',$sChar='char');
- Yii::app()->setConfig('varchar',$sVarchar='varchar');
- Yii::app()->setConfig('autoincrement', $sAutoIncrement='integer NOT NULL IDENTITY (1,1)');
- }
- else
- {
- Yii::app()->setConfig('char',$sChar='char');
- Yii::app()->setConfig('varchar',$sVarchar='varchar');
- Yii::app()->setConfig('autoincrement', $sAutoIncrement='int(11) NOT NULL AUTO_INCREMENT');
- }
+ $sDBDriverName=setsDBDriverName();
+ setVarchar($sDBDriverName);
+ $sVarchar = Yii::app()->getConfig('varchar');
if ($oldversion < 111)
{
@@ -998,8 +978,24 @@ function db_upgrade_all($oldversion) {
LimeExpressionManager::UpgradeConditionsToRelevance();
Yii::app()->db->createCommand()->update('{{settings_global}}',array('stg_value'=>158),"stg_name='DBVersion'");
}
-
if ($oldversion < 159)
+ {
+ alterColumn('{{failed_login_attempts}}', 'ip', "{$sVarchar}(40)",false);
+ Yii::app()->db->createCommand()->update('{{settings_global}}',array('stg_value'=>159),"stg_name='DBVersion'");
+ }
+
+ if ($oldversion < 160)
+ {
+ alterLanguageCode('it','it-informal');
+ alterLanguageCode('it-formal','it');
+ Yii::app()->db->createCommand()->update('{{settings_global}}',array('stg_value'=>160),"stg_name='DBVersion'");
+ }
+ if ($oldversion < 161)
+ {
+ addColumn('{{survey_links}}','date_invited','datetime NULL default NULL');
+ addColumn('{{survey_links}}','date_completed','datetime NULL default NULL');
+ }
+ if ($oldversion < 162)
{
Yii::app()->db->createCommand()->createTable('{{question_types}}',array(
'tid' => 'pk',
@@ -1024,15 +1020,15 @@ function db_upgrade_all($oldversion) {
Yii::app()->db->createCommand()->addColumn('{{questions}}','tid',"integer NOT NULL DEFAULT '0' AFTER `gid`");
- upgradeSurveys159();
- Yii::app()->db->createCommand()->update('{{settings_global}}',array('stg_value'=>159),"stg_name='DBVersion'");
+ upgradeSurveys162();
+ Yii::app()->db->createCommand()->update('{{settings_global}}',array('stg_value'=>162),"stg_name='DBVersion'");
}
fixLanguageConsistencyAllSurveys();
echo '
text))." - a dual array type question\">\n"
. $mycolumns
. "\n\t\n"
- . $myheader1
- . $myheader2
+ . $answer_head1
+ . $answer_head2
. "\n\t\n"
. "\n";
@@ -220,30 +225,9 @@ public function getAnswerHTML()
if ( ($anscount - $fn + 1) >= $minrepeatheadings )
{
$answer .= "\n";// Close actual body and open another one
- $answer .= "\n
->getConfig('adminimageurl') . '/active.png)
', Yii::app()->baseUrl, $label[$result]);
}
+
+ function is_writable_recursive($dir)
+ {
+ $folder = opendir($dir);
+ while($file = readdir( $folder ))
+ if($file != '.' && $file != '..' &&
+ ( !is_writable( $dir."/".$file ) ||
+ ( is_dir( $dir."/".$file ) && !is_writable_recursive( $dir."/".$file ) ) ))
+ {
+ closedir($folder);
+ return false;
+ }
+ closedir($folder);
+ return true;
+ }
+
/**
* check for a specific PHPFunction, return HTML image
*
@@ -727,7 +742,7 @@ function check_PHPFunction($function, &$image)
* @param string $keyError key for error data
* @return bool result of check (that it is writeable which implies existance)
*/
- function check_PathWriteable($path, $type, &$data, $base, $keyError)
+ function check_PathWriteable($path, $type, &$data, $base, $keyError, $bRecursive=false)
{
$result = false;
$data[$base.'Present'] = 'Not Found';
@@ -745,7 +760,7 @@ function check_PathWriteable($path, $type, &$data, $base, $keyError)
if ($exists)
{
$data[$base.'Present'] = 'Found';
- if (is_writable($path))
+ if ((!$bRecursive && is_writable($path)) || ($bRecursive && is_writable_recursive($path)))
{
$data[$base.'Writable'] = 'Writable';
$result = true;
@@ -783,9 +798,9 @@ function check_FileWriteable($file, &$data, $base, $keyError)
* @param string $keyError key for error data
* @return bool result of check (that it is writeable which implies existance)
*/
- function check_DirectoryWriteable($directory, &$data, $base, $keyError)
+ function check_DirectoryWriteable($directory, &$data, $base, $keyError, $bRecursive=false)
{
- return check_PathWriteable($directory, 2, $data, $base, $keyError);
+ return check_PathWriteable($directory, 2, $data, $base, $keyError, $bRecursive);
}
// version check
@@ -803,11 +818,11 @@ function check_DirectoryWriteable($directory, &$data, $base, $keyError)
$bProceed = false;
// templates directory check
- if (!check_DirectoryWriteable(Yii::app()->getConfig('rootdir').'/templates/', $data, 'templatedir', 'tperror') )
+ if (!check_DirectoryWriteable(Yii::app()->getConfig('tempdir').'/', $data, 'tmpdir', 'tperror',true) )
$bProceed = false;
//upload directory check
- if (!check_DirectoryWriteable(Yii::app()->getConfig('rootdir').'/upload/', $data, 'uploaddir', 'uerror') )
+ if (!check_DirectoryWriteable(Yii::app()->getConfig('uploaddir').'/', $data, 'uploaddir', 'uerror',true) )
$bProceed = false;
// ** optional settings check **
@@ -947,6 +962,7 @@ function _writeConfigFile()
."*/" ."\n"
. "return array(" . "\n"
."\t" . "'basePath' => dirname(dirname(__FILE__))," . "\n"
+ ."\t" . "'runtimePath' => dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'runtime'," . "\n"
."\t" . "'name' => 'LimeSurvey'," . "\n"
."\t" . "'defaultController' => 'survey'," . "\n"
."\t" . "" . "\n"
@@ -969,8 +985,13 @@ function _writeConfigFile()
$dbdata .="\t\t\t" . "'username' => '$sDatabaseUser'," . "\n"
."\t\t\t" . "'password' => '$sDatabasePwd'," . "\n"
."\t\t\t" . "'charset' => 'utf8'," . "\n"
- ."\t\t\t" . "'tablePrefix' => '$sDatabasePrefix'," . "\n"
- ."\t\t" . ")," . "\n"
+ ."\t\t\t" . "'tablePrefix' => '$sDatabasePrefix'," . "\n";
+
+ if (in_array($sDatabaseType, array('mssql', 'sqlsrv'))) {
+ $dbdata .="\t\t\t" ."'initSQLs'=>array('SET DATEFORMAT ymd;','SET QUOTED_IDENTIFIER ON;')," . "\n";
+ }
+
+ $dbdata .="\t\t" . ")," . "\n"
."\t\t" . "" . "\n"
."\t\t" . "// Uncomment the following line if you need table-based sessions". "\n"
diff --git a/application/controllers/OptinController.php b/application/controllers/OptinController.php
index f9fbe1c15ec..b9d2a8fb89d 100644
--- a/application/controllers/OptinController.php
+++ b/application/controllers/OptinController.php
@@ -93,7 +93,7 @@ function actionLocal($surveyid, $token, $langcode = '')
//PRINT COMPLETED PAGE
if (!$thissurvey['templatedir'])
{
- $thistpl=getTemplatePath($defaulttemplate);
+ $thistpl=getTemplatePath(Yii::app()->getConfig("defaulttemplate"));
}
else
{
diff --git a/application/controllers/OptoutController.php b/application/controllers/OptoutController.php
index e63873edc20..e466fc6a9e6 100644
--- a/application/controllers/OptoutController.php
+++ b/application/controllers/OptoutController.php
@@ -23,22 +23,32 @@
*/
class OptoutController extends LSYii_Controller {
- function actionLocal($surveyid, $token, $langcode = '')
+ /* This function is run when opting out of an individual token table. The other function /optout/participants
+ * opts the user out of ALL survey invitations from the system
+ *
+ *
+ * */
+ function actiontokens()
{
+ $surveyid=Yii::app()->request->getQuery('surveyid');
+ $langcode=Yii::app()->request->getQuery('langcode');
+ $token=Yii::app()->request->getQuery('token');
+
Yii::app()->loadHelper('database');
Yii::app()->loadHelper('sanitize');
$sLanguageCode = $langcode;
+
$iSurveyID = $surveyid;
$sToken = $token;
$sToken = sanitize_token($sToken);
- if (!$iSurveyID)
+ if (!$iSurveyID) //IF there is no survey id, redirect back to the default public page
{
- $this->redirect($this->getController()->createUrl('/'));
+ $this->redirect(Yii::app()->getController()->createUrl('/'));
}
- $iSurveyID = (int)$iSurveyID;
+ $iSurveyID = (int)$iSurveyID; //Make sure it's an integer (protect from SQL injects)
//Check that there is a SID
- // Get passed language from form, so that we dont loose this!
+ // Get passed language from form, so that we dont lose this!
if (!isset($sLanguageCode) || $sLanguageCode == "" || !$sLanguageCode)
{
$baselang = Survey::model()->findByPk($iSurveyID)->language;
@@ -86,7 +96,107 @@ function actionLocal($surveyid, $token, $langcode = '')
//PRINT COMPLETED PAGE
if (!$thissurvey['templatedir'])
{
- $thistpl=getTemplatePath($defaulttemplate);
+ $thistpl=getTemplatePath(Yii::app()->getConfig("defaulttemplate"));
+ }
+ else
+ {
+ $thistpl=getTemplatePath($thissurvey['templatedir']);
+ }
+
+ $this->_renderHtml($html,$thistpl);
+ }
+
+ /* This function is run when opting out of the participants system. The other function /optout/token
+ * opts the user out of just a single token/survey invite list
+ *
+ *
+ * */
+ function actionparticipants()
+ {
+ $surveyid=Yii::app()->request->getQuery('surveyid');
+ $langcode=Yii::app()->request->getQuery('langcode');
+ $token=Yii::app()->request->getQuery('token');
+
+ Yii::app()->loadHelper('database');
+ Yii::app()->loadHelper('sanitize');
+ $sLanguageCode = $langcode;
+
+ $iSurveyID = $surveyid;
+ $sToken = $token;
+ $sToken = sanitize_token($sToken);
+
+ if (!$iSurveyID) //IF there is no survey id, redirect back to the default public page
+ {
+ $this->redirect(Yii::app()->getController()->createUrl('/'));
+ }
+ $iSurveyID = (int)$iSurveyID; //Make sure it's an integer (protect from SQL injects)
+ //Check that there is a SID
+ // Get passed language from form, so that we dont lose this!
+ if (!isset($sLanguageCode) || $sLanguageCode == "" || !$sLanguageCode)
+ {
+ $baselang = Survey::model()->findByPk($iSurveyID)->language;
+ Yii::import('application.libraries.Limesurvey_lang', true);
+ $clang = new Limesurvey_lang($baselang);
+ }
+ else
+ {
+ $sLanguageCode = sanitize_languagecode($sLanguageCode);
+ Yii::import('application.libraries.Limesurvey_lang', true);
+ $clang = new Limesurvey_lang($sLanguageCode);
+ $baselang = $sLanguageCode;
+ }
+
+ Yii::app()->lang = $clang;
+
+ $thissurvey=getSurveyInfo($iSurveyID,$baselang);
+
+ if ($thissurvey==false || !tableExists("{{tokens_{$iSurveyID}}}")){
+ $html = $clang->gT('This survey does not seem to exist.');
+ }
+ else
+ {
+ $row = Tokens_dynamic::getEmailStatus($iSurveyID, $sToken);
+ $datas = Tokens_dynamic::model($iSurveyID)->find('token = :token', array(":token"=>$sToken));
+
+ if ($row == false)
+ {
+ $html = $clang->gT('You are not a participant in this survey.');
+ }
+ else
+ {
+ $usresult = $row['emailstatus'];
+ if ($usresult == 'OK')
+ {
+ $usresult = Tokens_dynamic::updateEmailStatus($iSurveyID, $sToken, 'OptOut');
+ $html = $clang->gT('You have been successfully removed from this survey.');
+ }
+ else
+ {
+ $html = $clang->gT('You have been already removed from this survey.');
+ }
+ if(!empty($datas->participant_id) && $datas->participant_id != "")
+ {
+ //Participant also exists in central db
+ $cpdb = Participants::model()->find('participant_id = :participant_id', array(":participant_id"=>$datas->participant_id));
+ if($cpdb->blacklisted=="Y")
+ {
+ $html .= "->getConfig('adminimageurl') . '/expired.png)
';
- }
- elseif ($rows['active'] == "Y" && $rows['startdate'] != '' && $rows['startdate'] > dateShift(date("Y-m-d H:i:s"), "Y-m-d", Yii::app()->getConfig('timeadjust')))
- {
- $aSurveyEntry[] = '->getConfig('adminimageurl') . '/inactive.png)
';
+ if (hasSurveyPermission($rows['sid'], 'surveyactivation', 'update'))
+ {
+ $aSurveyEntry[] = '
"
- ."
"
- ."
"
- ."
"
- ."
"
- ."
"
+ ."
- 
- 
- 
- 
- 
-
-
-