Merge pull request #6224 from annando/dba-delete-contact

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

diff --git a/src/Core/Authentication.php b/src/Core/Authentication.php
index 5371cc91ecb42e23d3b9e372d30819c615b35812..ca5ec3fd08b79fcf26b7261182d51aef88a29d4d 100644 (file)
--- a/src/Core/Authentication.php
+++ b/src/Core/Authentication.php
@@ -9,8 +9,10 @@ use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 
 /**
@@ -102,61 +104,22 @@ class Authentication extends BaseObject
                        $a->timezone = $a->user['timezone'];
                }
 
-               $master_record = $a->user;
+               $masterUid = $user_record['uid'];
 
-               if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
-                       $user = DBA::selectFirst('user', [], ['uid' => $_SESSION['submanage']]);
+               if (!empty($_SESSION['submanage'])) {
+                       $user = DBA::selectFirst('user', ['uid'], ['uid' => $_SESSION['submanage']]);
                        if (DBA::isResult($user)) {
-                               $master_record = $user;
+                               $masterUid = $user['uid'];
                        }
                }
 
-               if ($master_record['parent-uid'] == 0) {
-                       // First add our own entry
-                       $a->identities = [['uid' => $master_record['uid'],
-                                       'username' => $master_record['username'],
-                                       'nickname' => $master_record['nickname']]];
-
-                       // Then add all the children
-                       $r = DBA::select('user', ['uid', 'username', 'nickname'],
-                               ['parent-uid' => $master_record['uid'], 'account_removed' => false]);
-                       if (DBA::isResult($r)) {
-                               $a->identities = array_merge($a->identities, DBA::toArray($r));
-                       }
-               } else {
-                       // Just ensure that the array is always defined
-                       $a->identities = [];
-
-                       // First entry is our parent
-                       $r = DBA::select('user', ['uid', 'username', 'nickname'],
-                               ['uid' => $master_record['parent-uid'], 'account_removed' => false]);
-                       if (DBA::isResult($r)) {
-                               $a->identities = DBA::toArray($r);
-                       }
-
-                       // Then add all siblings
-                       $r = DBA::select('user', ['uid', 'username', 'nickname'],
-                               ['parent-uid' => $master_record['parent-uid'], 'account_removed' => false]);
-                       if (DBA::isResult($r)) {
-                               $a->identities = array_merge($a->identities, DBA::toArray($r));
-                       }
-               }
-
-               $r = DBA::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
-                       FROM `manage`
-                       INNER JOIN `user` ON `manage`.`mid` = `user`.`uid`
-                       WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?",
-                       $master_record['uid']
-               );
-               if (DBA::isResult($r)) {
-                       $a->identities = array_merge($a->identities, DBA::toArray($r));
-               }
+               $a->identities = User::identities($masterUid);
 
                if ($login_initial) {
-                       logger('auth_identities: ' . print_r($a->identities, true), LOGGER_DEBUG);
+                       Logger::log('auth_identities: ' . print_r($a->identities, true), Logger::DEBUG);
                }
                if ($login_refresh) {
-                       logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
+                       Logger::log('auth_identities refresh: ' . print_r($a->identities, true), Logger::DEBUG);
                }
 
                $contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]);
@@ -173,7 +136,7 @@ class Authentication extends BaseObject
 
                        // Set the login date for all identities of the user
                        DBA::update('user', ['login_date' => DateTimeFormat::utcNow()],
-                               ['parent-uid' => $master_record['uid'], 'account_removed' => false]);
+                               ['parent-uid' => $masterUid, 'account_removed' => false]);
                }
 
                if ($login_initial) {
@@ -184,7 +147,7 @@ class Authentication extends BaseObject
                         * The week ensures that sessions will expire after some inactivity.
                         */
                        if (!empty($_SESSION['remember'])) {
-                               logger('Injecting cookie for remembered user ' . $a->user['nickname']);
+                               Logger::log('Injecting cookie for remembered user ' . $a->user['nickname']);
                                self::setCookie(604800, $user_record);
                                unset($_SESSION['remember']);
                        }