Merge remote-tracking branch 'upstream/develop' into api4

[friendica.git] / src / Module / RemoteFollow.php

diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index 0950a057a508b351a0ae86471f3180890620eb39..6fedc139317377b5427a554bfa752137b7eb8265 100644 (file)
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -32,6 +32,7 @@ use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 
 /**
@@ -41,14 +42,17 @@ class RemoteFollow extends BaseModule
 {
        static $owner;
 
-       public static function init(array $parameters = [])
+       public function init()
        {
-               self::$owner = User::getOwnerDataByNick($parameters['profile']);
+               self::$owner = User::getOwnerDataByNick($this->parameters['profile']);
+               if (!self::$owner) {
+                       throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+               }
 
                DI::page()['aside'] = Widget\VCard::getHTML(self::$owner);
        }
 
-       public static function post(array $parameters = [])
+       public function post()
        {
                if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) {
                        DI::baseUrl()->redirect();
@@ -92,7 +96,7 @@ class RemoteFollow extends BaseModule
                System::externalRedirect($follow_link);
        }
 
-       public static function content(array $parameters = [])
+       public function content(): string
        {
                if (empty(self::$owner)) {
                        return '';
@@ -111,7 +115,7 @@ class RemoteFollow extends BaseModule
                        '$submit'        => DI::l10n()->t('Submit Request'),
                        '$cancel'        => DI::l10n()->t('Cancel'),
 
-                       '$request'       => 'remote_follow/' . $parameters['profile'],
+                       '$request'       => 'remote_follow/' . $this->parameters['profile'],
                        '$name'          => self::$owner['name'],
                        '$myaddr'        => Profile::getMyURL(),
                ]);