From 390de53e2e9bf62459bd23bb9981e3bb2c222f4b Mon Sep 17 00:00:00 2001 From: Focuslinkstech <45756999+Focuslinkstech@users.noreply.github.com> Date: Wed, 22 May 2024 08:49:42 +0100 Subject: [PATCH] Update: Force Logout add Force Logout in maintenance mode Function: if it enabled the system will kick out the user from the dashboard, but if not enabled the system will retain the user login section and display maintenance mode message. --- system/autoload/User.php | 7 +++++-- system/controllers/settings.php | 2 ++ ui/ui/maintenance-mode.tpl | 10 ++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/system/autoload/User.php b/system/autoload/User.php index 3d897bdf..c8b09197 100644 --- a/system/autoload/User.php +++ b/system/autoload/User.php @@ -161,8 +161,11 @@ class User { global $config; if ($config['maintenance_mode'] == true) { - displayMaintenanceMessage(); - // r2(U . 'logout', 'd', ''); + if ($config['maintenance_mode_logout'] == true) { + r2(U . 'logout', 'd', ''); + } else { + displayMaintenanceMessage(); + } } if (!$id) { $id = User::getID(); diff --git a/system/controllers/settings.php b/system/controllers/settings.php index c05d1ab2..83fcd41e 100644 --- a/system/controllers/settings.php +++ b/system/controllers/settings.php @@ -775,10 +775,12 @@ switch ($action) { } if (_post('save') == 'save') { $status = isset($_POST['maintenance_mode']) ? 1 : 0; // Checkbox returns 1 if checked, otherwise 0 + $force_logout = isset($_POST['maintenance_mode_logout']) ? 1 : 0; // Checkbox returns 1 if checked, otherwise 0 $date = isset($_POST['maintenance_date']) ? $_POST['maintenance_date'] : null; $settings = [ 'maintenance_mode' => $status, + 'maintenance_mode_logout' => $force_logout, 'maintenance_date' => $date ]; diff --git a/ui/ui/maintenance-mode.tpl b/ui/ui/maintenance-mode.tpl index 860bd5ec..3a9fed10 100644 --- a/ui/ui/maintenance-mode.tpl +++ b/ui/ui/maintenance-mode.tpl @@ -74,6 +74,16 @@ +