Merge pull request #9160 from MrPetovan/bug/9138-escape-field-input

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

diff --git a/src/Core/Session.php b/src/Core/Session.php
index 0af4d344b11337c019bc27ea3bdba480aa09ab86..b15b53c4eef4ecc04e709a6f7b9b9f3d39dd6f09 100644 (file)
--- a/src/Core/Session.php
+++ b/src/Core/Session.php
@@ -1,8 +1,24 @@
 <?php
-
 /**
- * @file src/Core/Session.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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;
@@ -12,8 +28,6 @@ use Friendica\Util\Strings;
 
 /**
  * High-level Session service class
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Session
 {
@@ -51,10 +65,10 @@ class Session
        }
 
        /**
-        * 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)
        {
@@ -97,7 +111,7 @@ class Session
 
                $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;
                        }