From a9963dc54beb8c36886012ad388299009778e757 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 21 Oct 2022 19:36:42 +0200 Subject: [PATCH] Remove Core\Session --- src/Core/Session.php | 172 ----------------------------- src/Module/Admin/Users/Blocked.php | 1 - src/Module/Admin/Users/Index.php | 1 - src/Module/Contact/Profile.php | 1 - tests/FixtureTest.php | 1 - 5 files changed, 176 deletions(-) delete mode 100644 src/Core/Session.php diff --git a/src/Core/Session.php b/src/Core/Session.php deleted file mode 100644 index d39db4861..000000000 --- a/src/Core/Session.php +++ /dev/null @@ -1,172 +0,0 @@ -. - * - */ - -namespace Friendica\Core; - -use Friendica\Database\DBA; -use Friendica\DI; -use Friendica\Model\Contact; -use Friendica\Util\Strings; - -/** - * High-level Session service class - */ -class Session -{ - /** - * Returns the user id of locally logged in user or false. - * - * @return int|bool user id or false - */ - public static function getLocalUser() - { - $session = DI::session(); - - if (!empty($session->get('authenticated')) && !empty($session->get('uid'))) { - return intval($session->get('uid')); - } - - return false; - } - - /** - * Returns the public contact id of logged in user or false. - * - * @return int|bool public contact id or false - */ - public static function getPublicContact() - { - static $public_contact_id = false; - - $session = DI::session(); - - if (!$public_contact_id && !empty($session->get('authenticated'))) { - if (!empty($session->get('my_address'))) { - // Local user - $public_contact_id = intval(Contact::getIdForURL($session->get('my_address'), 0, false)); - } elseif (!empty($session->get('visitor_home'))) { - // Remote user - $public_contact_id = intval(Contact::getIdForURL($session->get('visitor_home'), 0, false)); - } - } elseif (empty($session->get('authenticated'))) { - $public_contact_id = false; - } - - return $public_contact_id; - } - - /** - * Returns public contact id of authenticated site visitor or false - * - * @return int|bool visitor_id or false - */ - public static function getRemoteUser() - { - $session = DI::session(); - - if (empty($session->get('authenticated'))) { - return false; - } - - if (!empty($session->get('visitor_id'))) { - return intval($session->get('visitor_id')); - } - - return false; - } - - /** - * Return the user contact ID of a visitor for the given user ID they are visiting - * - * @param integer $uid User ID - * @return integer - */ - public static function getRemoteContactID($uid) - { - $session = DI::session(); - - if (!empty($session->get('remote')[$uid])) { - $remote = $session->get('remote')[$uid]; - } else { - $remote = 0; - } - - $local_user = !empty($session->get('authenticated')) ? $session->get('uid') : 0; - - if (empty($remote) && ($local_user != $uid) && !empty($my_address = $session->get('my_address'))) { - $remote = Contact::getIdForURL($my_address, $uid, false); - } - - return $remote; - } - - /** - * Returns User ID for given contact ID of the visitor - * - * @param integer $cid Contact ID - * @return integer User ID for given contact ID of the visitor - */ - public static function getUserIDForVisitorContactID($cid) - { - $session = DI::session(); - - if (empty($session->get('remote'))) { - return false; - } - - return array_search($cid, $session->get('remote')); - } - - /** - * Set the session variable that contains the contact IDs for the visitor's contact URL - * - * @param string $url Contact URL - */ - public static function setVisitorsContacts() - { - $session = DI::session(); - - $session->set('remote', []); - $remote = []; - - $remote_contacts = DBA::select('contact', ['id', 'uid'], ['nurl' => Strings::normaliseLink($session->get('my_url')), 'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'self' => false]); - while ($contact = DBA::fetch($remote_contacts)) { - if (($contact['uid'] == 0) || Contact\User::isBlocked($contact['id'], $contact['uid'])) { - continue; - } - $remote[$contact['uid']] = $contact['id']; - } - DBA::close($remote_contacts); - $session->set('remote', $remote); - } - - /** - * Returns if the current visitor is authenticated - * - * @return boolean "true" when visitor is either a local or remote user - */ - public static function isAuthenticated() - { - $session = DI::session(); - - return $session->get('authenticated', false); - } -} diff --git a/src/Module/Admin/Users/Blocked.php b/src/Module/Admin/Users/Blocked.php index 356d53845..cedbccb22 100644 --- a/src/Module/Admin/Users/Blocked.php +++ b/src/Module/Admin/Users/Blocked.php @@ -23,7 +23,6 @@ namespace Friendica\Module\Admin\Users; use Friendica\Content\Pager; use Friendica\Core\Renderer; -use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php index 91ffa97e2..b0757dab4 100644 --- a/src/Module/Admin/Users/Index.php +++ b/src/Module/Admin/Users/Index.php @@ -23,7 +23,6 @@ namespace Friendica\Module\Admin\Users; use Friendica\Content\Pager; use Friendica\Core\Renderer; -use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php index f63821581..ec1c6b55b 100644 --- a/src/Module/Contact/Profile.php +++ b/src/Module/Contact/Profile.php @@ -34,7 +34,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; diff --git a/tests/FixtureTest.php b/tests/FixtureTest.php index 94b6a35b7..6f93436b7 100644 --- a/tests/FixtureTest.php +++ b/tests/FixtureTest.php @@ -27,7 +27,6 @@ use Friendica\App\Arguments; use Friendica\App\Router; use Friendica\Core\Config\ValueObject\Cache; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Session; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\Database\Database; use Friendica\Database\DBStructure;