X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=beba9c32a2541abeb15b74587a7cf1a7ac86783a;hb=f4c84ad7fc981643d952a4fb4abfcdb85fccf621;hp=553f65e4b1ba2b778653495b117273203c35f37f;hpb=25d88c90aa74ea05162dfc59f47843df639beb75;p=github%2Fshaarli%2FShaarli.git diff --git a/index.php b/index.php index 553f65e4..beba9c32 100644 --- a/index.php +++ b/index.php @@ -472,7 +472,7 @@ if (isset($_POST['login'])) session_set_cookie_params(0,$cookiedir,$_SERVER['SERVER_NAME']); // 0 means "When browser closes" session_regenerate_id(true); } - + // Optional redirect after login: if (isset($_GET['post'])) { $uri = '?post='. urlencode($_GET['post']); @@ -681,6 +681,18 @@ class pageBuilder if ($this->tpl===false) $this->initialize(); // Lazy initialization $this->tpl->draw($page); } + + /** + * Render a 404 page (uses the template : tpl/404.tpl) + * + * usage : $PAGE->render404('The link was deleted') + * @param string $message A messate to display what is not found + */ + public function render404($message='The page you are trying to reach does not exist or has been deleted.') { + header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); + $this->tpl->assign('error_message', $message); + $this->renderPage('404'); + } } // ------------------------------------------------------------------------------------------ @@ -1883,10 +1895,7 @@ function buildLinkList($PAGE,$LINKSDB) $linksToDisplay = $LINKSDB->filter($search_type, $search_crits); if (count($linksToDisplay) == 0) { - header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); - echo '

404 Not found.

Oh crap. - The link you are trying to reach does not exist or has been deleted.'; - echo '
Would you mind clicking here?'; + $PAGE->render404('The link you are trying to reach does not exist or has been deleted.'); exit; } }