Remove Core\Session

diff --git a/src/Core/Session.php b/src/Core/Session.php
deleted file mode 100644 (file)
index d39db48..0000000
--- a/src/Core/Session.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-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 356d53845ae3b8ebfb39e2167a181074bdac647d..cedbccb22c73c6d0878c62e27be13db5553195dd 100644 (file)
--- 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 91ffa97e231c761884c2476f53d0bdadd3ffcdb2..b0757dab47f8fd8132b54f27ddf465fc10b74e8b 100644 (file)
--- 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 f63821581223a4ce9c9b2554330f22a4f5e94b1e..ec1c6b55bc6e17091278009701b967f92bab21b7 100644 (file)
--- 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 94b6a35b71286b1dd733f6c593efc28a3343b70d..6f93436b71bee7a96de1107544348caf67d768eb 100644 (file)
--- 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;