From 27519a39664dfa12de7480f14742207fe19fa637 Mon Sep 17 00:00:00 2001
From: Jokob-sk <jokob.sk@gmail.com>
Date: Fri, 11 Aug 2023 07:28:48 +1000
Subject: [PATCH] Maintenance icons #341

---
 front/maintenance.php                  | 22 +++++++++++++++++-----
 front/php/templates/language/lang.php  | 21 +++++++++++++++++----
 front/plugins/set_password/config.json |  2 +-
 pialert/initialise.py                  |  6 ++----
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/front/maintenance.php b/front/maintenance.php
index b83362a7..e6068778 100755
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -209,17 +209,29 @@ $db->close();
 
     <div class="nav-tabs-custom">
     <ul class="nav nav-tabs">
-        <li class="active">
-          <a id="tab_Settings_id" href="#tab_Settings" data-toggle="tab"><?= lang('Maintenance_Tools_Tab_UISettings');?></a>
+        <li class="active">          
+          <a id="tab_Settings_id" href="#tab_Settings" data-toggle="tab">
+            <i class="fa fa-cogs"></i> 
+            <?= lang('Maintenance_Tools_Tab_UISettings');?>
+          </a>
         </li>
         <li>
-          <a id="tab_DBTools_id" href="#tab_DBTools" data-toggle="tab"><?= lang('Maintenance_Tools_Tab_Tools');?></a>
+          <a id="tab_DBTools_id" href="#tab_DBTools" data-toggle="tab">
+            <i class="fa fa-toolbox"></i> 
+            <?= lang('Maintenance_Tools_Tab_Tools');?>
+          </a>
         </li>
         <li>
-          <a id="tab_BackupRestore_id" href="#tab_BackupRestore" data-toggle="tab"><?= lang('Maintenance_Tools_Tab_BackupRestore');?></a>
+          <a id="tab_BackupRestore_id" href="#tab_BackupRestore" data-toggle="tab">
+            <i class="fa fa-file-shield"></i> 
+            <?= lang('Maintenance_Tools_Tab_BackupRestore');?>
+          </a>
         </li>
         <li>
-          <a id="tab_Logging_id" href="#tab_Logging" data-toggle="tab"><?= lang('Maintenance_Tools_Tab_Logging');?></a>
+          <a id="tab_Logging_id" href="#tab_Logging" data-toggle="tab">
+            <i class="fa fa-triangle-exclamation"></i> 
+            <?= lang('Maintenance_Tools_Tab_Logging');?>
+          </a>
         </li>
     </ul>
     <div class="tab-content">
diff --git a/front/php/templates/language/lang.php b/front/php/templates/language/lang.php
index 8d640c83..1e656945 100755
--- a/front/php/templates/language/lang.php
+++ b/front/php/templates/language/lang.php
@@ -27,18 +27,31 @@ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
 }
 
 
-// Load data from JSON files 
 function getLanguageDataFromJson()
 {
     global $allLanguages;
 
+    // Default language
+    $defaultLanguage = 'en_us';
+
     // Array to hold the language data from the JSON files
     $languageData = [];
     
-    // Load and parse the JSON data from .json files
     foreach ($allLanguages as $language) {
-      $data = json_decode(file_get_contents(dirname(__FILE__).'/'.$language.'.json'), true); 
-      $languageData[$language] = $data[$language];
+        // Load and parse the JSON data from .json files
+        $jsonFilePath = dirname(__FILE__) . '/' . $language . '.json';
+        
+        if (file_exists($jsonFilePath)) {
+            $data = json_decode(file_get_contents($jsonFilePath), true);
+            
+            // Use the default language if the key is not found
+            $languageData[$language] = $data[$language] ?? $data[$defaultLanguage] ?? [];
+        } else {
+            // Handle the case where the JSON file doesn't exist
+            // For example, you might want to log an error message
+            echo 'File not found: '.$jsonFilePath;
+
+        }
     }
 
     return $languageData;
diff --git a/front/plugins/set_password/config.json b/front/plugins/set_password/config.json
index b0bd46e1..1196bdcb 100755
--- a/front/plugins/set_password/config.json
+++ b/front/plugins/set_password/config.json
@@ -39,7 +39,7 @@
       }],
       "description": [{
           "language_code":"en_us",
-          "string" : "Set to <code>once</code> and specify password to reset your pasword in <code>SETPWD_password</code>."
+          "string" : "Set to <code>before_config_save</code> and specify password to reset your pasword in <code>SETPWD_password</code>."
       }]
   },
   {
diff --git a/pialert/initialise.py b/pialert/initialise.py
index cc1d12b3..3a526106 100755
--- a/pialert/initialise.py
+++ b/pialert/initialise.py
@@ -64,14 +64,12 @@ def importConfigs (db):
 
     mylog('debug', ['[Import Config] checking config file '])
     mylog('debug', ['[Import Config] lastImportedConfFile     :', conf.lastImportedConfFile])
-    mylog('debug', ['[Import Config] file modified time       :', fileModifiedTime])
+    mylog('debug', ['[Import Config] fileModifiedTime         :', fileModifiedTime])
     
 
     if (fileModifiedTime == conf.lastImportedConfFile) :
         mylog('debug', ['[Import Config] skipping config file import'])
         return
-
-    conf.lastImportedConfFile = fileModifiedTime  
     
     mylog('debug', ['[Import Config] importing config file'])
     conf.mySettings = [] # reset settings
@@ -285,7 +283,7 @@ def importConfigs (db):
     run_plugin_scripts(db, 'before_config_save')
 
     # Used to determine the next import
-    conf.lastTimeImported = time.time()
+    conf.lastImportedConfFile = os.path.getmtime(config_file)      
     
     #TO DO this creates a circular reference between API and HELPER !