From 3b1f2f4f27559ff5c3bdb5057433c016c00ea104 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 29 Dec 2019 21:50:51 -0500 Subject: [PATCH] Fix redirect calls using DI::baseUrl() and System::externalRedirect --- mod/message.php | 2 +- mod/redir.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/message.php b/mod/message.php index 4c6aa3d84..f10ff76b9 100644 --- a/mod/message.php +++ b/mod/message.php @@ -178,7 +178,7 @@ function message_content(App $a) DI::baseUrl()->redirect('message'); } - DI::baseUrl()->redirectinternalRedirect('message/' . $conversation['id'] ); + DI::baseUrl()->redirect('message/' . $conversation['id'] ); } else { $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($a->argv[2]), diff --git a/mod/redir.php b/mod/redir.php index 6083117b4..9b4b440bb 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -137,9 +137,9 @@ function redir_magic($a, $cid, $url) // Shouldn't happen under normal conditions notice(L10n::t('Contact not found.')); if (!empty($url)) { - $a->redirect($url); + System::externalRedirect($url); } else { - $a->internalRedirect(); + DI::baseUrl()->redirect(); } } else { $contact_url = $contact['url']; @@ -151,7 +151,7 @@ function redir_magic($a, $cid, $url) // We don't use magic auth when there is no visitor, we are on the same system or we visit our own stuff if (empty($visitor) || Strings::compareLink($basepath, System::baseUrl()) || Strings::compareLink($contact_url, $visitor)) { Logger::info('Redirecting without magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]); - $a->redirect($target_url); + System::externalRedirect($target_url); } // Test for magic auth on the target system @@ -161,7 +161,7 @@ function redir_magic($a, $cid, $url) $target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url); Logger::info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]); - $a->redirect($target_url); + System::externalRedirect($target_url); } else { Logger::info('No magic for contact', ['contact' => $contact_url]); }