Remove most calls to date_default_timezone_* calls

[friendica.git] / src / Security / Authentication.php

diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index 3945ac8fdb7ffe05b206070984cac6265eb85223..c0dc1e9aa7402144a632b2a65a8c22cc062fd531 100644 (file)
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -39,7 +39,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use LightOpenID;
 use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -142,9 +141,9 @@ class Authentication
 
                if ($this->session->get('authenticated')) {
                        if ($this->session->get('visitor_id') && !$this->session->get('uid')) {
-                               $contact = $this->dba->selectFirst('contact', [], ['id' => $this->session->get('visitor_id')]);
+                               $contact = $this->dba->selectFirst('contact', ['id'], ['id' => $this->session->get('visitor_id')]);
                                if ($this->dba->isResult($contact)) {
-                                       $a->contact = $contact;
+                                       $a->setContactId($contact['id']);
                                }
                        }
 
@@ -306,32 +305,12 @@ class Authentication
                $this->session->set('new_member', time() < ($member_since + (60 * 60 * 24 * 14)));
 
                if (strlen($user_record['timezone'])) {
-                       date_default_timezone_set($user_record['timezone']);
-                       $a->timezone = $user_record['timezone'];
+                       $a->setTimeZone($user_record['timezone']);
                }
 
-               $masterUid = $user_record['uid'];
-
-               if ($this->session->get('submanage')) {
-                       $user = $this->dba->selectFirst('user', ['uid'], ['uid' => $this->session->get('submanage')]);
-                       if ($this->dba->isResult($user)) {
-                               $masterUid = $user['uid'];
-                       }
-               }
-
-               $a->identities = User::identities($masterUid);
-
-               if ($login_initial) {
-                       $this->logger->info('auth_identities: ' . print_r($a->identities, true));
-               }
-
-               if ($login_refresh) {
-                       $this->logger->info('auth_identities refresh: ' . print_r($a->identities, true));
-               }
-
-               $contact = $this->dba->selectFirst('contact', [], ['uid' => $user_record['uid'], 'self' => true]);
+               $contact = $this->dba->selectFirst('contact', ['id'], ['uid' => $user_record['uid'], 'self' => true]);
                if ($this->dba->isResult($contact)) {
-                       $a->contact = $contact;
+                       $a->setContactId($contact['id']);
                        $this->session->set('cid', $contact['id']);
                }
 
@@ -341,10 +320,8 @@ class Authentication
                        $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $user_record['uid']]);
 
                        // Set the login date for all identities of the user
-                       if (!empty($masterUid)) {
-                               $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()],
-                                       ['parent-uid' => $masterUid, 'account_removed' => false]);
-                       }
+                       $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()],
+                               ['parent-uid' => $user_record['uid'], 'account_removed' => false]);
                }
 
                if ($login_initial) {
@@ -364,7 +341,7 @@ class Authentication
                        }
                }
 
-               $this->redirectForTwoFactorAuthentication($user_record['uid'], $a);
+               $this->redirectForTwoFactorAuthentication($user_record['uid']);
 
                if ($interactive) {
                        if ($user_record['login_date'] <= DBA::NULL_DATETIME) {
@@ -374,10 +351,11 @@ class Authentication
                        }
                }
 
-               $a->user = $user_record;
+               $a->setLoggedInUserId($user_record['uid']);
+               $a->setLoggedInUserNickname($user_record['nickname']);
 
                if ($login_initial) {
-                       Hook::callAll('logged_in', $a->user);
+                       Hook::callAll('logged_in', $user_record);
 
                        if (DI::module()->getName() !== 'home' && $this->session->exists('return_path')) {
                                $this->baseUrl->redirect($this->session->get('return_path'));
@@ -390,12 +368,11 @@ class Authentication
         * All return calls in this method skip two-factor authentication
         *
         * @param int $uid The User Identified
-        * @param App $a   The Friendica Application context
         *
         * @throws HTTPException\ForbiddenException In case the two factor authentication is forbidden (e.g. for AJAX calls)
         * @throws HTTPException\InternalServerErrorException
         */
-       private function redirectForTwoFactorAuthentication(int $uid, App $a)
+       private function redirectForTwoFactorAuthentication(int $uid)
        {
                // Check user setting, if 2FA disabled return
                if (!$this->pConfig->get($uid, '2fa', 'verified')) {
@@ -403,7 +380,7 @@ class Authentication
                }
 
                // Check current path, if public or 2fa module return
-               if ($a->argc > 0 && in_array($a->argv[0], ['2fa', 'view', 'help', 'api', 'proxy', 'logout'])) {
+               if (DI::args()->getArgc() > 0 && in_array(DI::args()->getArgv()[0], ['2fa', 'view', 'help', 'api', 'proxy', 'logout'])) {
                        return;
                }