From 8a3acac3e1dff95c3501bd9a89ba9fa489886c96 Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Sat, 31 Dec 2022 15:23:04 +1100 Subject: [PATCH] added 5m cache to the parameters.php --- back/pialert.py | 2 +- front/php/server/parameters.php | 62 +++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/back/pialert.py b/back/pialert.py index 2ab7c356..d6b2c7cd 100755 --- a/back/pialert.py +++ b/back/pialert.py @@ -1742,7 +1742,7 @@ def performPholusScan (timeout): temp = subnet.split("--interface=") if len(temp) != 2: - file_print(" Skip interface (need subnet in format '192.168.1.0/24 --inteface=eth0'), got: ", subnet) + file_print(" Skip scan (need subnet in format '192.168.1.0/24 --inteface=eth0'), got: ", subnet) return mask = temp[0].strip() diff --git a/front/php/server/parameters.php b/front/php/server/parameters.php index 11fdbf8f..42275d8d 100755 --- a/front/php/server/parameters.php +++ b/front/php/server/parameters.php @@ -20,9 +20,6 @@ //------------------------------------------------------------------------------ // Set maximum execution time to 15 seconds ini_set ('max_execution_time','15'); - - // Open DB - OpenDB(); // Action functions if (isset ($_REQUEST['action']) && !empty ($_REQUEST['action'])) { @@ -39,19 +36,41 @@ // Get Parameter Value //------------------------------------------------------------------------------ function getParameter() { - global $db; $parameter = $_REQUEST['parameter']; - $sql = 'SELECT par_Value FROM Parameters - WHERE par_ID="'. quotes($_REQUEST['parameter']) .'"'; - - $result = $db->query($sql); - $row = $result -> fetchArray (SQLITE3_NUM); - $value = $row[0]; + $value = ""; + + // get the value from the cookie if available + if(getCache($parameter) != "") + { + $value = getCache($parameter); + } + + // query the database if no cache entry found + if($parameter == "Back_App_State" || $value == "" ) + { + // Open DB + OpenDB(); + + global $db; + + $sql = 'SELECT par_Value FROM Parameters + WHERE par_ID="'. quotes($parameter) .'"'; + + $result = $db->query($sql); + $row = $result -> fetchArray (SQLITE3_NUM); + $value = $row[0]; + + // Close DB + $db->close(); + + // update cookie cache + setCache($parameter, $value); + } // displayMessage ($value); - echo (json_encode ($value)); + } @@ -59,11 +78,18 @@ function getParameter() { // Set Parameter Value //------------------------------------------------------------------------------ function setParameter() { + + $parameter = $_REQUEST['parameter']; + $value = $_REQUEST['value']; + + // Open DB + OpenDB(); + global $db; // Update value - $sql = 'UPDATE Parameters SET par_Value="'. quotes ($_REQUEST['value']) .'" - WHERE par_ID="'. quotes($_REQUEST['parameter']) .'"'; + $sql = 'UPDATE Parameters SET par_Value="'. quotes ($value) .'" + WHERE par_ID="'. quotes($parameter) .'"'; $result = $db->query($sql); if (! $result == TRUE) { @@ -75,8 +101,8 @@ function setParameter() { if ($changes == 0) { // Insert new value $sql = 'INSERT INTO Parameters (par_ID, par_Value) - VALUES ("'. quotes($_REQUEST['parameter']) .'", - "'. quotes($_REQUEST['value']) .'")'; + VALUES ("'. quotes($parameter) .'", + "'. quotes($value) .'")'; $result = $db->query($sql); if (! $result == TRUE) { @@ -85,6 +111,12 @@ function setParameter() { } } + // Close DB + $db->close(); + + // update cookie cache + setCache($parameter, $value); + echo 'OK'; }