Fixed issue #7329: Login error notice: langcode param not defined if …

…authentication by webserver is activated
LimeSurvey · Mar 8, 2013 · dbad629 · dbad629
1 parent ac80450
commit dbad629
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/application/controllers/admin/authentication.php b/application/controllers/admin/authentication.php
@@ -299,13 +299,13 @@ private function _setSessionData($user)
     */
     private function _setLanguageSettings($user)
     {
-        if (Yii::app()->request->getPost('loginlang') != 'default')
+        if (Yii::app()->request->getPost('loginlang','default') != 'default')
         {
             $user->lang = sanitize_languagecode(Yii::app()->request->getPost('loginlang'));
             $user->save();
             $sLanguage=$user->lang;
         }
-        else if ($user->lang=='auto')
+        else if ($user->lang=='auto' || $user->lang=='')
         {
             $sLanguage= getBrowserLanguage();
         }

diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php
@@ -18,7 +18,7 @@ class Tokens_dynamic extends LSActiveRecord
 {
 	protected static $sid = 0;
 
-    public $emailstatus='OK'; // Defaul value for email status
+    public $emailstatus='OK'; // Default value for email status
 
     /**
      * Returns the static model of Settings table

diff --git a/application/models/User.php b/application/models/User.php
@@ -15,6 +15,12 @@
 
 class User extends CActiveRecord
 {
+    /**
+    * @var string Default value for user language
+    */
+    public $lang='auto';
+
+
     /**
     * Returns the static model of Settings table
     *
@@ -86,6 +92,11 @@ public function getAllRecords($condition=FALSE)
 
         return $data;
     }
+    /**
+    * 
+    * 
+    * @param mixed $postuserid
+    */
     function parentAndUser($postuserid)
     {
         $user = Yii::app()->db->createCommand()