X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSecurity%2FAuthentication.php;h=3ad9a28999ae59819c45238b7f3821890744034e;hb=8f460644306bcad39a2bd901eb2b9df388716df9;hp=ce101477e0a2ee043764ea18b70ac98c8d0ad970;hpb=7155f825daf90f4113ba3e8755eb51898b8e5736;p=friendica.git

diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index ce101477e0..3ad9a28999 100644
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -142,9 +142,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']);
 				}
 			}
 
@@ -310,30 +310,10 @@ class Authentication
 			$a->timezone = $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->cid     = $contact['id'];
-			$this->session->set('cid', $a->cid);
+			$a->setContactId($contact['id']);
+			$this->session->set('cid', $contact['id']);
 		}
 
 		header('X-Account-Management-Status: active; name="' . $user_record['username'] . '"; id="' . $user_record['nickname'] . '"');
@@ -342,10 +322,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) {