mirror of
https://github.com/ACSPRI/queXS
synced 2024-04-02 12:12:16 +00:00
Updated Limesurvey to revision 11354
This commit is contained in:
@@ -1143,64 +1143,6 @@ function makelanguagechanger()
|
||||
}
|
||||
|
||||
|
||||
function checkgroupfordisplay($gid)
|
||||
{
|
||||
//This function checks all the questions in a group to see if they have
|
||||
//conditions, and if the do - to see if the conditions are met.
|
||||
//If none of the questions in the group are set to display, then
|
||||
//the function will return false, to indicate that the whole group
|
||||
//should not display at all.
|
||||
global $dbprefix, $connect;
|
||||
$countQuestionsInThisGroup=0;
|
||||
$countConditionalQuestionsInThisGroup=0;
|
||||
foreach ($_SESSION['fieldarray'] as $ia) //Run through all the questions
|
||||
|
||||
{
|
||||
if ($ia[5] == $gid) //If the question is in the group we are checking:
|
||||
|
||||
{
|
||||
// Check if this question is hidden
|
||||
$qidattributes=getQuestionAttributes($ia[0]);
|
||||
if ($qidattributes!==false && $qidattributes['hidden']==0)
|
||||
{
|
||||
$countQuestionsInThisGroup++;
|
||||
if ($ia[7] == "Y") //This question is conditional
|
||||
|
||||
{
|
||||
$countConditionalQuestionsInThisGroup++;
|
||||
$QuestionsWithConditions[]=$ia; //Create an array containing all the conditional questions
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($countQuestionsInThisGroup===0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
elseif ($countQuestionsInThisGroup != $countConditionalQuestionsInThisGroup || !isset($QuestionsWithConditions) )
|
||||
{
|
||||
//One of the questions in this group is NOT conditional, therefore
|
||||
//the group MUST be displayed
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
//All of the questions in this group are conditional. Now we must
|
||||
//check every question, to see if the condition for each has been met.
|
||||
//If 1 or more have their conditions met, then the group should
|
||||
//be displayed.
|
||||
foreach ($QuestionsWithConditions as $cc)
|
||||
{
|
||||
if (checkquestionfordisplay($cc[0], $gid) === true)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
//Since we made it this far, there mustn't have been any conditions met.
|
||||
//Therefore the group should not be displayed.
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function checkconfield($value)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user