Fix out-of-survey frontend.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12054 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 14, 2012 · 282564e · 282564e
1 parent 4f63019
commit 282564e
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/application/controllers/SurveyAction.php b/application/controllers/SurveyAction.php
@@ -712,13 +712,12 @@ function sendreq(surveyid)
             }
         }
 
-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'previewgroup')){
+        if (isset($param['action']) && $param['action'] == 'previewgroup')
+        {
                 $thissurvey['format'] = 'G';
                 buildsurveysession();
         }
 
-        $rooturl = Yii::app()->baseUrl;
-
         sendcacheheaders();
 
         //Send local variables to the appropriate survey type
@@ -766,12 +765,11 @@ function _getParameters($args = array(), $post = array())
         }
 
         if( !isset($param['action']) )
-            $param['action'] = isset($post['action']) ? $post['action'] : null;
+            $param['action'] = returnglobal('action');
         if( !isset($param['newtest']) )
-            $param['newtest'] = isset($post['newtest']) ? $post['newtest'] : null;
+            $param['newtest'] = returnglobal('newtest');
         if( !isset($param['gid']) )
-            $param['gid'] = isset($post['gid']) ? $post['gid'] : null;
-
+            $param['gid'] = returnglobal('gid');
         if ( !isset($param['sid']) )
             $param['sid'] = returnglobal('sid');
         if ( !isset($param['loadname']) )
@@ -1003,14 +1001,18 @@ function _loadRequiredHelpersAndLibraries()
 
     function _loadLimesurveyLang($mvSurveyIdOrBaseLang)
     {
-        if ( is_int($mvSurveyIdOrBaseLang) )
+        if (is_int($mvSurveyIdOrBaseLang))
         {
             $baselang = Survey::model()->findByPk($surveyId)->language;
         }
-        else
+        elseif (!empty($mvSurveyIdOrBaseLang))
         {
             $baselang = $mvSurveyIdOrBaseLang;
         }
+        else
+        {
+            $baselang = Yii::app()->getConfig('defaultlang');
+        }
 
         Yii::import("application.libraries.Limesurvey_lang");
 
@@ -1111,7 +1113,6 @@ function _niceExit(&$redata, $iDebugLine, $sTemplateDir = null, $asMessage = arr
 
     function _createNewUserSessionAndRedirect($surveyId, &$redata, $iDebugLine, $asMessage = array())
     {
-        $baselang = Survey::model()->findByPk($surveyId)->language;
         $clang = Yii::app()->lang;
         // Let's first regenerate a session id
         killSession();