X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FRemoteFollow.php;h=ee2dcfe4dcf7b816b9f181844d4939bff14ac172;hb=561aba18e3a230c0912ad9483c6df43cc40e09d6;hp=8e4da3c63ba3acab4c9bfe969db26583e5717bcf;hpb=357c0072bda29e9838eaedf1d157c534c596f2dd;p=friendica.git

diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index 8e4da3c63b..ee2dcfe4dc 100644
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,98 +21,113 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
+use Friendica\App\Page;
 use Friendica\BaseModule;
-use Friendica\DI;
+use Friendica\Content\Widget;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Core\System;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
+use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Remotely follow the account on this system by the provided account
  */
 class RemoteFollow extends BaseModule
 {
-	public static function init(array $parameters = [])
+	/** @var array */
+	protected $owner;
+	/** @var Page */
+	protected $page;
+
+	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, App\Page $page, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
-		Profile::load(DI::app(), $parameters['profile']);
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->owner = User::getOwnerDataByNick($this->parameters['profile']);
+		if (!$this->owner) {
+			throw new HTTPException\NotFoundException($this->t('User not found.'));
+		}
+
+		$this->page    = $page;
 	}
 
-	public static function post(array $parameters = [])
+	protected function post(array $request = [], array $post = [])
 	{
-		$a = DI::app();
-
 		if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) {
-			DI::baseUrl()->redirect();
+			$this->baseUrl->redirect();
 		}
 	
-		if (empty($a->profile['uid'])) {
-			notice(DI::l10n()->t('Profile unavailable.'));
+		if (empty($this->owner)) {
+			notice($this->t('Profile unavailable.'));
 			return;
 		}
 		
 		$url = Probe::cleanURI($_POST['dfrn_url']);
 		if (!strlen($url)) {
-			notice(DI::l10n()->t("Invalid locator"));
+			notice($this->t("Invalid locator"));
 			return;
 		}
 
 		// Detect the network, make sure the provided URL is valid
-		$data = Probe::uri($url);
-		if ($data['network'] == Protocol::PHANTOM) {
-			notice(DI::l10n()->t("The provided profile link doesn't seem to be valid"));
+		$data = Contact::getByURL($url);
+		if (!$data) {
+			notice($this->t("The provided profile link doesn't seem to be valid"));
 			return;
 		}
 
-		// Fetch link for the "remote follow" functionality of the given profile
-		$follow_link_template = Probe::getRemoteFollowLink($url);
-
-		if (empty($follow_link_template)) {
-			notice(DI::l10n()->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
+		if (empty($data['subscribe'])) {
+			notice($this->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
 			return;
 		}
 
-		Logger::notice('Remote request', ['url' => $url, 'follow' => $a->profile['url'], 'remote' => $follow_link_template]);
+		Logger::notice('Remote request', ['url' => $url, 'follow' => $this->owner['url'], 'remote' => $data['subscribe']]);
 		
-		// Substitute our user's feed URL into $follow_link_template
+		// Substitute our user's feed URL into $data['subscribe']
 		// Send the subscriber home to subscribe
 		// Diaspora needs the uri in the format user@domain.tld
 		if ($data['network'] == Protocol::DIASPORA) {
-			$uri = urlencode($a->profile['addr']);
+			$uri = urlencode($this->owner['addr']);
 		} else {
-			$uri = urlencode($a->profile['url']);
+			$uri = urlencode($this->owner['url']);
 		}
 	
-		$follow_link = str_replace('{uri}', $uri, $follow_link_template);
+		$follow_link = str_replace('{uri}', $uri, $data['subscribe']);
 		System::externalRedirect($follow_link);
 	}
 
-	public static function content(array $parameters = [])
+	protected function content(array $request = []): string
 	{
-		$a = DI::app();
-
-		if (empty($a->profile)) {
+		if (empty($this->owner)) {
 			return '';
 		}
-	
-		$target_addr = $a->profile['addr'];
-		$target_url = $a->profile['url'];
+
+		$this->page['aside'] = Widget\VCard::getHTML($this->owner);
+
+		$target_addr = $this->owner['addr'];
+		$target_url = $this->owner['url'];
 
 		$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
 		$o = Renderer::replaceMacros($tpl, [
-			'$header'        => DI::l10n()->t('Friend/Connection Request'),
-			'$page_desc'     => DI::l10n()->t('Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system, you have to subscribe to <strong>%s</strong> or <strong>%s</strong> directly on your system.', $target_addr, $target_url),
-			'$invite_desc'   => DI::l10n()->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.', Search::getGlobalDirectory() . '/servers'),
-			'$your_address'  => DI::l10n()->t('Your Webfinger address or profile URL:'),
-			'$pls_answer'    => DI::l10n()->t('Please answer the following:'),
-			'$submit'        => DI::l10n()->t('Submit Request'),
-			'$cancel'        => DI::l10n()->t('Cancel'),
+			'$header'        => $this->t('Friend/Connection Request'),
+			'$page_desc'     => $this->t('Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system, you have to subscribe to <strong>%s</strong> or <strong>%s</strong> directly on your system.', $target_addr, $target_url),
+			'$invite_desc'   => $this->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.', Search::getGlobalDirectory() . '/servers'),
+			'$your_address'  => $this->t('Your Webfinger address or profile URL:'),
+			'$pls_answer'    => $this->t('Please answer the following:'),
+			'$submit'        => $this->t('Submit Request'),
+			'$cancel'        => $this->t('Cancel'),
 
-			'$request'       => 'remote_follow/' . $parameters['profile'],
-			'$name'          => $a->profile['name'],
+			'$request'       => 'remote_follow/' . $this->parameters['profile'],
+			'$name'          => $this->owner['name'],
 			'$myaddr'        => Profile::getMyURL(),
 		]);
 		return $o;