Fixed issue #13280: Variables don't work in END_URL

LimeSurvey · Feb 2, 2018 · 3045094 · 3045094
1 parent 27e7631
commit 3045094
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -164,7 +164,7 @@ public function _updateDefaultValues($qid, $sqid, $scale_id, $specialtype, $lang
                 DefaultValue::model()->updateByPk(array('sqid'=>$sqid, 'qid'=>$qid, 'specialtype'=>$specialtype, 'scale_id'=>$scale_id, 'language'=>$language), array('defaultvalue'=>$defaultvalue));
             }
         }
-        $surveyid = $iSurveyID;
+        $surveyid = $this->iSurveyID;
         updateFieldArray();
     }
 

diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1119,11 +1119,6 @@ private function moveSubmitIfNeeded()
                 $_SESSION[$this->LEMsessid]['finished'] = true;
                 $_SESSION[$this->LEMsessid]['sid']      = $this->iSurveyid;
 
-                if (isset($this->aSurveyInfo['autoredirect']) && $this->aSurveyInfo['autoredirect'] == "Y" && $this->aSurveyInfo['surveyls_url']) {
-                    //Automatically redirect the page to the "url" setting for the survey
-                    header("Location: {$this->aSurveyInfo['surveyls_url']}");
-                }
-
             }
 
             $redata['completed'] = $this->completed;
@@ -1147,18 +1142,22 @@ private function moveSubmitIfNeeded()
             $this->aSurveyInfo['aCompleted']['sPluginHTML'] = implode("\n", $blocks)."\n";
             $this->aSurveyInfo['aCompleted']['sSurveylsUrl'] = $this->aSurveyInfo['surveyls_url'];
 
-                $aStandardsReplacementFields = array();
-                if (strpos($this->aSurveyInfo['surveyls_url'], "{") !== false) {
-                    // process string anyway so that it can be pretty-printed
-                    $aStandardsReplacementFields = getStandardsReplacementFields($this->aSurveyInfo);
+            $aStandardsReplacementFields = array();
+            if (strpos($this->aSurveyInfo['surveyls_url'], "{") !== false) {
+                // process string anyway so that it can be pretty-printed
+                $aStandardsReplacementFields = getStandardsReplacementFields($this->aSurveyInfo);
 
-                    $this->aSurveyInfo['surveyls_url'] = LimeExpressionManager::ProcessString( $this->aSurveyInfo['surveyls_url'], null, $aStandardsReplacementFields);
+                $this->aSurveyInfo['surveyls_url'] = LimeExpressionManager::ProcessString( $this->aSurveyInfo['surveyls_url'], null, $aStandardsReplacementFields);
 
-                }
+            }
 
-                $this->aSurveyInfo['aCompleted']['sSurveylsUrl']  = $this->aSurveyInfo['surveyls_url'];
+            $this->aSurveyInfo['aCompleted']['sSurveylsUrl']  = $this->aSurveyInfo['surveyls_url'];
 
 
+            if (isset($this->aSurveyInfo['autoredirect']) && $this->aSurveyInfo['autoredirect'] == "Y" && $this->aSurveyInfo['surveyls_url']) {
+                //Automatically redirect the page to the "url" setting for the survey
+                header("Location: {$this->aSurveyInfo['surveyls_url']}");
+            }
 
             $this->aSurveyInfo['aLEM']['debugvalidation']['show'] = false;
             if (($this->LEMdebugLevel & LEM_DEBUG_VALIDATION_SUMMARY) == LEM_DEBUG_VALIDATION_SUMMARY) {