Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey.git in…

…to Yii

application/helpers/frontend_helper.php

@@ -60,7 +60,7 @@ function loadanswers()
             //A match has been found. Let's load the values!
             //If this is from an email, build surveysession first
             $_SESSION['LEMtokenResume']=true;
-                    
+
             $row=$result->read();
             foreach ($row as $column => $value)
             {
@@ -297,7 +297,7 @@ function checkconfield($value)
         // we know the true fieldname $value (for instance SGQA for each checkboxes)
         // and we want to compare it to the values stored in $_SESSION['fieldarray'] which are simple fieldnames
         // ==> We first translate $value to the simple fieldname (let's call it the masterFieldName) from
-        //     the $_SESSION['fieldnamesInfo'] translation table
+        //     the $_SESSION['survey_X']['fieldnamesInfo'] translation table
         if (isset($_SESSION['survey_'.$surveyid]['fieldnamesInfo'][$value]))
         {
             $masterFieldName = $_SESSION['survey_'.$surveyid]['fieldnamesInfo'][$value];
@@ -1184,7 +1184,7 @@ function sendSubmitNotifications($surveyid)
         {
             $aReplacementVars['RELOADURL']='';
         }
-        
+
         if (!isset($_SESSION['survey_'.$surveyid]['srid']))
             $srid = null;
         else
@@ -2096,13 +2096,13 @@ function buildsurveysession($surveyid,$previewGroup=false)
                     $startingValues[$field] = array (
                         'type'=>$type,
                         'value'=>$value,
-                        );  
+                        );
                 }
             }
         }
     }
     $_SESSION['survey_'.$surveyid]['startingValues']=$startingValues;
-    
+
     if (isset($_SESSION['survey_'.$surveyid]['fieldarray'])) $_SESSION['survey_'.$surveyid]['fieldarray']=array_values($_SESSION['survey_'.$surveyid]['fieldarray']);
 
     //Check if a passthru label and value have been included in the query url
@@ -2781,7 +2781,7 @@ function display_first_page() {
     $_SESSION['survey_'.$surveyid]['LEMpostKey'] = mt_rand();
     echo "<input type='hidden' name='LEMpostKey' value='{$_SESSION['survey_'.$surveyid]['LEMpostKey']}' id='LEMpostKey' />\n";
     echo "<input type='hidden' name='thisstep' id='thisstep' value='0' />\n";
-    
+
     echo "\n</form>\n";
     echo templatereplace(file_get_contents("$thistpl/endpage.pstpl"),array(),$redata,'frontend_helper[2782]');
 

application/views/admin/survey/Question/questionbar_view.php

@@ -131,7 +131,7 @@
                 { ?>
                 <a href='<?php echo $this->createUrl('admin/question/subquestions/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid); ?>'
                     title='<?php $clang->eTview("Edit subquestions for this question"); ?>'>
-                    <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/subquestions.png' alt='<?php $clang->eT("Edit subquestions for this question"); ?>' /></a>
+                    <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/<?php if ($qtypes[$qrrow['type']]['subquestions']==1){?>subquestions.png<?php } else {?>subquestions2d.png<?php } ?>' alt='<?php $clang->eT("Edit subquestions for this question"); ?>' /></a>
                 <?php }
             }
             else
@@ -226,7 +226,7 @@
         <tr ><td></td><td>
                 <span class='statusentryhighlight'>
                     <?php $clang->eT("Warning"); ?>: <a href='<?php echo $this->createUrl("admin/question/subquestions/surveyid/$surveyid/gid/$gid/qid/$qid"); ?>'><?php $clang->eT("You need to add subquestions to this question"); ?>
-                        <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/subquestions_20.png' title='<?php $clang->eT("Edit subquestions for this question"); ?>' /></a></span></td></tr>
+                        <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/<?php if ($qtypes[$qrrow['type']]['subquestions']==1){?>subquestions_20<?php } else {?>subquestions2d_20<?php } ?>.png' title='<?php $clang->eT("Edit subquestions for this question"); ?>' /></a></span></td></tr>
         <?php }
 
         if ($qrrow['type'] == "M" or $qrrow['type'] == "P")