Dev Changing controller URLs to allow for IIS compatibility

LimeSurvey · Nov 29, 2012 · b57ae1b · b57ae1b
1 parent c4fcfbe
commit b57ae1b
Show file tree

Hide file tree

Showing 59 changed files with 150 additions and 152 deletions.
diff --git a/application/config/routes.php b/application/config/routes.php
@@ -20,6 +20,7 @@
 
 //Admin Routes
 $route['admin/index'] = "admin";
+$route['admin/<action:\w+>/sa/<sa:\w+>/*'] = 'admin/<action>/sa/<sa>'; 
 $route['admin/<action:\w+>/<sa:\w+>/*'] = 'admin/<action>/sa/<sa>';
 
 //question

diff --git a/application/controllers/admin/assessments.php b/application/controllers/admin/assessments.php
@@ -109,7 +109,7 @@ private function _showAssessments($iSurveyID, $action, $surveyLanguage, Limesurv
 
         Yii::app()->loadHelper('admin/htmleditor');
         if ($surveyinfo['assessments']!='Y')
-            $urls['message'] = array('title' => $clang->gT("Assessments mode not activated"), 'message' => sprintf($clang->gT("Assessment mode for this survey is not activated. You can activate it in the %s survey settings %s (tab 'Notification & data management')."),'<a href="'.$this->getController()->createUrl('/admin/survey/editsurveysettings/surveyid/'.$iSurveyID).'">','</a>'), 'class'=> 'warningheader');
+            $urls['message'] = array('title' => $clang->gT("Assessments mode not activated"), 'message' => sprintf($clang->gT("Assessment mode for this survey is not activated. You can activate it in the %s survey settings %s (tab 'Notification & data management')."),'<a href="'.$this->getController()->createUrl('admin/survey/sa/editsurveysettings/surveyid/'.$iSurveyID).'">','</a>'), 'class'=> 'warningheader');
         $urls['assessments_view'][]= $aData;
         $this->_renderWrappedTemplate('', $urls, $aData);
     }

diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -148,7 +148,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
                 'onclick' => "window.open('".$this->getController()->createUrl("admin/conditions/index/subaction/resetsurveylogic/surveyid/$iSurveyID")."?ok=Y"."', '_top')"
                 ));
                 $button_cancel = CHtml::submitButton($clang->gT("Cancel"), array(
-                'onclick' => "window.open('".$this->getController()->createUrl("admin/survey/view/surveyid/$iSurveyID")."', '_top')"
+                'onclick' => "window.open('".$this->getController()->createUrl("admin/survey/sa/view/surveyid/$iSurveyID")."', '_top')"
                 ));
 
                 $messagebox_content = $clang->gT("You are about to delete all conditions on this survey's questions")."($iSurveyID)"
@@ -167,7 +167,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
                 LimeExpressionManager::RevertUpgradeConditionsToRelevance($iSurveyID);
                 Conditions::model()->deleteRecords("qid in (select qid from {{questions}} where sid={$iSurveyID})");
                 Yii::app()->session['flashmessage']=$clang->gT("All conditions in this survey have been deleted.");
-                $this->getController()->redirect($this->getController()->createUrl('/admin/survey/view/surveyid/'.$iSurveyID));
+                $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/'.$iSurveyID));
 
             }
         }

diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -127,7 +127,7 @@ function index($sa = null)
             }
             else
             {
-                $this->getController()->redirect($this->getController()->createUrl('/admin/survey/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
+                $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
             }
         }
 
@@ -586,7 +586,7 @@ function index($sa = null)
             }
             else
             {
-                $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
+                $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
             }
         }
 
@@ -880,7 +880,7 @@ function index($sa = null)
                 if(Yii::app()->request->getPost('newpage') == "return") {
                     $this->getController()->redirect($this->getController()->createUrl('admin/question/editquestion/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
                 } else {
-                    $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
+                    $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
                 }
             }
         }
@@ -959,7 +959,7 @@ function index($sa = null)
             }
             else
             {
-                $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/'.$surveyid));
+                $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/'.$surveyid));
             }
         }
 
