From: ArthurHoaro Date: Mon, 16 Jan 2017 11:40:00 +0000 (+0100) Subject: Merge pull request #761 from ArthurHoaro/hotfix/referrer-warning X-Git-Tag: v0.9.0~62 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4d9fd16ddf2a7d6488c4200aca48501e9d5886fe;hp=514185e14b09d1e37c41eb5d2720e3e45b12eea9;p=github%2Fshaarli%2FShaarli.git Merge pull request #761 from ArthurHoaro/hotfix/referrer-warning Prevent warning if HTTP_REFERER isn't set --- diff --git a/index.php b/index.php index 8055a7b7..b27c83b6 100644 --- a/index.php +++ b/index.php @@ -1012,7 +1012,12 @@ function renderPage($conf, $pluginManager, $LINKSDB) $_SESSION['LINKS_PER_PAGE']=abs(intval($_GET['linksperpage'])); } - header('Location: '. generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('linksperpage'))); + if (! empty($_SERVER['HTTP_REFERER'])) { + $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('linksperpage')); + } else { + $location = '?'; + } + header('Location: '. $location); exit; } @@ -1024,7 +1029,12 @@ function renderPage($conf, $pluginManager, $LINKSDB) unset($_SESSION['privateonly']); // See all links } - header('Location: '. generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('privateonly'))); + if (! empty($_SERVER['HTTP_REFERER'])) { + $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('privateonly')); + } else { + $location = '?'; + } + header('Location: '. $location); exit; } @@ -1361,7 +1371,7 @@ function renderPage($conf, $pluginManager, $LINKSDB) ) { if (isset($_POST['returnurl'])) { $location = $_POST['returnurl']; // Handle redirects given by the form - } else { + } else if (isset($_SERVER['HTTP_REFERER'])) { $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('delete_link')); } }