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);
}
}
$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) {
$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)) {
'$submit' => $submit,
'$cancel' => $this->t('Cancel'),
- '$request' => $request,
+ '$action' => $requestUrl,
'$name' => $contact['name'],
'$url' => $contact['url'],
'$zrl' => Profile::zrl($contact['url']),
'$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')]