Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #766 from ArthurHoaro/hotfix/deletion-redirect

Browse source 
Fix redirection after link deletion
This commit is contained in:
ArthurHoaro 2017-01-17 09:53:55 +01:00 committed by GitHub
parent d029cf67f8 95e5add4be
commit 078fcb56ad
1 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
index.php
View file

@ -1349,31 +1349,15 @@ function renderPage($conf, $pluginManager, $LINKSDB)
// If we are called from the bookmarklet, we must close the popup: // If we are called from the bookmarklet, we must close the popup:
if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script>self.close();</script>'; exit; } if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script>self.close();</script>'; exit; }
// Pick where we're going to redirect
// ============================================================= $location = '?';
// Basically, we can't redirect to where we were previously if it was a permalink if (isset($_SERVER['HTTP_REFERER'])) {
// or an edit_link, because it would 404. // Don't redirect to where we were previously if it was a permalink or an edit_link, because it would 404.
// Cases: $location = generateLocation(
// - / : nothing in $_GET, redirect to self $_SERVER['HTTP_REFERER'],
// - /?page : redirect to self $_SERVER['HTTP_HOST'],
// - /?searchterm : redirect to self (there might be other links) ['delete_link', 'edit_link', $link['shorturl']]
// - /?searchtags : redirect to self );
// - /permalink : redirect to / (the link does not exist anymore)
// - /?edit_link : redirect to / (the link does not exist anymore)
// PHP treats the permalink as a $_GET variable, so we need to check if every condition for self
// redirect is not satisfied, and only then redirect to /
$location = "?";
// Self redirection
if (count($_GET) == 0
|| isset($_GET['page'])
|| isset($_GET['searchterm'])
|| isset($_GET['searchtags'])
) {
if (isset($_POST['returnurl'])) {
$location = $_POST['returnurl']; // Handle redirects given by the form
} else if (isset($_SERVER['HTTP_REFERER'])) {
$location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('delete_link'));
}
} }
header('Location: ' . $location); // After deleting the link, redirect to appropriate location header('Location: ' . $location); // After deleting the link, redirect to appropriate location