Merge branch 'develop' of github.com:LimeSurvey/LimeSurvey into develop

LimeSurvey · Jun 15, 2015 · df85b12 · df85b12
2 parents 5bc71ab + 7e9dafc
commit df85b12
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -72,7 +72,7 @@ function loadanswers()
         // If survey come from reload (GET or POST); some value need to be found on saved_control, not on survey
         if (Yii::app()->request->getParam('loadall') == "reload")
         {
-            $oSavedSurvey=SavedControl::model()->find("identifier=:identifier AND access_code=:access_code",array(":identifier"=>$sLoadName,":access_code"=>md5($sLoadPass)));
+            $oSavedSurvey=SavedControl::model()->find("identifier=:identifier AND (access_code=:access_code OR access_code=:sha256_code)",array(':identifier'=>$sLoadName,':access_code'=>md5($sLoadPass),':sha256_code'=>hash('sha256',$sLoadPass)));
             // We don't need to control if we have one, because we do the test before
             $_SESSION['survey_'.$surveyid]['scid'] = $oSavedSurvey->scid;
             App()->surveySessionManager->current->setStep(($oSavedSurvey->saved_thisstep>1)?$oSavedSurvey->saved_thisstep:1);

diff --git a/application/views/admin/globalSettings_view.php b/application/views/admin/globalSettings_view.php
@@ -421,7 +421,7 @@
                     ),
                     'filterxsshtml'=>array(
                         'type'=>'select',
-                        'label'=>gt("Survey preview only for administration users").$sStringDemoMode,
+                        'label'=>gt("Filter HTML for XSS").$sStringDemoMode,
                         'labelOptions'=>array(
                             'class'=>$sClassDemoMode,
                         ),

diff --git a/application/views/admin/survey/Question/answerOptions_view.php b/application/views/admin/survey/Question/answerOptions_view.php
@@ -200,7 +200,7 @@
         </div>
 
         <div id="dialog-confirm-replace" title="<?php eT('Replace label set?'); ?>" style='display:none;'>
-        <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php eT('You are about to replace a given label set with the current answer options. Continue?'); ?></p>
+        <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><span id='strReplaceMessage'></span></p>
         </div>
 
         <div id="dialog-duplicate" title="<?php eT('Duplicate label set name'); ?>" style='display:none;'>

diff --git a/application/views/admin/survey/Question/subQuestion_view.php b/application/views/admin/survey/Question/subQuestion_view.php
@@ -10,7 +10,7 @@
     var duplicatesubquestioncode='<?php eT('Error: You are trying to use duplicate subquestion codes.','js'); ?>';
     var strNoLabelSet='<?php eT('There are no label sets which match the survey default language','js'); ?>';
     var langs='<?php echo implode(';',$anslangs); ?>';
-    var otherisreserved='<?php eT("Error: 'other' is a reserved keyword.",'js'); ?>';
+    var otherisreserved='<?php ($aParentQuestion['other']=="Y") ? printf(gT("'%s' can not be used if question allow other.",'js'),'other') : ""; ?>';
     var sImageURL ='<?php echo Yii::app()->getConfig('adminimageurl'); ?>';
     var saveaslabletitle  = '<?php eT('Save as label set','js'); ?>';
     var lanameurl = '<?php echo Yii::app()->createUrl('/admin/labels/sa/getAllSets'); ?>';
@@ -221,7 +221,7 @@ class="highlight"
             </p>
         </div>
         <div id="dialog-confirm-replace" title="<?php eT('Replace label set?'); ?>" style='display:none;'>
-            <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php eT('You are about to replace a given label set with the labels of this subquestions. Continue?'); ?></p>
+            <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><span id='strReplaceMessage'></span></p>
         </div>
 
         <div id="dialog-duplicate" title="<?php eT('Duplicate label set name'); ?>" style='display:none;'>