chore:Settings DB table refactor

front/php/components/graph_online_history.php

@@ -39,4 +39,6 @@ $.get('api/table_online_history.json?nocache=' + Date.now(), function(res) {
         // Handle any errors in fetching the data
         console.error('Error fetching online history data.');
     });
-</script>
+</script>
+<!-- <canvas id="clientsChart" width="800" height="140" class="extratooltipcanvas no-user-select"></canvas> -->
+<canvas id="OnlineChart" style="width:100%; height: 150px;  margin-bottom: 15px;"></canvas>

front/php/server/util.php

@@ -161,6 +161,11 @@ function checkPermissions($files)
 {
   foreach ($files as $file)
   {
+
+    // // make sure the file ownership is correct
+    // chown($file, 'nginx');
+    // chgrp($file, 'www-data');
+
     // check access to database
     if(file_exists($file) != 1)
     {
@@ -331,7 +336,7 @@ function saveSettings()
 
     foreach ($decodedSettings as $setting) {
       $settingGroup = $setting[0];
-      $settingKey   = $setting[1];
+      $setKey   = $setting[1];
       $dataType     = $setting[2]; 
       $settingValue = $setting[3];
   
@@ -339,7 +344,7 @@ function saveSettings()
       // $settingType = json_decode($settingTypeJson, true);
   
       // Sanity check
-      if($settingKey == "UI_LANG" && $settingValue == "") {
+      if($setKey == "UI_LANG" && $settingValue == "") {
           echo "🔴 Error: important settings missing. Refresh the page with 🔃 on the top and try again.";
           return;
       }
@@ -348,14 +353,14 @@ function saveSettings()
   
           if ($dataType == 'string' ) {
               $val = encode_single_quotes($settingValue);
-              $txt .= $settingKey . "='" . $val . "'\n";
+              $txt .= $setKey . "='" . $val . "'\n";
           } elseif ($dataType == 'integer') {
-              $txt .= $settingKey . "=" . $settingValue . "\n";
+              $txt .= $setKey . "=" . $settingValue . "\n";
           } elseif ($dataType == 'json') {
-              $txt .= $settingKey . "=" . $settingValue . "\n";
+              $txt .= $setKey . "=" . $settingValue . "\n";
           } elseif ($dataType == 'boolean') {
               $val = ($settingValue === true || $settingValue === 1 || strtolower($settingValue) === 'true') ? "True" : "False";
-              $txt .= $settingKey . "=" . $val . "\n";
+              $txt .= $setKey . "=" . $val . "\n";
           } elseif ($dataType == 'array' ) {
               $temp = '';
               
@@ -373,18 +378,16 @@ function saveSettings()
               }
 
               $temp = '['.$temp.']'; // wrap brackets
-              $txt .= $settingKey . "=" . $temp . "\n";
+              $txt .= $setKey . "=" . $temp . "\n";
  
           } else  {
-              $txt .= $settingKey . "='⭕Not handled⭕'\n";
+              $txt .= $setKey . "='⭕Not handled⭕'\n";
           }
       }
   }
   
   }
 
-
-
   $txt = $txt."\n\n";
   $txt = $txt."#-------------------IMPORTANT INFO-------------------#\n";
   $txt = $txt."#   This file is ingested by a python script, so if  #\n";      
@@ -395,13 +398,15 @@ function saveSettings()
   // Create a temporary file
   $tempConfPath = $fullConfPath . ".tmp";
 
-  // Write your changes to the temporary file
-  $tempConfig = fopen($tempConfPath, "w") or die("Unable to open file!");
-  fwrite($tempConfig, $txt);
-  fclose($tempConfig);
+  // Backup the original file
+  if (file_exists($fullConfPath)) {
+    copy($fullConfPath, $fullConfPath . ".bak");
+  }
 
-  // Replace the original file with the temporary file
-  rename($tempConfPath, $fullConfPath);
+  // Open the file for writing without changing permissions
+  $file = fopen($fullConfPath, "w") or die("Unable to open file!");
+  fwrite($file, $txt);
+  fclose($file);
 
   // displayMessage(lang('settings_saved'), 
   //   FALSE, TRUE, TRUE, TRUE);    
@@ -411,9 +416,9 @@ function saveSettings()
 }
 
 // -------------------------------------------------------------------------------------------
-function getString ($codeName, $default) {
+function getString ($setKey, $default) {
 
-  $result = lang($codeName);
+  $result = lang($setKey);
 
   if ($result )
   {
@@ -423,7 +428,7 @@ function getString ($codeName, $default) {
   return $default;
 }
 // -------------------------------------------------------------------------------------------
-function getSettingValue($codeName) {
+function getSettingValue($setKey) {
   // Define the JSON endpoint URL  
   $url = dirname(__FILE__).'/../../../front/api/table_settings.json';  
 
@@ -443,16 +448,16 @@ function getSettingValue($codeName) {
     return 'Could not decode json data';
   }
 
-  // Search for the setting by Code_Name
+  // Search for the setting by setKey
   foreach ($data['data'] as $setting) {
-      if ($setting['Code_Name'] === $codeName) {
-          return $setting['Value'];
-          // echo $setting['Value'];
+      if ($setting['setKey'] === $setKey) {
+          return $setting['setValue'];
+          // echo $setting['setValue'];
       }
   }
 
   // Return false if the setting was not found
-  return 'Could not find setting '.$codeName;
+  return 'Could not find setting '.$setKey;
 }
 
 // -------------------------------------------------------------------------------------------

front/php/templates/language/lang.php

@@ -10,7 +10,7 @@ $allLanguages = ["en_us", "es_es", "de_de", "fr_fr", "it_it", "ru_ru", "nb_no",
 
 global $db;
 
-$result = $db->querySingle("SELECT Value FROM Settings WHERE Code_Name = 'UI_LANG'"); 
+$result = $db->querySingle("SELECT setValue FROM Settings WHERE setKey = 'UI_LANG'"); 
 
 // below has to match exactly teh values in /front/php/templates/language/lang.php & /front/js/common.js
 switch($result){