nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix redirect calls using DI::baseUrl() and System::externalRedirect

Browse source
This commit is contained in:
Hypolite Petovan 2019-12-29 21:50:51 -05:00
parent 015db25d9f
commit 3b1f2f4f27
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/message.php
View file

@ -178,7 +178,7 @@ function message_content(App $a)
DI::baseUrl()->redirect('message'); DI::baseUrl()->redirect('message');
} }
DI::baseUrl()->redirectinternalRedirect('message/' . $conversation['id'] ); DI::baseUrl()->redirect('message/' . $conversation['id'] );
} else { } else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]), intval($a->argv[2]),

8
mod/redir.php
View file

@ -137,9 +137,9 @@ function redir_magic($a, $cid, $url)
// Shouldn't happen under normal conditions // Shouldn't happen under normal conditions
notice(L10n::t('Contact not found.')); notice(L10n::t('Contact not found.'));
if (!empty($url)) { if (!empty($url)) {
$a->redirect($url); System::externalRedirect($url);
} else { } else {
$a->internalRedirect(); DI::baseUrl()->redirect();
} }
} else { } else {
$contact_url = $contact['url']; $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 // 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)) { 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]); 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 // 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); $target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);
Logger::info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]); Logger::info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
$a->redirect($target_url); System::externalRedirect($target_url);
} else { } else {
Logger::info('No magic for contact', ['contact' => $contact_url]); Logger::info('No magic for contact', ['contact' => $contact_url]);
} }