strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplified code

Browse source
This commit is contained in:
Michael 2021-07-24 13:29:58 +00:00
parent d56793dd09
commit 2420bf84db
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Security/Authentication.php
View file

@ -310,15 +310,6 @@ class Authentication
$a->timezone = $user_record['timezone']; $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'];
}
}
$contact = $this->dba->selectFirst('contact', ['id'], ['uid' => $user_record['uid'], 'self' => true]); $contact = $this->dba->selectFirst('contact', ['id'], ['uid' => $user_record['uid'], 'self' => true]);
if ($this->dba->isResult($contact)) { if ($this->dba->isResult($contact)) {
$a->contact_id = $contact['id']; $a->contact_id = $contact['id'];
@ -331,10 +322,8 @@ class Authentication
$this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $user_record['uid']]); $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $user_record['uid']]);
// Set the login date for all identities of the user // Set the login date for all identities of the user
if (!empty($masterUid)) { $this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()],
$this->dba->update('user', ['login_date' => DateTimeFormat::utcNow()], ['parent-uid' => $user_record['uid'], 'account_removed' => false]);
['parent-uid' => $masterUid, 'account_removed' => false]);
}
} }
if ($login_initial) { if ($login_initial) {