keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing the non-auto follow process ...

Browse source
This commit is contained in:
Philipp 2022-10-31 20:51:13 +01:00
parent eb9da2967e
commit 82cd6ff91d
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Module/Contact/Follow.php
View file

@ -69,8 +69,8 @@ class Follow extends BaseModule
throw new ForbiddenException($this->t('Access denied.')); throw new ForbiddenException($this->t('Access denied.'));
} }
if (!empty($request['url'])) { if (isset($request['cancel']) || empty($request['url'])) {
$this->baseUrl->redirect($request['url']); $this->baseUrl->redirect('contact');
} }
$url = Probe::cleanURI($request['url']); $url = Probe::cleanURI($request['url']);
@ -150,7 +150,7 @@ class Follow extends BaseModule
$this->process($contact['url']); $this->process($contact['url']);
} }
$request = $this->baseUrl . '/follow'; $requestUrl = $this->baseUrl . '/contact/follow';
$tpl = Renderer::getMarkupTemplate('auto_request.tpl'); $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
@ -170,7 +170,7 @@ class Follow extends BaseModule
'$submit' => $submit, '$submit' => $submit,
'$cancel' => $this->t('Cancel'), '$cancel' => $this->t('Cancel'),
'$request' => $request, '$request' => $requestUrl,
'$name' => $contact['name'], '$name' => $contact['name'],
'$url' => $contact['url'], '$url' => $contact['url'],
'$zrl' => Profile::zrl($contact['url']), '$zrl' => Profile::zrl($contact['url']),
@ -181,10 +181,10 @@ class Follow extends BaseModule
'$addnote_field' => ['dfrn-request-message', $this->t('Add a personal note:')], '$addnote_field' => ['dfrn-request-message', $this->t('Add a personal note:')],
]); ]);
$this['aside'] = ''; $this->page['aside'] = '';
if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) { 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'), $output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
['$title' => $this->t('Status Messages and Posts')] ['$title' => $this->t('Status Messages and Posts')]