X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHCard.php;h=cb84c1aa94dec41fc115510e1b1fcd77fb09364a;hb=af18e2f2a9ef9315e0767ee395a745f17760a460;hp=e348f2ff5bc2f020d745df2fb6bc030c09497c0d;hpb=fae0f839bcefe431cd7e5fb355a7afc9e4bd0da4;p=friendica.git
diff --git a/src/Module/HCard.php b/src/Module/HCard.php
index e348f2ff5b..cb84c1aa94 100644
--- a/src/Module/HCard.php
+++ b/src/Module/HCard.php
@@ -1,6 +1,6 @@
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'] .= '';
}
- if (!empty($a->profile['openidserver'])) {
- $page['htmlhead'] .= '' . "\r\n";
+ if (!empty($profile['openidserver'])) {
+ $page['htmlhead'] .= '' . "\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'] .= '' . "\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'] .= '' . "\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'] .= '' . "\r\n";
+ $page['htmlhead'] .= '' . "\r\n";
$page['htmlhead'] .= '' . "\r\n";
$page['htmlhead'] .= '' . "\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'] .= "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'] .= '' . "\r\n";
+ }
+ }
+
+ $page['aside'] = Profile::getVCardHtml($profile, $block, false);
+
+ return '';
}
}