X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FRemoteFollow.php;h=130c76319c12b43c073d3fd7bcd9971a0f5e6825;hb=35e2ae39252f6713a09c80026eeacf184f68437a;hp=bf71b077fd01888deae74dface5203b012ded31f;hpb=e379698227e4b2444c54d36b714594a0252e3fa7;p=friendica.git
diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index bf71b077fd..130c76319c 100644
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -1,6 +1,6 @@
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 = [])
{
- $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;
}
if (empty($data['subscribe'])) {
- notice(DI::l10n()->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
+ 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' => $data['subscribe']]);
+ Logger::notice('Remote request', ['url' => $url, 'follow' => $this->owner['url'], 'remote' => $data['subscribe']]);
// 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, $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 %s or %s 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, follow this link to find a public Friendica node and join us today.', 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 %s or %s directly on your system.', $target_addr, $target_url),
+ '$invite_desc' => $this->t('If you are not yet a member of the free social web, follow this link to find a public Friendica node and join us today.', 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;