X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhcard.php;h=f2b86baf995813353c5465f6f186adefa60a2f54;hb=0448ca38973fed14840d33079989fd71af93708b;hp=30c5d1ea263578a0d512b45ed9e6bd1fa8383f2a;hpb=0c5cc291af58b5fa674a3c937bb2c9e3a496ee1c;p=friendica.git

diff --git a/mod/hcard.php b/mod/hcard.php
index 30c5d1ea26..f2b86baf99 100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -4,17 +4,18 @@
  */
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Model\Profile;
 
 function hcard_init(App $a)
 {
-	$blocked = (((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+	$blocked = Config::get('system', 'block_public') && !local_user() && !remote_user();
 
 	if ($a->argc > 1) {
 		$which = $a->argv[1];
 	} else {
-		notice(t('No profile') . EOL);
+		notice(L10n::t('No profile') . EOL);
 		$a->error = 404;
 		return;
 	}
@@ -38,9 +39,9 @@ function hcard_init(App $a)
 		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 	}
 
-	if (! $blocked) {
+	if (!$blocked) {
 		$keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
-		$keywords = str_replace(array(',',' ',',,'), array(' ',',',','), $keywords);
+		$keywords = str_replace([',',' ',',,'], [' ',',',','], $keywords);
 		if (strlen($keywords)) {
 			$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
 		}
@@ -48,11 +49,11 @@ function hcard_init(App $a)
 
 	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
-	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->urlpath) ? '/' . $a->urlpath : ''));
 	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
 	header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
-	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
+	$dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
 	foreach ($dfrn_pages as $dfrn) {
 		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".System::baseUrl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
 	}