X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHCard.php;h=a6edd5100f5df1cd1b27c00a9d5116ef4956e9c6;hb=ffa44b8dc0b2ac0d65da245766cf0826e219d9a8;hp=b8df844367acccf66b7c3120e417a3effa59f31d;hpb=2502a9192d59ead8fc1131e6bb56e22ad39d5d22;p=friendica.git

diff --git a/src/Module/HCard.php b/src/Module/HCard.php
index b8df844367..a6edd5100f 100644
--- a/src/Module/HCard.php
+++ b/src/Module/HCard.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, 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;
@@ -34,21 +33,19 @@ use Friendica\Network\HTTPException;
  */
 class HCard extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	protected function content(array $request = []): string
 	{
-		$a = DI::app();
-
-		if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
+		if (DI::userSession()->getLocalUserId() && ($this->parameters['action'] ?? '') === 'view') {
 			// A logged in user views a profile of a user
-			$nickname = $a->user['nickname'];
-		} elseif (empty($parameters['action'])) {
+			$nickname = DI::app()->getLoggedInUserNickname();
+		} elseif (empty($this->parameters['action'])) {
 			// Show the profile hCard
-			$nickname = $parameters['profile'];
+			$nickname = $this->parameters['profile'];
 		} else {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('No profile'));
 		}
 
-		$profile = Profile::load($a, $nickname, false);
+		$profile = User::getOwnerDataByNick($nickname);
 
 		if (empty($profile)) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
@@ -67,15 +64,6 @@ class HCard extends BaseModule
 			$page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 		}
 
-		// check if blocked
-		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
-			$keywords = $profile['pub_keywords'] ?? '';
-			$keywords = str_replace([',', ' ', ',,'], [' ', ',', ','], $keywords);
-			if (strlen($keywords)) {
-				$page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";
-			}
-		}
-
 		$baseUrl = DI::baseUrl();
 
 		$uri = urlencode('acct:' . $profile['nickname'] . '@' . $baseUrl->getHostname() . ($baseUrl->getUrlPath() ? '/' . $baseUrl->getUrlPath() : ''));
@@ -88,5 +76,20 @@ class HCard extends BaseModule
 		foreach (['request', 'confirm', 'notify', 'poll'] as $dfrn) {
 			$page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"" . $baseUrl->get() . "/dfrn_{$dfrn}/{$nickname}\" />\r\n";
 		}
+
+		$block = (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated());
+
+		// check if blocked
+		if ($block) {
+			$keywords = $profile['pub_keywords'] ?? '';
+			$keywords = str_replace([',', ' ', ',,'], [' ', ',', ','], $keywords);
+			if (strlen($keywords)) {
+				$page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";
+			}
+		}
+
+		$page['aside'] = Profile::getVCardHtml($profile, $block, false);
+
+		return '';
 	}
 }