github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed false trigger_error() after redirect. 

Resolves #814.
pull/818/head
TimZ99 2019-12-03 00:34:01 +01:00
parent a53fc2a53e
commit 24ee6d02c4
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap.php
View File

@ -77,7 +77,7 @@ if (!defined('PSM_INSTALL') || !PSM_INSTALL) {
if ($db->getDbHost() === null) { if ($db->getDbHost() === null) {
// no config file has been loaded, redirect the user to the install // no config file has been loaded, redirect the user to the install
header('Location: install.php'); header('Location: install.php');
trigger_error("Could not load config file. Redirect to install failed, <a href=\"install.php\">click here</a>.", E_USER_ERROR); die();
} }
// config file has been loaded, check if we have a connection // config file has been loaded, check if we have a connection
if (!$db->status()) { if (!$db->status()) {
@ -87,7 +87,7 @@ if (!defined('PSM_INSTALL') || !PSM_INSTALL) {
if (!psm_load_conf()) { if (!psm_load_conf()) {
// unable to load from config table // unable to load from config table
header('Location: install.php'); header('Location: install.php');
trigger_error("Could not load config table. Redirect to install failed, <a href=\"install.php\">click here</a>.", E_USER_ERROR); die();
} }
// config load OK, make sure database version is up to date // config load OK, make sure database version is up to date
$installer = new \psm\Util\Install\Installer($db); $installer = new \psm\Util\Install\Installer($db);

2
src/psm/Module/Config/Controller/ConfigController.php
View File

@ -226,7 +226,7 @@ class ConfigController extends AbstractController {
if ($language_refresh) { if ($language_refresh) {
header('Location: '.psm_build_url(array('mod' => 'config'), true, false)); header('Location: '.psm_build_url(array('mod' => 'config'), true, false));
trigger_error("Redirect failed.", E_USER_ERROR); die();
} }
if (isset($_POST['general_submit'])) { if (isset($_POST['general_submit'])) {

2
src/psm/Module/Server/Controller/UpdateController.php
View File

@ -46,7 +46,7 @@ class UpdateController extends AbstractController {
header('Location: '.psm_build_url(array( header('Location: '.psm_build_url(array(
'mod' => 'server_status' 'mod' => 'server_status'
), true, false)); ), true, false));
trigger_error("Redirect failed.", E_USER_ERROR); die();
} }
} }

2
src/psm/Module/User/Controller/LoginController.php
View File

@ -56,7 +56,7 @@ class LoginController extends AbstractController {
if ($result) { if ($result) {
// success login, redirect // success login, redirect
header('Location: '.psm_build_url($_SERVER['QUERY_STRING'])); header('Location: '.psm_build_url($_SERVER['QUERY_STRING']));
trigger_error("Redirect failed.", E_USER_ERROR); die();
} else { } else {
$this->addMessage(psm_get_lang('login', 'error_login_incorrect'), 'error'); $this->addMessage(psm_get_lang('login', 'error_login_incorrect'), 'error');
} }