From ae3b64915ef94944999fa03cd63d2ba275f0685c Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 5 Mar 2018 10:18:20 +0100 Subject: [PATCH] MVC, rename 404 page to not_found, make sure authentication failure still redirects to the login page --- .../mvc/app/controllers/OPNsense/Core/IndexController.php | 7 +++++-- .../app/views/OPNsense/Core/{index.volt => not_found.volt} | 0 2 files changed, 5 insertions(+), 2 deletions(-) rename src/opnsense/mvc/app/views/OPNsense/Core/{index.volt => not_found.volt} (100%) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php index fb96e4478..3b909c008 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php @@ -42,8 +42,11 @@ class IndexController extends \OPNsense\Base\IndexController public function indexAction() { $this->view->title = gettext("Page not found"); - $this->view->pick('OPNsense/Core/index'); - $this->response->setStatusCode(404, "Not Found"); + $this->view->pick('OPNsense/Core/not_found'); + if ( $this->response->getStatusCode() != '302') { + // don't send 404 when redirecting to login page + $this->response->setStatusCode(404, "Not Found"); + } return; } } diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/index.volt b/src/opnsense/mvc/app/views/OPNsense/Core/not_found.volt similarity index 100% rename from src/opnsense/mvc/app/views/OPNsense/Core/index.volt rename to src/opnsense/mvc/app/views/OPNsense/Core/not_found.volt