@@ -1131,16 +1131,13 @@ function index($sa = null)
                 Yii::app()->session['flashmessage'] = $clang->gT("Error:").'<br>'.$clang->gT("Survey could not be updated.");
             }
 
-
-            //redirect(site_url('admin/survey/view/'.$surveyid));
-
             if (Yii::app()->request->getPost('action') == "updatesurveysettingsandeditlocalesettings")
             {
-                $this->getController()->redirect($this->getController()->createUrl('/admin/survey/editlocalsettings/surveyid/'.$surveyid));
+                $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/editlocalsettings/surveyid/'.$surveyid));
             }
             else
             {
-                $this->getController()->redirect($this->getController()->createUrl('/admin/survey/view/surveyid/'.$surveyid));
+                $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/'.$surveyid));
             }
 
         }

diff --git a/application/controllers/admin/emailtemplates.php b/application/controllers/admin/emailtemplates.php
@@ -109,7 +109,7 @@ function update($iSurveyId)
             }
             Yii::app()->session['flashmessage'] = $clang->gT("Email templates successfully saved.");
         }
-        $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/'.$iSurveyId));
+        $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/'.$iSurveyId));
     }
 
 

diff --git a/application/controllers/admin/index.php b/application/controllers/admin/index.php
@@ -35,7 +35,7 @@ public function run()
 		}
         else
         {
-            Yii::app()->request->redirect(Yii::app()->getController()->createUrl('admin/survey/index'));
+            Yii::app()->request->redirect(Yii::app()->getController()->createUrl('admin/survey/sa/index'));
         }
 
     }

diff --git a/application/controllers/admin/labels.php b/application/controllers/admin/labels.php
@@ -51,7 +51,7 @@ public function importlabelresources()
         if (!empty($lid))
         {
             if (Yii::app()->getConfig('demoMode'))
-                $this->getController()->error($clang->gT("Demo mode only: Uploading files is disabled in this system."), $this->getController()->createUrl("admin/labels/view/lid/{$lid}"));
+                $this->getController()->error($clang->gT("Demo mode only: Uploading files is disabled in this system."), $this->getController()->createUrl("admin/labels/sa/view/lid/{$lid}"));
 
             // Create temporary directory
             // If dangerous content is unzipped
@@ -65,7 +65,7 @@ public function importlabelresources()
             $zip = new PclZip($zipfilename);
 
             if (!is_writeable($basedestdir))
-                $this->getController()->error(sprintf($clang->gT("Incorrect permissions in your %s folder."), $basedestdir), $this->getController()->createUrl("admin/labels/view/lid/{$lid}"));
+                $this->getController()->error(sprintf($clang->gT("Incorrect permissions in your %s folder."), $basedestdir), $this->getController()->createUrl("admin/labels/sa/view/lid/{$lid}"));
 
             if (!is_dir($destdir))
                 mkdir($destdir);
@@ -76,7 +76,7 @@ public function importlabelresources()
             if (is_file($zipfilename))
             {
                 if ($zip->extract($extractdir) <= 0)
-                    $this->getController()->error($clang->gT("This file is not a valid ZIP file archive. Import failed. " . $zip->errorInfo(true)), $this->getController()->createUrl("admin/labels/view/lid/{$lid}"));
+                    $this->getController()->error($clang->gT("This file is not a valid ZIP file archive. Import failed. " . $zip->errorInfo(true)), $this->getController()->createUrl("admin/labels/sa/view/lid/{$lid}"));
 
                 // now read tempdir and copy authorized files only
                 $folders = array('flash', 'files', 'images');
@@ -94,10 +94,10 @@ public function importlabelresources()
                 unlink($zipfilename);
 
                 if (is_null($aErrorFilesInfo) && is_null($aImportedFilesInfo))
-                    $this->getController()->error($clang->gT("This ZIP archive contains no valid Resources files. Import failed."), $this->getController()->createUrl("admin/labels/view/lid/{$lid}"));
+                    $this->getController()->error($clang->gT("This ZIP archive contains no valid Resources files. Import failed."), $this->getController()->createUrl("admin/labels/sa/view/lid/{$lid}"));
             }
             else
-                $this->getController()->error(sprintf($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."), $basedestdir), $this->getController()->createUrl("admin/labels/view/lid/{$lid}"));
+                $this->getController()->error(sprintf($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."), $basedestdir), $this->getController()->createUrl("admin/labels/sa/view/lid/{$lid}"));
 
             $aData = array(
                 'aErrorFilesInfo' => $aErrorFilesInfo,
@@ -347,9 +347,9 @@ public function process()
 
 
             if ($lid)
-                $this->getController()->redirect($this->getController()->createUrl("admin/labels/view/lid/" . $lid));
+                $this->getController()->redirect($this->getController()->createUrl("admin/labels/sa/view/lid/" . $lid));
             else
-                $this->getController()->redirect($this->getController()->createUrl("admin/labels/view"));
+                $this->getController()->redirect($this->getController()->createUrl("admin/labels/sa/view"));
         }
     }
 

diff --git a/application/controllers/admin/question.php b/application/controllers/admin/question.php
@@ -876,7 +876,7 @@ public function delete($surveyid, $gid, $qid)
                 $message .="<br /><a href='". $this->getController()->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}")."' >".$clang->gT("Look at survey logic files")."</a>.";
                 $this->getController()->error(
                     $message,
-                    $this->getController()->createUrl("admin/survey/view/surveyid/{$surveyid}/gid/{$gid}/qid/{$qid}")
+                    $this->getController()->createUrl("admin/survey/sa/view/surveyid/{$surveyid}/gid/{$gid}/qid/{$qid}")
                     );
             }
             else
@@ -908,12 +908,12 @@ public function delete($surveyid, $gid, $qid)
 
             Yii::app()->session['flashmessage'] = $clang->gT("Question was successfully deleted.");
 
-            $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/' . $surveyid . '/gid/' . $gid));
+            $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/' . $surveyid . '/gid/' . $gid));
         }
         else
         {
             Yii::app()->session['flashmessage'] = $clang->gT("You are not authorized to delete questions.");
-            $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/' . $surveyid . '/gid/' . $gid));
+            $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/' . $surveyid . '/gid/' . $gid));
         }
     }
 

