From b9d65ea0e2113404bf38fb98b52b5fc63486329d Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Tue, 17 Jan 2023 19:17:23 +1100 Subject: [PATCH] Refactor Toggle Dark mode 0.2 --- front/maintenance.php | 8 +++++--- front/network.php | 2 -- front/php/server/parameters.php | 20 +++++++++++++------- front/php/server/util.php | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/front/maintenance.php b/front/maintenance.php index dffa347f..3d0bab17 100755 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -654,14 +654,16 @@ function askToggleDarkmode() { function ToggleDarkmode() { // get parameter Front_Dark_Mode_Enabled value - $.get('php/server/parameters.php?action=get&defaultValue=false¶meter=Front_Dark_Mode_Enabled', function(data) { + $.get('php/server/parameters.php?action=get&defaultValue=false&expireMinutes=525600¶meter=Front_Dark_Mode_Enabled', function(data) { var result = JSON.parse(data); if (result) { darkModeEnabled = result == 'true'; + // invert value darkModeEnabled = !darkModeEnabled; - $.get('php/server/parameters.php?action=set¶meter=Front_Dark_Mode_Enabled&value='+ darkModeEnabled, + // save inverted value + $.get('php/server/parameters.php?action=set¶meter=Front_Dark_Mode_Enabled&expireMinutes=525600&value='+ darkModeEnabled, function(data) { if (data != "OK") { showMessage (data); @@ -756,7 +758,7 @@ function initializeTabs () { // events on tab change $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { var target = $(e.target).attr("href") // activated tab - //alert(target); + if(target == "#tab_Logging") { scrollDown(); diff --git a/front/network.php b/front/network.php index c940fea0..39426887 100755 --- a/front/network.php +++ b/front/network.php @@ -341,8 +341,6 @@ $activetab = ""; // reset active tab indicator, only the first tab is active } - - commitDB (); ?> diff --git a/front/php/server/parameters.php b/front/php/server/parameters.php index 8a1aeab5..bb091db4 100755 --- a/front/php/server/parameters.php +++ b/front/php/server/parameters.php @@ -22,7 +22,9 @@ ini_set ('max_execution_time','15'); $skipCache = FALSE; + $expireMinutes = 5; $defaultValue = ''; + if (isset ($_REQUEST['skipcache'])) { $skipCache = TRUE; @@ -32,12 +34,16 @@ $defaultValue = $_REQUEST['defaultValue']; } + if (isset ($_REQUEST['expireMinutes'])) { + $expireMinutes = $_REQUEST['expireMinutes']; + } + // Action functions if (isset ($_REQUEST['action']) && !empty ($_REQUEST['action'])) { $action = $_REQUEST['action']; switch ($action) { - case 'get': getParameter($skipCache, $defaultValue); break; - case 'set': setParameter(); break; + case 'get': getParameter($skipCache, $defaultValue, $expireMinutes); break; + case 'set': setParameter($expireMinutes); break; default: logServerConsole ('Action: '. $action); break; } } @@ -46,7 +52,7 @@ //------------------------------------------------------------------------------ // Get Parameter Value //------------------------------------------------------------------------------ -function getParameter($skipCache, $defaultValue) { +function getParameter($skipCache, $defaultValue, $expireMinutes) { $parameter = $_REQUEST['parameter']; $value = ""; @@ -77,7 +83,7 @@ function getParameter($skipCache, $defaultValue) { } // update cache - setCache($parameter, $value); + setCache($parameter, $value, $expireMinutes); } // return value echo (json_encode ($value)); @@ -87,10 +93,10 @@ function getParameter($skipCache, $defaultValue) { //------------------------------------------------------------------------------ // Set Parameter Value //------------------------------------------------------------------------------ -function setParameter() { +function setParameter($expireMinutes) { $parameter = $_REQUEST['parameter']; - $value = $_REQUEST['value']; + $value = $_REQUEST['value']; global $db; @@ -119,7 +125,7 @@ function setParameter() { } // update cache - setCache($parameter, $value); + setCache($parameter, $value, $expireMinutes); echo 'OK'; } diff --git a/front/php/server/util.php b/front/php/server/util.php index de90b879..520bcc80 100755 --- a/front/php/server/util.php +++ b/front/php/server/util.php @@ -391,8 +391,8 @@ function getCache($key) { } } // ------------------------------------------------------------------------------------------- -function setCache($key, $value) { - setcookie($key, $value, time()+300, "/","", 0); // 5min cache +function setCache($key, $value, $expireMinutes = 5) { + setcookie($key, $value, time()+$expireMinutes*60, "/","", 0); }