X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHCard.php;h=a0a0fef1d7133e61f65c0f7684f1855abfc08d2b;hb=f114ad188353910f1714a2df04affb7e5ee58253;hp=b8df844367acccf66b7c3120e417a3effa59f31d;hpb=2502a9192d59ead8fc1131e6bb56e22ad39d5d22;p=friendica.git
diff --git a/src/Module/HCard.php b/src/Module/HCard.php
index b8df844367..a0a0fef1d7 100644
--- a/src/Module/HCard.php
+++ b/src/Module/HCard.php
@@ -1,6 +1,6 @@
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'] .= '' . "\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'] .= '' . "\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'] .= "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'] .= '' . "\r\n";
+ }
+ }
+
+ $page['aside'] = Profile::getVCardHtml($profile, $block, false);
+
+ return '';
}
}