spelling: group

[friendica.git] / src / Module / HCard.php

diff --git a/src/Module/HCard.php b/src/Module/HCard.php
index aee93e34b53533f3af28c8d3abaaee805f2022a4..92627125abba940e358e29082426cbce555549eb 100644 (file)
--- a/src/Module/HCard.php
+++ b/src/Module/HCard.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,7 +22,6 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
@@ -36,7 +35,7 @@ class HCard extends BaseModule
 {
        protected function content(array $request = []): string
        {
-               if ((Session::getLocalUser()) && ($this->parameters['action'] ?? '') === 'view') {
+               if (DI::userSession()->getLocalUserId() && ($this->parameters['action'] ?? '') === 'view') {
                        // A logged in user views a profile of a user
                        $nickname = DI::app()->getLoggedInUserNickname();
                } elseif (empty($this->parameters['action'])) {
@@ -67,18 +66,18 @@ class HCard extends BaseModule
 
                $baseUrl = DI::baseUrl();
 
-               $uri = urlencode('acct:' . $profile['nickname'] . '@' . $baseUrl->getHostname() . ($baseUrl->getUrlPath() ? '/' . $baseUrl->getUrlPath() : ''));
+               $uri = urlencode('acct:' . $profile['nickname'] . '@' . $baseUrl->getHost() . ($baseUrl->getPath() ? '/' . $baseUrl->getPath() : ''));
 
                $page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($profile['net-publish'] ? 'true' : 'false') . '" />' . "\r\n";
-               $page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $baseUrl->get() . '/dfrn_poll/' . $nickname . '" />' . "\r\n";
-               $page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $baseUrl->get() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
-               header('Link: <' . $baseUrl->get() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
+               $page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $baseUrl . '/dfrn_poll/' . $nickname . '" />' . "\r\n";
+               $page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $baseUrl . '/xrd/?uri=' . $uri . '" />' . "\r\n";
+               header('Link: <' . $baseUrl . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
                foreach (['request', 'confirm', 'notify', 'poll'] as $dfrn) {
-                       $page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"" . $baseUrl->get() . "/dfrn_{$dfrn}/{$nickname}\" />\r\n";
+                       $page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"" . $baseUrl . "/dfrn_{$dfrn}/{$nickname}\" />\r\n";
                }
 
-               $block = (DI::config()->get('system', 'block_public') && !Session::isAuthenticated());
+               $block = (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated());
 
                // check if blocked
                if ($block) {