Merge pull request #11506 from annando/featured-worker

[friendica.git] / src / Core / Session.php

diff --git a/src/Core/Session.php b/src/Core/Session.php
index ef26cd929edc1dfd69f73b1f7f7004c8d6ee470e..aa8de99d5cf2f47ea06d86981700ffa81fde9e13 100644 (file)
--- a/src/Core/Session.php
+++ b/src/Core/Session.php
@@ -1,69 +1,92 @@
 <?php
-
 /**
- * @file src/Core/Session.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\BaseObject;
-use Friendica\Core\Session\ISession;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Util\Strings;
 
 /**
  * High-level Session service class
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class Session extends BaseObject
+class Session
 {
        public static $exists = false;
        public static $expire = 180000;
 
        public static function exists($name)
        {
-               return self::getClass(ISession::class)->exists($name);
+               return DI::session()->exists($name);
        }
 
        public static function get($name, $defaults = null)
        {
-               return self::getClass(ISession::class)->get($name, $defaults);
+               return DI::session()->get($name, $defaults);
        }
 
        public static function set($name, $value)
        {
-               self::getClass(ISession::class)->set($name, $value);
+               DI::session()->set($name, $value);
        }
 
        public static function setMultiple(array $values)
        {
-               self::getClass(ISession::class)->setMultiple($values);
+               DI::session()->setMultiple($values);
        }
 
        public static function remove($name)
        {
-               self::getClass(ISession::class)->remove($name);
+               DI::session()->remove($name);
        }
 
        public static function clear()
        {
-               self::getClass(ISession::class)->clear();
+               DI::session()->clear();
        }
 
        /**
-        * Returns contact ID for given user ID
+        * Return the user contact ID of a visitor for the given user ID they are visiting
         *
         * @param integer $uid User ID
-        * @return integer Contact ID of visitor for given user ID
+        * @return integer
         */
        public static function getRemoteContactID($uid)
        {
-               if (empty($_SESSION['remote'][$uid])) {
-                       return false;
+               $session = DI::session();
+
+               if (!empty($session->get('remote')[$uid])) {
+                       $remote = $session->get('remote')[$uid];
+               } else {
+                       $remote = 0;
                }
 
-               return $_SESSION['remote'][$uid];
+               $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;
        }
 
        /**
@@ -74,11 +97,13 @@ class Session extends BaseObject
         */
        public static function getUserIDForVisitorContactID($cid)
        {
-               if (empty($_SESSION['remote'])) {
+               $session = DI::session();
+
+               if (empty($session->get('remote'))) {
                        return false;
                }
 
-               return array_search($cid, $_SESSION['remote']);
+               return array_search($cid, $session->get('remote'));
        }
 
        /**
@@ -88,17 +113,20 @@ class Session extends BaseObject
         */
        public static function setVisitorsContacts()
        {
-               $_SESSION['remote'] = [];
+               $session = DI::session();
 
-               $remote_contacts = DBA::select('contact', ['id', 'uid'], ['nurl' => Strings::normaliseLink($_SESSION['my_url']), 'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'self' => false]);
+               $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::isBlockedByUser($contact['id'], $contact['uid'])) {
+                       if (($contact['uid'] == 0) || Contact\User::isBlocked($contact['id'], $contact['uid'])) {
                                continue;
                        }
-
-                       $_SESSION['remote'][$contact['uid']] = $contact['id'];
+                       $remote[$contact['uid']] = $contact['id'];
                }
                DBA::close($remote_contacts);
+               $session->set('remote', $remote);
        }
 
        /**
@@ -108,15 +136,8 @@ class Session extends BaseObject
         */
        public static function isAuthenticated()
        {
-               if (empty($_SESSION['authenticated'])) {
-                       return false;
-               }
+               $session = DI::session();
 
-               return $_SESSION['authenticated'];
-       }
-
-       public static function delete()
-       {
-               self::getClass(ISession::class)->delete();
+               return $session->get('authenticated', false);
        }
 }