From 4a08853605e813b8ee4bcb51dd239f3d3785f54b Mon Sep 17 00:00:00 2001 From: mattpass Date: Thu, 8 Apr 2021 11:47:37 +0100 Subject: [PATCH] Auto-setting loggedIn not based on demoMode or empty pw, only go to login if req --- lib/settings.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/settings.php b/lib/settings.php index 26a6778..9e066b6 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -127,8 +127,8 @@ include dirname(__FILE__) . "/../lang/" . basename($ICEcoder['languageUser']); $text = array_replace_recursive($baseText, $text); $_SESSION['text'] = $text; -// Login not required or we're in demo mode and have password set in our settings, log us straight in -if ((false === $ICEcoder['loginRequired'] || true === $ICEcoder['demoMode']) && "" !== $ICEcoder['password']) { +// Login not required, log us straight in +if (false === $ICEcoder['loginRequired']) { $_SESSION['loggedIn'] = true; }; $demoMode = $ICEcoder['demoMode']; @@ -194,8 +194,8 @@ include(dirname(__FILE__) . "/settings-save-current-files.php"); // Display the plugins include(dirname(__FILE__) . "/plugins-display.php"); -// If loggedIn is false or we don't have a password set yet and we're not on login screen, boot user to that -if (false === isset($_POST['password']) && (!$_SESSION['loggedIn'] || "" === $ICEcoder["password"]) && false === strpos($_SERVER['SCRIPT_NAME'], "lib/login.php")) { +// If we require a login, loggedIn is false or we don't have a password set yet and we're not on login screen, boot user to that +if (true === $ICEcoder['loginRequired'] && false === isset($_POST['password']) && (!$_SESSION['loggedIn'] || "" === $ICEcoder["password"]) && false === strpos($_SERVER['SCRIPT_NAME'], "lib/login.php")) { if (file_exists('lib/login.php')) { header('Location: ' . rtrim($_SERVER['REQUEST_URI'], "/") . '/lib/login.php'); echo "";