Fixed issue #10568: Quotas close button in endless loop

LimeSurvey · Mar 4, 2016 · 0c876ad · 0c876ad
1 parent 47a65a6
commit 0c876ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/application/controllers/admin/quotas.php b/application/controllers/admin/quotas.php
@@ -102,6 +102,7 @@ function index($iSurveyId, $quickreport = false)
         $aData['surveybar']['active_survey_properties']['img'] = 'quota';
         $aData['surveybar']['active_survey_properties']['txt'] = gT("Quotas");
         $aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$iSurveyID;  // Close button
+        $aData['surveybar']['closebutton']['forbidden'][] = 'quotas';
 
         $totalquotas = 0;
         $totalcompleted = 0;
@@ -383,13 +384,13 @@ function editquota($iSurveyId)
 
         $aViewUrls[] = 'editquota_view';
 
-            $aData['sidemenu']['state'] = false;
-            $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
-            $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";
+        $aData['sidemenu']['state'] = false;
+        $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
+        $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";
 
-            //$aData['surveybar']['active_survey_properties'] = 'quotas';
-            $aData['surveybar']['closebutton']['url'] = 'admin/quotas/sa/index/surveyid/'.$iSurveyId;  // Close button
-            $aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
+        //$aData['surveybar']['active_survey_properties'] = 'quotas';
+        $aData['surveybar']['closebutton']['url'] = 'admin/quotas/sa/index/surveyid/'.$iSurveyId;  // Close button
+        $aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
 
         $this->_renderWrappedTemplate('quotas', $aViewUrls, $aData);
     }

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -524,7 +524,6 @@ function _titlebar($aData)
 
     function _tokenbar($aData)
     {
-        //var_dump($aData['token_bar']);
         if( isset($aData['token_bar']) ) {
 
             if(isset($aData['token_bar']['closebutton']['url']))
@@ -852,7 +851,8 @@ function _surveybar($aData)
             if(isset($aData['surveybar']['closebutton']['url']))
             {
                 $sAlternativeUrl = $aData['surveybar']['closebutton']['url'];
-                $aData['surveybar']['closebutton']['url'] = Yii::app()->request->getUrlReferrer( Yii::app()->createUrl($sAlternativeUrl) );
+                $aForbiddenWordsInUrl = isset($aData['surveybar']['closebutton']['forbidden'])?$aData['surveybar']['closebutton']['forbidden']:array();
+                $aData['surveybar']['closebutton']['url'] = Yii::app()->request->getUrlReferrer( Yii::app()->createUrl($sAlternativeUrl), $aForbiddenWordsInUrl );
             }
 
             if($aData['gid']==null)

diff --git a/application/views/admin/survey/surveybar_view.php b/application/views/admin/survey/surveybar_view.php
@@ -4,6 +4,8 @@
  * Used for all survey editing action, and group / questions lists.
  */
 ?>
+
+
 <div class='menubar surveybar' id="surveybarid">
     <div class='row container-fluid'>
         <div class="col-md-8 col-xs-6">