whops .. wrong legacy endpoint

[friendica.git] / src / Module / Contact / Hovercard.php

diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 43acbdd5f7747182f7320e3fc6a7b9379d1d6af2..620b96095a4077d3307e6d03b6f9c6ce89080c73 100644 (file)
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -23,7 +23,6 @@ namespace Friendica\Module\Contact;
 
 use Friendica\BaseModule;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -41,18 +40,16 @@ class Hovercard extends BaseModule
                $contact_url = $_REQUEST['url'] ?? '';
 
                // Get out if the system doesn't have public access allowed
-               if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
                        throw new HTTPException\ForbiddenException();
                }
 
-               // If a contact is connected the url is internally changed to 'redir/CID'. We need the pure url to search for
+               // If a contact is connected the url is internally changed to 'contact/redir/CID'. We need the pure url to search for
                // the contact. So we strip out the contact id from the internal url and look in the contact table for
                // the real url (nurl)
-               if (strpos($contact_url, 'redir/') === 0) {
+               if (strpos($contact_url, 'contact/redir/') === 0) {
                        $cid = intval(substr($contact_url, 6));
-               }
-
-               if (strpos($contact_url, 'contact/') === 0) {
+               } elseif (strpos($contact_url, 'contact/') === 0) {
                        $cid = intval(substr($contact_url, 8));
                }
 
@@ -70,8 +67,8 @@ class Hovercard extends BaseModule
 
                // Search for contact data
                // Look if the local user has got the contact
-               if (Session::isAuthenticated()) {
-                       $contact = Contact::getByURLForUser($contact_url, Session::getLocalUser());
+               if (DI::userSession()->isAuthenticated()) {
+                       $contact = Contact::getByURLForUser($contact_url, DI::userSession()->getLocalUserId());
                } else {
                        $contact = Contact::getByURL($contact_url, false);
                }
@@ -81,7 +78,7 @@ class Hovercard extends BaseModule
                }
 
                // Get the photo_menu - the menu if possible contact actions
-               if (Session::isAuthenticated()) {
+               if (DI::userSession()->isAuthenticated()) {
                        $actions = Contact::photoMenu($contact);
                } else {
                        $actions = [];