mirror of
https://github.com/friendica/friendica
synced 2024-12-23 09:20:17 +00:00
Add explicit parameter to IHandleUserSession->setvisitorContacts
- Convert some remaining $_SESSION references to object calls - Address part of https://github.com/friendica/friendica/issues/12486#issuecomment-1428489772
This commit is contained in:
parent
2fdf39e8b8
commit
b268fa60e7
4 changed files with 18 additions and 12 deletions
|
@ -109,6 +109,8 @@ interface IHandleUserSessions extends IHandleSessions
|
|||
|
||||
/**
|
||||
* Set the session variable that contains the contact IDs for the visitor's contact URL
|
||||
*
|
||||
* @param string $my_url
|
||||
*/
|
||||
public function setVisitorsContacts();
|
||||
public function setVisitorsContacts(string $my_url);
|
||||
}
|
||||
|
|
|
@ -140,9 +140,9 @@ class UserSession implements IHandleUserSessions
|
|||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
public function setVisitorsContacts()
|
||||
public function setVisitorsContacts(string $my_url)
|
||||
{
|
||||
$this->session->set('remote', Contact::getVisitorByUrl($this->session->get('my_url')));
|
||||
$this->session->set('remote', Contact::getVisitorByUrl($my_url));
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
|
|
|
@ -795,14 +795,16 @@ class Profile
|
|||
$visitor = Contact::getById($cid);
|
||||
|
||||
// Authenticate the visitor.
|
||||
$_SESSION['authenticated'] = 1;
|
||||
$_SESSION['visitor_id'] = $visitor['id'];
|
||||
$_SESSION['visitor_handle'] = $visitor['addr'];
|
||||
$_SESSION['visitor_home'] = $visitor['url'];
|
||||
$_SESSION['my_url'] = $visitor['url'];
|
||||
$_SESSION['remote_comment'] = $visitor['subscribe'];
|
||||
DI::userSession()->setMultiple([
|
||||
'authenticated' => 1,
|
||||
'visitor_id' => $visitor['id'],
|
||||
'visitor_handle' => $visitor['addr'],
|
||||
'visitor_home' => $visitor['url'],
|
||||
'my_url' => $visitor['url'],
|
||||
'remote_comment' => $visitor['subscribe'],
|
||||
]);
|
||||
|
||||
DI::userSession()->setVisitorsContacts();
|
||||
DI::userSession()->setVisitorsContacts($visitor['url']);
|
||||
|
||||
$a->setContactId($visitor['id']);
|
||||
|
||||
|
|
|
@ -323,19 +323,21 @@ class Authentication
|
|||
*/
|
||||
public function setForUser(App $a, array $user_record, bool $login_initial = false, bool $interactive = false, bool $login_refresh = false)
|
||||
{
|
||||
$my_url = $this->baseUrl . '/profile/' . $user_record['nickname'];
|
||||
|
||||
$this->session->setMultiple([
|
||||
'uid' => $user_record['uid'],
|
||||
'theme' => $user_record['theme'],
|
||||
'mobile-theme' => $this->pConfig->get($user_record['uid'], 'system', 'mobile_theme'),
|
||||
'authenticated' => 1,
|
||||
'page_flags' => $user_record['page-flags'],
|
||||
'my_url' => $this->baseUrl . '/profile/' . $user_record['nickname'],
|
||||
'my_url' => $my_url,
|
||||
'my_address' => $user_record['nickname'] . '@' . substr($this->baseUrl, strpos($this->baseUrl, '://') + 3),
|
||||
'addr' => $this->remoteAddress,
|
||||
'nickname' => $user_record['nickname'],
|
||||
]);
|
||||
|
||||
$this->session->setVisitorsContacts();
|
||||
$this->session->setVisitorsContacts($my_url);
|
||||
|
||||
$member_since = strtotime($user_record['register_date']);
|
||||
$this->session->set('new_member', time() < ($member_since + (60 * 60 * 24 * 14)));
|
||||
|
|
Loading…
Reference in a new issue