diff --git a/application/controllers/admin/questiongroup.php b/application/controllers/admin/questiongroup.php
@@ -151,7 +151,7 @@ public function insert($surveyid)
                     $errorstring.= getLanguageNameFromCode($grouplang, false) . "\\n";
 
             if ($errorstring != '')
-                $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/' . $surveyid));
+                $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/' . $surveyid));
 
             else
             {
@@ -213,7 +213,7 @@ public function insert($surveyid)
                     $gid = $groupid;
                 Yii::app()->session['flashmessage'] = Yii::app()->lang->gT("New question group was saved.");
             }
-            $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/' . $surveyid . '/gid/' . $gid));
+            $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/' . $surveyid . '/gid/' . $gid));
         }
     }
 
@@ -244,7 +244,7 @@ public function delete($iSurveyId, $iGroupId)
             else
                 Yii::app()->user->setFlash('flashmessage', $clang->gT('Group could not be deleted'));
 
-            $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/' . $iSurveyId));
+            $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/' . $iSurveyId));
 
             LimeExpressionManager::UpgradeConditionsToRelevance($iSurveyId);
         }
@@ -398,7 +398,7 @@ public function update($gid)
             }
 
             Yii::app()->session['flashmessage'] = Yii::app()->lang->gT("Question group successfully saved.");
-            $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/' . $surveyid . '/gid/' . $gid));
+            $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/' . $surveyid . '/gid/' . $gid));
         }
     }
 

diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php
@@ -66,7 +66,7 @@ private function _getData($params)
                 if ($actrow['active'] == 'N') //SURVEY IS NOT ACTIVE YET
                 {
                     Yii::app()->session['flashmessage'] = $clang->gT("This survey has not been activated. There are no results to browse.");
-                    $this->getController()->redirect($this->getController()->createUrl("/admin/survey/view/surveyid/{$iSurveyId}"));
+                    $this->getController()->redirect($this->getController()->createUrl("/admin/survey/sa/view/surveyid/{$iSurveyId}"));
                 }
             }
         }