Merge branch '12.next-cake5' into feature/flash-on-login-cake5

CakeDC · Feb 7, 2024 · 37c9e8c · 37c9e8c
2 parents 88f457c + c5e2c0f
commit 37c9e8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/config/users.php b/config/users.php
@@ -49,6 +49,8 @@
         ],
         'Login' => [
             'flashMessage' => false, // bool
+            'updateLastLogin' => true,
+            'lastLoginField' => 'last_login',
         ],
         'Registration' => [
             // determines if the register is enabled

diff --git a/src/Controller/Component/LoginComponent.php b/src/Controller/Component/LoginComponent.php
@@ -235,10 +235,14 @@ protected function checkSafeHost(?string $queryRedirect = null): bool
      */
     protected function updateLastLogin($user)
     {
+        if (!Configure::read('Users.Login.updateLastLogin', true)) {
+            return;
+        }
+        $field = Configure::read('Users.Login.lastLoginField', 'last_login');
         $now = \Cake\I18n\DateTime::now();
-        $user->set('last_login', $now);
+        $user->set($field, $now);
         $this->getController()->getUsersTable()->updateAll(
-            ['last_login' => $now],
+            [$field => $now->format('Y-m-d H:i:s')],
             ['id' => $user->id]
         );
     }