X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHCard.php;h=12ea65f136fb2c16432100616575c83113f4cc73;hb=96a3991dfd83c3a5f35f6802d31444ab77469de7;hp=e348f2ff5bc2f020d745df2fb6bc030c09497c0d;hpb=fa28eb650f17ec3236aa5dd0358b6be049c265fd;p=friendica.git

diff --git a/src/Module/HCard.php b/src/Module/HCard.php
index e348f2ff5b..12ea65f136 100644
--- a/src/Module/HCard.php
+++ b/src/Module/HCard.php
@@ -34,53 +34,42 @@ 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 ((local_user()) && ($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::load($a, $nickname);
+		$profile = User::getOwnerDataByNick($nickname);
 
-		if (empty($a->profile)) {
+		if (empty($profile)) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
 		}
 
 		$page = DI::page();
 
-		if (!empty($a->profile['page-flags']) && ($a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {
+		if (!empty($profile['page-flags']) && ($profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {
 			$page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 		}
-		if (!empty($a->profile['openidserver'])) {
-			$page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
+		if (!empty($profile['openidserver'])) {
+			$page['htmlhead'] .= '<link rel="openid.server" href="' . $profile['openidserver'] . '" />' . "\r\n";
 		}
-		if (!empty($a->profile['openid'])) {
-			$delegate         = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
+		if (!empty($profile['openid'])) {
+			$delegate         = ((strstr($profile['openid'], '://')) ? $profile['openid'] : 'http://' . $profile['openid']);
 			$page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 		}
 
-		// check if blocked
-		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
-			$keywords = $a->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:' . $a->profile['nickname'] . '@' . $baseUrl->getHostname() . ($baseUrl->getUrlPath() ? '/' . $baseUrl->getUrlPath() : ''));
+		$uri = urlencode('acct:' . $profile['nickname'] . '@' . $baseUrl->getHostname() . ($baseUrl->getUrlPath() ? '/' . $baseUrl->getUrlPath() : ''));
 
-		$page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($a->profile['net-publish'] ? 'true' : 'false') . '" />' . "\r\n";
+		$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);
@@ -88,5 +77,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') && !Session::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 '';
 	}
 }