Move user constants to the user interface class

1 files changed, 8 insertions, 8 deletions

diff --git a/app/Http/RequestHandlers/LoginAction.php b/app/Http/RequestHandlers/LoginAction.php
index 8416fc461e..b42d9397eb 100644
--- a/app/Http/RequestHandlers/LoginAction.php
+++ b/app/Http/RequestHandlers/LoginAction.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2021 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Exception;
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Carbon;
+use Fisharebest\Webtrees\Contracts\UserInterface;
 use Fisharebest\Webtrees\FlashMessages;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Log;
@@ -29,7 +30,6 @@ use Fisharebest\Webtrees\Services\UpgradeService;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\Session;
 use Fisharebest\Webtrees\Tree;
-use Fisharebest\Webtrees\User;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -127,22 +127,22 @@ class LoginAction implements RequestHandlerInterface
             throw new Exception(I18N::translate('The username or password is incorrect.'));
         }
 
-        if ($user->getPreference(User::PREF_IS_EMAIL_VERIFIED) !== '1') {
+        if ($user->getPreference(UserInterface::PREF_IS_EMAIL_VERIFIED) !== '1') {
             Log::addAuthenticationLog('Login failed (not verified by user): ' . $username);
             throw new Exception(I18N::translate('This account has not been verified. Please check your email for a verification message.'));
         }
 
-        if ($user->getPreference(User::PREF_IS_ACCOUNT_APPROVED) !== '1') {
+        if ($user->getPreference(UserInterface::PREF_IS_ACCOUNT_APPROVED) !== '1') {
             Log::addAuthenticationLog('Login failed (not approved by admin): ' . $username);
             throw new Exception(I18N::translate('This account has not been approved. Please wait for an administrator to approve it.'));
         }
 
         Auth::login($user);
         Log::addAuthenticationLog('Login: ' . Auth::user()->userName() . '/' . Auth::user()->realName());
-        Auth::user()->setPreference(User::PREF_TIMESTAMP_ACTIVE, (string) Carbon::now()->unix());
+        Auth::user()->setPreference(UserInterface::PREF_TIMESTAMP_ACTIVE, (string) Carbon::now()->unix());
 
-        Session::put('language', Auth::user()->getPreference(User::PREF_LANGUAGE));
-        Session::put('theme', Auth::user()->getPreference(User::PREF_THEME));
-        I18N::init(Auth::user()->getPreference(User::PREF_LANGUAGE));
+        Session::put('language', Auth::user()->getPreference(UserInterface::PREF_LANGUAGE));
+        Session::put('theme', Auth::user()->getPreference(UserInterface::PREF_THEME));
+        I18N::init(Auth::user()->getPreference(UserInterface::PREF_LANGUAGE));
     }
 }