Dev Several installer fixes.

LimeSurvey · Feb 20, 2015 · be273a8 · be273a8
1 parent 52b72d6
commit be273a8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 34 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -6,8 +6,10 @@
  *
  */
 
-if (file_exists(dirname(__FILE__) .  '/config.php')) {
-    $userConfig = require(dirname(__FILE__) . '/config.php');
+if (file_exists(__DIR__ . '/config.php')) {
+    $userConfig = require(__DIR__ . '/config.php');
+} else {
+    $userConfig = [];
 }
 @date_default_timezone_set(@date_default_timezone_get());
 $internalConfig = array(

diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -15,6 +15,7 @@
 
 namespace ls\controllers;
 use \Yii;
+use PreCheck, InstallerConfigForm, User;
 /**
 * Installer
 *
@@ -43,37 +44,18 @@ class InstallerController extends \CController {
     public $progress = 0;
 
     public $stepTitle = '';
-    public function run($action = 'index')
-    {
-
-        self::_sessioncontrol();
-        parent::run($action);
-    }
-
-
-    /**
-    * Load and set session vars
-    *
-    * @access protected
-    * @return void
-    */
-    protected function _sessioncontrol()
-    {
-        if (empty(Yii::app()->session['installerLang']))
-            Yii::app()->session['installerLang'] = 'en';
-        Yii::app()->setLanguage(Yii::app()->session['installerLang']);
-    }
-
+
     /**
     * welcome and language selection install step
     */
     public function actionIndex()
     {
         App()->session->destroy();
-        if (!is_null(Yii::app()->request->getPost('installerLang')))
-        {
-            Yii::app()->session['installerLang'] = Yii::app()->request->getPost('installerLang');
-            $this->redirect(array('installer/license'));
+
+        if (App()->request->isPostRequest) {
+            App()->setLanguage(App()->request->getPost('installerLang'));
+            $this->redirect(['installer/license']);
+            die('no');
         }
         App()->loadHelper('surveytranslator');
 
@@ -101,11 +83,8 @@ public function actionIndex()
     */
     public function actionLicense()
     {
-
-        // $aData array contain all the information required by view.
         $this->stepTitle = gT('License');
-//        $aData['descp'] = gT('GNU General Public License:');
-        $this->progress = 15;
+      $this->progress = 15;
 
         if (App()->request->isPostRequest) {
             $this->redirect(array('installer/precheck'));
@@ -114,7 +93,6 @@ public function actionLicense()
          * Load PreCheck model here to allow it to check session stuff.
          */
         new PreCheck();
-
         $this->render('license');
     }
     /**

diff --git a/application/core/WebApplication.php b/application/core/WebApplication.php
@@ -87,7 +87,10 @@ public function initLanguage()
     {
         // Set language to use.
         if ($this->request->getParam('lang') !== null) {
-            $this->setLanguage($this->request->getParam('lang'));
+            $this->session->add('language', $this->request->getParam('lang'));
+        }
+        if (isset($this->session['language'])) {
+            $this->setLanguage($this->session['language']);
         }
     }
     /**
@@ -222,7 +225,7 @@ public function getPluginManager()
 	 */
 	public function runController($route) {
         $file_name = __DIR__ . '/../config/config.php';
-        if (!file_exists($file_name) && $route != 'installer') {
+        if (!file_exists($file_name) && substr_compare('installer', $route, 0, 9) != 0) {
 			$this->request->redirect($this->urlManager->createUrl('/installer'));
         }
         return parent::runController($route);