X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact%2FFollow.php;h=f8b88c05fc7ab35686ede286500d988a34748736;hb=79235b6db1c9badd6c9602d54ad0d550e4bec2fd;hp=0e1e129e920cdea1c3aa283efa52f60d6be59e04;hpb=87291e30a45e660b47a9ea95326200c88cc642dd;p=friendica.git

diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php
index 0e1e129e92..f8b88c05fc 100644
--- a/src/Module/Contact/Follow.php
+++ b/src/Module/Contact/Follow.php
@@ -69,11 +69,11 @@ class Follow extends BaseModule
 			throw new ForbiddenException($this->t('Access denied.'));
 		}
 
-		if (!empty($request['url'])) {
-			$this->baseUrl->redirect($request['url']);
+		if (isset($request['cancel']) || empty($request['url'])) {
+			$this->baseUrl->redirect('contact');
 		}
 
-		$url = Probe::cleanURI($this->session->get('url'));
+		$url = Probe::cleanURI($request['url']);
 
 		$this->process($url);
 	}
@@ -88,7 +88,9 @@ class Follow extends BaseModule
 		}
 
 		$uid = $this->session->getLocalUserId();
-		$url = Probe::cleanURI(trim($request['url'] ?? ''));
+
+		// uri is used by the /authorize_interaction Mastodon route
+		$url = Probe::cleanURI(trim($request['uri'] ?? $request['url'] ?? ''));
 
 		// Issue 6874: Allow remote following from Peertube
 		if (strpos($url, 'acct:') === 0) {
@@ -150,8 +152,8 @@ class Follow extends BaseModule
 			$this->process($contact['url']);
 		}
 
-		$request = $this->baseUrl . '/follow';
-		$tpl     = Renderer::getMarkupTemplate('auto_request.tpl');
+		$requestUrl = $this->baseUrl . '/contact/follow';
+		$tpl        = Renderer::getMarkupTemplate('auto_request.tpl');
 
 		$owner = User::getOwnerDataById($uid);
 		if (empty($owner)) {
@@ -170,7 +172,7 @@ class Follow extends BaseModule
 			'$submit'         => $submit,
 			'$cancel'         => $this->t('Cancel'),
 
-			'$request'  => $request,
+			'$action'   => $requestUrl,
 			'$name'     => $contact['name'],
 			'$url'      => $contact['url'],
 			'$zrl'      => Profile::zrl($contact['url']),
@@ -181,10 +183,10 @@ class Follow extends BaseModule
 			'$addnote_field' => ['dfrn-request-message', $this->t('Add a personal note:')],
 		]);
 
-		$this['aside'] = '';
+		$this->page['aside'] = '';
 
 		if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) {
-			$this['aside'] = VCard::getHTML($contact);
+			$this->page['aside'] = VCard::getHTML($contact);
 
 			$output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
 				['$title' => $this->t('Status Messages and Posts')]