X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSession.php;h=059cd499c080513d038e0329f1f929b82c59e7e4;hb=f9b7f3acdb92ef87c87007efcec65e38ad31a684;hp=767dcb513ff267584cd252f5cdce5e031c1a5e7b;hpb=c6f2ed667da49fdff546e408f018a0b9fe404256;p=friendica.git

diff --git a/src/Core/Session.php b/src/Core/Session.php
index 767dcb513f..059cd499c0 100644
--- a/src/Core/Session.php
+++ b/src/Core/Session.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -44,6 +44,11 @@ class Session
 		return DI::session()->get($name, $defaults);
 	}
 
+	public static function pop($name, $defaults = null)
+	{
+		return DI::session()->pop($name, $defaults);
+	}
+
 	public static function set($name, $value)
 	{
 		DI::session()->set($name, $value);
@@ -65,20 +70,28 @@ 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)
 	{
 		$session = DI::session();
 
-		if (empty($session->get('remote')[$uid])) {
-			return 0;
+		if (!empty($session->get('remote')[$uid])) {
+			$remote = $session->get('remote')[$uid];
+		} else {
+			$remote = 0;
 		}
 
-		return $session->get('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;
 	}
 
 	/**
@@ -108,16 +121,17 @@ class Session
 		$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;
 			}
-
-			$session->set('remote', [$contact['uid'] => $contact['id']]);
+			$remote[$contact['uid']] = $contact['id'];
 		}
 		DBA::close($remote_contacts);
+		$session->set('remote', $remote);
 	}
 
 	/**