Skip to content

Commit

Permalink
Dev EM-based validation and navigation sub-system:
Browse files Browse the repository at this point in the history 
Dev Refactored passing of survey parameters to EM
Dev sanitized processing of $_POST
Dev improved database updates which may occur when skipping hidden or irrelevant groups

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev_tms@11558 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@TMSWhite
TMSWhite committed Dec 1, 2011
1 parent 903b6ef commit 3ae96ce
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 13 deletions.
2 changes: 1 addition & 1 deletion admin/preview.php
View file
Expand Up @@ -62,7 +62,7 @@
7 => 'N',
8 => 'N' ); // ia[8] is usedinconditions

LimeExpressionManager::StartSurvey($thissurvey['sid'], 'question', ($thissurvey['anonymized']!="N"), false,$LEMdebugLevel);
LimeExpressionManager::StartSurvey($thissurvey['sid'], 'question', NULL, false,$LEMdebugLevel);
$qseq = LimeExpressionManager::GetQuestionSeq($qid);
$moveResult = LimeExpressionManager::JumpTo($qseq+1,false,true);

Expand Down
61 changes: 52 additions & 9 deletions classes/eval/LimeExpressionManager.php
View file
Expand Up @@ -25,7 +25,7 @@ class LimeExpressionManager {
private $pageTailorInfo;
private $allOnOnePage=false; // internally set to true for survey.php so get group-specific logging but keep javascript variable namings consistent on the page.
private $surveyMode='group'; // survey mode
private $anonymized;
private $surveyOptions=array(); // a set of global survey options passed from LimeSurvey
private $qid2code; // array of mappings of Question # to list of SGQA codes used within it
private $jsVar2qid; // reverse mapping of JavaScript Variable name to Question
private $alias2varName; // JavaScript array of mappings of aliases to the JavaScript variable names
Expand Down Expand Up @@ -1891,11 +1891,20 @@ static function StartProcessingPage($navigationIndex=false,$allOnOnePage=false)
* @param <type> $forceRefresh
*/

static function StartSurvey($surveyid,$surveyMode='group',$anonymized=false,$forceRefresh=false,$debugLevel=0)
static function StartSurvey($surveyid,$surveyMode='group',$options=NULL,$forceRefresh=false,$debugLevel=0)
{
$LEM =& LimeExpressionManager::singleton();
$LEM->sid=$surveyid; // TMSW - santize this?
$LEM->anonymized=$anonymized;
if (is_null($options)) {
$options = array();
}
$LEM->surveyOptions['active'] = (isset($options['active']) ? $options['active'] : false);
$LEM->surveyOptions['allowsave'] = (isset($options['allowsave']) ? $options['allowsave'] : false);
$LEM->surveyOptions['anonymized'] = (isset($options['anonymized']) ? $options['anonymized'] : false);
$LEM->surveyOptions['datestamp'] = (isset($options['datestamp']) ? $options['datestamp'] : false);
$LEM->surveyOptions['ipaddr'] = (isset($options['ipaddr']) ? $options['ipaddr'] : false);

$LEM->debugLevel=$debugLevel;
switch ($surveyMode) {
case 'survey':
Expand All @@ -1913,7 +1922,7 @@ static function StartSurvey($surveyid,$surveyMode='group',$anonymized=false,$for
break;
}

if ($LEM->setVariableAndTokenMappingsForExpressionManager($surveyid,$forceRefresh,$anonymized,$LEM->allOnOnePage))
if ($LEM->setVariableAndTokenMappingsForExpressionManager($surveyid,$forceRefresh,$LEM->surveyOptions['anonymized'],$LEM->allOnOnePage))
{
// means that some values changed, so need to update what was registered to ExpressionManager
$LEM->em->RegisterVarnamesUsingMerge($LEM->knownVars);
Expand Down Expand Up @@ -2307,9 +2316,28 @@ static function NavigateForwards($force=false) {
function UpdateValuesInDatabase($updatedValues)
{
// Update these values in the database
if (count($updatedValues) > 0) // && isset($_SESSION['srid']))
if (count($updatedValues) > 0)
{
$query = 'UPDATE '.db_table_name('survey_' . $this->sid) . " SET ";
switch ($this->surveyMode)
{
case 'question':
$query .= "lastpage='" . ($this->currentQuestionSeq+1) . "', ";
break;
case 'group':
$query .= "lastpage='" . ($this->currentGroupSeq+1) . "', ";
break;
case 'survey':
$query .= "lastpage='1', ";
break;
}
if ($this->surveyOptions['datestamp'] && isset($_SESSION['datestamp'])) {
$query .= " datestamp = '".$_SESSION['datestamp']."',";
}
if ($this->surveyOptions['ipaddr'] && isset($_SERVER['REMOTE_ADDR'])) {
$query .= " ipaddr = '".$_SERVER['REMOTE_ADDR']."',";
}

$setter = array();
foreach ($updatedValues as $key=>$value)
{
Expand All @@ -2325,7 +2353,7 @@ function UpdateValuesInDatabase($updatedValues)
$query .= implode(', ', $setter);
$query .= " WHERE ID=";

if (isset($_SESSION['srid']))
if (isset($_SESSION['srid']) && $this->surveyOptions['active'])
{
$query .= $_SESSION['srid'];
db_execute_assoc($query);
Expand Down Expand Up @@ -2579,7 +2607,7 @@ function _ValidateGroup($groupSeq)
$groupSeqInfo = $LEM->groupSeqInfo[$groupSeq];
$qInfo = $LEM->questionSeq2relevance[$groupSeqInfo['qstart']];
$gid = $qInfo['gid'];
$LEM->StartProcessingGroup($gid, $LEM->anonymized, $LEM->sid); // analyze the data we have about this group
$LEM->StartProcessingGroup($gid, $LEM->surveyOptions['anonymized'], $LEM->sid); // analyze the data we have about this group

$grel=false; // assume irrelevant until find a relevant question
$ghidden=true; // assume hidden until find a non-hidden question. If there are no relevant questions on this page, $ghidden will stay true
Expand Down Expand Up @@ -4355,7 +4383,22 @@ static function ProcessCurrentResponses()
{
if ($relevant && isset($_POST[$sq]))
{
$_SESSION[$sq] = $_POST[$sq];
$value = $_POST[$sq];
switch($qinfo['info']['type'])
{
case 'D': //DATE
break;
case 'N': //NUMERICAL QUESTION TYPE
case 'K': //MULTIPLE NUMERICAL QUESTION
if (trim($value)=="") {
$value = "";
}
else {
$value = sanitize_float($value);
}
break;
}
$_SESSION[$sq] = $value;
}
else {
$_SESSION[$sq] = "";
Expand All @@ -4364,7 +4407,7 @@ static function ProcessCurrentResponses()
}
if (isset($_POST['timerquestion']))
{
$_SESSION[$_POST['timerquestion']]=sanitize_float($_POST[$_POST['timerquestion']]);
$_SESSION[$_POST['timerquestion']]=sanitize_float($_POST[$_POST['timerquestion']]);
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion classes/eval/test/navigation_test.php
View file
Expand Up @@ -25,11 +25,19 @@

$LEMdebugLevel = 3;

$surveyOptions = array(
'active'=>false,
'allowsave'=>true,
'anonymized'=>false,
'datestamp'=>true,
'ipaddr'=>true,
);

foreach ($surveys as $surveyid)
{
print '<h3>Starting survey ' . $surveyid . "</h3>";
$now = microtime(true);
LimeExpressionManager::StartSurvey($surveyid, 'group', false, true,$LEMdebugLevel);
LimeExpressionManager::StartSurvey($surveyid, 'group', $surveyOptions, true,$LEMdebugLevel);
print '<b>[StartSurvey() took ' . (microtime(true) - $now) . ' seconds]</b><br/>';

while(true) {
Expand Down
11 changes: 9 additions & 2 deletions group1.php
View file
Expand Up @@ -19,6 +19,13 @@
// 2=timings + pretty-printed results of validating questions and groups
$LEMdebugLevel=0;
$surveyMode = (($thissurvey['format'] == 'G') ? 'group' : 'question');
$surveyOptions = array(
'active'=>($thissurvey['active']=='Y'),
'allowsave'=>($thissurvey['allowsave']=='Y'),
'anonymized'=>($thissurvey['anonymized']!='N'),
'datestamp'=>($thissurvey['datestamp']=='Y'),
'ipaddr'=>($thissurvey['ipaddr']=='Y'),
);

//Security Checked: POST, GET, SESSION, REQUEST, returnglobal, DB
$previewgrp = false;
Expand All @@ -42,7 +49,7 @@
if (!isset($_SESSION['step'])) // || !$_SESSION['step']) - don't do this for step0, else rebuild the session
{
$totalquestions = buildsurveysession();
LimeExpressionManager::StartSurvey($thissurvey['sid'], $surveyMode, ($thissurvey['anonymized']!="N"), true,$LEMdebugLevel);
LimeExpressionManager::StartSurvey($thissurvey['sid'], $surveyMode, $surveyOptions, true,$LEMdebugLevel);
$_SESSION['step'] = 0;
if(isset($thissurvey['showwelcome']) && $thissurvey['showwelcome'] == 'N') {
//If explicitply set, hide the welcome screen
Expand Down Expand Up @@ -335,7 +342,7 @@
{
setcookie("limesurvey_timers", "0");

LimeExpressionManager::StartSurvey($thissurvey['sid'], 'group', ($thissurvey['anonymized']!="N"), false,$LEMdebugLevel);
LimeExpressionManager::StartSurvey($thissurvey['sid'], 'group', $surveyOptions, false,$LEMdebugLevel);
$gseq = LimeExpressionManager::GetGroupSeq($_REQUEST['gid']);
if ($gseq == -1) {
echo 'Invalid Group' . $_REQUEST['gid'];
Expand Down

0 comments on commit 3ae96ce

Please sign in to comment.