Dev Renamed lastLogin field

LimeSurvey · Mar 26, 2021 · 0556d22 · olleharstedt · Mar 26, 2021 · olleharstedt
1 parent 43c52d3
commit 0556d22
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -12,7 +12,7 @@
  */
 
 $config['versionnumber'] = '4.4.14';
-$config['dbversionnumber'] = 442;
+$config['dbversionnumber'] = 443;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;

diff --git a/application/core/LSUserIdentity.php b/application/core/LSUserIdentity.php
@@ -179,7 +179,7 @@ protected function postLogin()
         }
 
         //At last store the login time in the user table
-        $user->lastLogin = date('Y-m-d H:i:s');
+        $user->last_login = date('Y-m-d H:i:s');
         $user->save();
     }
 

diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -3783,6 +3783,11 @@ function ($v) {
             $oDB->createCommand()->update('{{settings_global}}', array('stg_value' => 442), "stg_name='DBVersion'");
             $oTransaction->commit();
         }
+        if ($iOldDBVersion < 443) {
+            $oDB->createCommand()->renameColumn('{{users}}', 'lastLogin', 'last_login');
+            $oDB->createCommand()->update('{{settings_global}}', array('stg_value' => 443), "stg_name='DBVersion'");
+            $oTransaction->commit();
+        }
     } catch (Exception $e) {
         Yii::app()->setConfig('Updating', false);
         $oTransaction->rollback();

diff --git a/application/models/User.php b/application/models/User.php
@@ -122,7 +122,7 @@ public function attributeLabels()
             'dateformat' => gT('Date format'),
             'created' => gT('Created at'),
             'modified' => gT('Modified at'),
-            'lastLogin' => gT('Last recorded login'),
+            'last_login' => gT('Last recorded login'),
         ];
     }
 
@@ -741,7 +741,7 @@ function ($oRoleMapping) {
     public function getLastloginFormatted()
     {
 
-        $lastLogin = $this->lastLogin;
+        $lastLogin = $this->last_login;
         if ($lastLogin == null) {
             return '---';
         }

diff --git a/installer/create-database.php b/installer/create-database.php
@@ -1061,7 +1061,7 @@ function populateDatabase($oDB)
             'questionselectormode' => "string(7) NOT NULL default 'default'",
             'one_time_pw' => "text",
             'dateformat' => "integer NOT NULL DEFAULT 1",
-            'lastLogin' => "datetime NULL",
+            'last_login' => "datetime NULL",
             'created' => "datetime",
             'modified' => "datetime",
         ), $options);