diff --git a/admin/database_updates.php b/admin/database_updates.php index 567b88ee..6a5b1d16 100644 --- a/admin/database_updates.php +++ b/admin/database_updates.php @@ -3821,6 +3821,13 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.7'"); } + if (CURRENT_DATABASE_VERSION == '2.2.7') { + mysqli_query($mysqli, "ALTER TABLE `user_settings` ADD `user_config_theme_dark` TINYINT(1) NOT NULL DEFAULT 0 AFTER `user_config_signature`"); + mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_theme_dark`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.8'"); + } + /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over if (CURRENT_DATABASE_VERSION == '2.2.4') { diff --git a/admin/includes/inc_all_admin.php b/admin/includes/inc_all_admin.php index fb600215..ceeec4e2 100644 --- a/admin/includes/inc_all_admin.php +++ b/admin/includes/inc_all_admin.php @@ -2,6 +2,7 @@ require_once "../config.php"; require_once "../functions.php"; +require_once "../includes/router.php"; require_once "../includes/check_login.php"; require_once "../includes/page_title.php"; if (!isset($session_is_admin) || !$session_is_admin) { diff --git a/admin/post/settings_theme.php b/admin/post/settings_theme.php index ff0fadf0..aa358309 100644 --- a/admin/post/settings_theme.php +++ b/admin/post/settings_theme.php @@ -6,11 +6,9 @@ if (isset($_POST['edit_theme_settings'])) { validateCSRFToken($_POST['csrf_token']); - $dark_mode = intval($_POST['dark_mode'] ?? 0); - $theme = preg_replace("/[^0-9a-zA-Z-]/", "", sanitizeInput($_POST['edit_theme_settings'])); - mysqli_query($mysqli,"UPDATE settings SET config_theme = '$theme', config_theme_dark = $dark_mode WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_theme = '$theme' WHERE company_id = 1"); logAction("Settings", "Edit", "$session_name edited theme settings $dark_mode"); diff --git a/admin/settings_theme.php b/admin/settings_theme.php index 7a7293b0..45a2a30b 100644 --- a/admin/settings_theme.php +++ b/admin/settings_theme.php @@ -10,15 +10,6 @@ require_once "includes/inc_all_admin.php";
-
Dark Mode
- -
-
- value="1" onchange="this.form.submit()" id="darkModeSwitch"> - -
-
-
diff --git a/db.sql b/db.sql index d7bbee53..9df0f868 100644 --- a/db.sql +++ b/db.sql @@ -2057,7 +2057,6 @@ CREATE TABLE `settings` ( `config_log_retention` int(11) NOT NULL DEFAULT 90, `config_module_enable_ticketing` tinyint(1) NOT NULL DEFAULT 1, `config_theme` varchar(200) DEFAULT 'blue', - `config_theme_dark` tinyint(1) NOT NULL DEFAULT 0, `config_telemetry` tinyint(1) DEFAULT 0, `config_timezone` varchar(200) NOT NULL DEFAULT 'America/New_York', `config_destructive_deletes_enable` tinyint(1) NOT NULL DEFAULT 0, @@ -2611,6 +2610,7 @@ CREATE TABLE `user_settings` ( `user_config_dashboard_technical_enable` tinyint(1) NOT NULL DEFAULT 0, `user_config_calendar_first_day` tinyint(1) NOT NULL DEFAULT 0, `user_config_signature` text DEFAULT NULL, + `user_config_theme_dark` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2766,4 +2766,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-08-01 13:36:16 +-- Dump completed on 2025-08-05 13:30:24 diff --git a/includes/check_login.php b/includes/check_login.php index c7d9fab3..78589eee 100644 --- a/includes/check_login.php +++ b/includes/check_login.php @@ -59,6 +59,7 @@ if (isset($row['role_is_admin']) && $row['role_is_admin'] == 1) { } $session_user_config_force_mfa = intval($row['user_config_force_mfa']); $user_config_records_per_page = intval($row['user_config_records_per_page']); +$user_config_theme_dark = intval($row['user_config_theme_dark']); // Check user type if ($session_user_type !== 1) { diff --git a/includes/database_version.php b/includes/database_version.php index b960dc1f..9036675e 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.2.7"); +DEFINE("LATEST_DATABASE_VERSION", "2.2.8"); diff --git a/includes/get_settings.php b/includes/get_settings.php index 8593d760..4a65074a 100644 --- a/includes/get_settings.php +++ b/includes/get_settings.php @@ -19,6 +19,7 @@ $config_smtp_username = $row['config_smtp_username']; $config_smtp_password = $row['config_smtp_password']; $config_mail_from_email = $row['config_mail_from_email']; $config_mail_from_name = $row['config_mail_from_name']; + // Mail - IMAP $config_imap_host = $row['config_imap_host']; $config_imap_port = intval($row['config_imap_port']); @@ -128,7 +129,6 @@ $config_time_format = "H:i"; // Theme $config_theme = $row['config_theme']; -$config_theme_dark = intval($row['config_theme_dark']); // Telemetry $config_telemetry = intval($row['config_telemetry']); diff --git a/includes/header.php b/includes/header.php index 9c46be30..dbc138ed 100644 --- a/includes/header.php +++ b/includes/header.php @@ -6,13 +6,6 @@ header("X-Frame-Options: DENY"); -// Determine URI prepending logic (URI Routing maybe move to /includes/router.php) -if ($_SERVER['REQUEST_URI'] === '/user/reports') { - $prepend_uri = "../"; -} else { - $prepend_uri = ''; -} - ?> @@ -23,7 +16,7 @@ if ($_SERVER['REQUEST_URI'] === '/user/reports') { - <?php echo $session_company_name; ?> + <?= $session_company_name; ?> @@ -51,7 +44,7 @@ if ($_SERVER['REQUEST_URI'] === '/user/reports') {
diff --git a/includes/router.php b/includes/router.php new file mode 100644 index 00000000..0ad5a6fc --- /dev/null +++ b/includes/router.php @@ -0,0 +1,11 @@ + +
+
Dark Mode
+ +
+ + +
+
+