Move mod/hcard to src\Module\HoverCard

mod/hcard.php

@@ -1,61 +0,0 @@
-<?php
-/**
- * @file mod/hcard.php
- */
-use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Core\Session;
-use Friendica\Model\Contact;
-use Friendica\Model\Profile;
-use Friendica\Model\User;
-
-function hcard_init(App $a)
-{
-	$blocked = Config::get('system', 'block_public') && !Session::isAuthenticated();
-
-	if ($a->argc > 1) {
-		$which = $a->argv[1];
-	} else {
-		throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('No profile'));
-	}
-
-	$profile = 0;
-	if ((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
-		$which   = $a->user['nickname'];
-		$profile = $a->argv[1];
-	}
-
-	Profile::load($a, $which, $profile);
-
-	if (!empty($a->profile['page-flags']) && ($a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {
-		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
-	}
-	if (!empty($a->profile['openidserver'])) {
-		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
-	}
-	if (!empty($a->profile['openid'])) {
-		$delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
-		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
-	}
-
-	if (!$blocked) {
-		$keywords = $a->profile['pub_keywords'] ?? '';
-		$keywords = str_replace([',',' ',',,'], [' ',',',','], $keywords);
-		if (strlen($keywords)) {
-			$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";
-		}
-	}
-
-	$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->getHostName() . (($a->getURLPath()) ? '/' . $a->getURLPath() : ''));
-	$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 = ['request', 'confirm', 'notify', 'poll'];
-	foreach ($dfrn_pages as $dfrn) {
-		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".System::baseUrl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
-	}
-}

src/Module/HoverCard.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\BaseModule;
+use Friendica\Core\Config\Configuration;
+use Friendica\Core\L10n\L10n;
+use Friendica\Core\Session;
+use Friendica\Model\Profile;
+use Friendica\Model\User;
+use Friendica\Network\HTTPException\NotFoundException;
+
+/**
+ * Loads a profile for the HoverCard view
+ */
+class HoverCard extends BaseModule
+{
+	public static function rawContent(array $parameters = [])
+	{
+		/** @var Arguments $args */
+		$args = self::getClass(Arguments::class);
+
+		$a = self::getApp();
+
+		// A logged in user views a profile of a user
+		if ((local_user()) && $args->get(2) === 'view') {
+			$nickname = $a->user['nickname'];
+			$profile  = $parameters['profile'];
+
+			// Show the profile hovercard
+		} elseif ($args->getArgc() < 2) {
+			$nickname = $parameters['profile'];
+			$profile  = 0;
+
+		} else {
+			/** @var L10n $l10n */
+			$l10n = self::getClass(L10n::class);
+			throw new NotFoundException($l10n->t('No profile'));
+		}
+
+		Profile::load($a, $nickname, $profile);
+
+		/** @var Page $page */
+		$page = self::getClass(Page::class);
+
+		if (!empty($a->profile['page-flags']) && ($a->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($a->profile['openid'])) {
+			$delegate         = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
+			$page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
+		}
+
+		/** @var Configuration $config */
+		$config = self::getClass(Configuration::class);
+		// check if blocked
+		if ($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";
+			}
+		}
+
+		/** @var BaseURL $baseUrl */
+		$baseUrl = self::getClass(BaseURL::class);
+
+		$uri = urlencode('acct:' . $a->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'] .= '<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);
+
+		foreach (['request', 'confirm', 'notify', 'poll'] as $dfrn) {
+			$page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"" . $baseUrl->get() . "/dfrn_{$dfrn}/{$nickname}\" />\r\n";
+		}
+	}
+}

static/routes.config.php

@@ -139,11 +139,12 @@ return [
 		'/{group:\d+}/add/{contact:\d+}'    => [Module\Group::class, [R::GET, R::POST]],
 		'/{group:\d+}/remove/{contact:\d+}' => [Module\Group::class, [R::GET, R::POST]],
 	],
-	'/hashtag'            => [Module\Hashtag::class,      [R::GET]],
+	'/hashtag'                  => [Module\Hashtag::class,   [R::GET]],
-	'/home'               => [Module\Home::class,         [R::GET]],
+	'/help[/{doc:.+}]'          => [Module\Help::class,      [R::GET]],
-	'/help[/{doc:.+}]'    => [Module\Help::class,         [R::GET]],
+	'/home'                     => [Module\Home::class,      [R::GET]],
-	'/inbox[/{nickname}]' => [Module\Inbox::class,        [R::GET, R::POST]],
+	'/hcard/{profile}[/{view}]' => [Module\HoverCard::class, [R::GET]],
-	'/invite'             => [Module\Invite::class,       [R::GET, R::POST]],
+	'/inbox[/{nickname}]'       => [Module\Inbox::class,     [R::GET, R::POST]],
+	'/invite'                   => [Module\Invite::class,    [R::GET, R::POST]],
 
 	'/install'         => [
 		'[/]'                    => [Module\Install::class, [R::GET, R::POST]],