clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use Contact::select() instead of DBA::select(‘contact) in Core\Session 

- Replace remaining occurrences of $_SESSION with Session methods
This commit is contained in:
Hypolite Petovan 2019-05-13 13:33:20 -04:00
parent a14f868134
commit e077f30d51
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Session.php
View File

@ -9,6 +9,7 @@ use Friendica\App;
use Friendica\Core\Session\CacheSessionHandler; use Friendica\Core\Session\CacheSessionHandler;
use Friendica\Core\Session\DatabaseSessionHandler; use Friendica\Core\Session\DatabaseSessionHandler;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\BaseURL; use Friendica\Util\BaseURL;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -137,8 +138,8 @@ class Session
$masterUid = $user_record['uid']; $masterUid = $user_record['uid'];
if (!empty($_SESSION['submanage'])) { if (self::get('submanage')) {
$user = DBA::selectFirst('user', ['uid'], ['uid' => $_SESSION['submanage']]); $user = DBA::selectFirst('user', ['uid'], ['uid' => self::get('submanage')]);
if (DBA::isResult($user)) { if (DBA::isResult($user)) {
$masterUid = $user['uid']; $masterUid = $user['uid'];
} }
@ -154,7 +155,7 @@ class Session
$a->getLogger()->info('auth_identities refresh: ' . print_r($a->identities, true)); $a->getLogger()->info('auth_identities refresh: ' . print_r($a->identities, true));
} }
$contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]); $contact = Contact::select([], ['uid' => $user_record['uid'], 'self' => true]);
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$a->contact = $contact; $a->contact = $contact;
$a->cid = $contact['id']; $a->cid = $contact['id'];
@ -164,7 +165,7 @@ class Session
header('X-Account-Management-Status: active; name="' . $user_record['username'] . '"; id="' . $user_record['nickname'] . '"'); header('X-Account-Management-Status: active; name="' . $user_record['username'] . '"; id="' . $user_record['nickname'] . '"');
if ($login_initial || $login_refresh) { if ($login_initial || $login_refresh) {
DBA::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]); 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
DBA::update('user', ['login_date' => DateTimeFormat::utcNow()], DBA::update('user', ['login_date' => DateTimeFormat::utcNow()],