From 7bae0f5042de87b62cb4472e54253cd7ff674141 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob.sk@gmail.com>
Date: Sat, 16 Jul 2022 15:47:43 +1000
Subject: [PATCH] fixes

---
 front/maintenance.php                  | 21 +++++++++++++++++
 front/php/server/devices.php           | 31 ++++++++++++++++++++++++++
 front/php/templates/header.php         |  5 -----
 front/php/templates/language/en_us.php |  4 ++++
 4 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/front/maintenance.php b/front/maintenance.php
index 51462c18..35231337 100644
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -342,6 +342,12 @@ if (submit && isset($_POST['langselector_set'])) {
                         </div>
                         <div class="db_tools_table_cell_b"><?php echo $pia_lang['Maintenance_Tool_restore_text'];?></div>
                     </div>
+                    <div class="db_info_table_row">
+                        <div class="db_tools_table_cell_a" style="">
+                            <button type="button" class="btn btn-default pa-btn pa-btn-delete bg-red dbtools-button" id="btnUpgadeDatabase" style="border-top: solid 3px #dd4b39;" onclick="askUpgradeDatabase()"><?php echo $pia_lang['Maintenance_Tool_upgrade_database_noti'];?><br><?php echo $latestbackup_date;?></button>
+                        </div>
+                        <div class="db_tools_table_cell_b"><?php echo $pia_lang['Maintenance_Tool_upgrade_database_noti_text'];?></div>
+                    </div>
                 </div>
              </div>
               <!-- /.box-body -->
@@ -366,6 +372,21 @@ if (submit && isset($_POST['langselector_set'])) {
 
 <script>
 
+// delete devices with emty macs
+function askUpgradeDatabase () {
+  // Ask 
+  showModalWarning('<?php echo $pia_lang['Maintenance_Tool_upgrade_database_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_upgrade_database_noti_text'];?>',
+    'Cancel', 'Delete', 'upgradeDatabase');
+}
+function upgradeDatabase()
+{ 
+  // Delete device
+  $.get('php/server/devices.php?action=upgradeDatabase', function(msg) {
+    showMessage (msg);
+  });
+}
+
+
 // delete devices with emty macs
 function askDeleteDevicesWithEmptyMACs () {
   // Ask 
diff --git a/front/php/server/devices.php b/front/php/server/devices.php
index 4e3beda8..4d7484d9 100644
--- a/front/php/server/devices.php
+++ b/front/php/server/devices.php
@@ -36,6 +36,7 @@ if (strlen($pia_lang_selected) == 0) {$pia_lang_selected = 'en_us';}
       case 'setDeviceData':           setDeviceData();                         break;
       case 'deleteDevice':            deleteDevice();                          break;
       case 'deleteAllWithEmptyMACs':  deleteAllWithEmptyMACs();                break;
+      case 'upgradeDatabase':         upgradeDB();                             break;
       case 'createBackupDB':          createBackupDB();                        break;
       case 'restoreBackupDB':         restoreBackupDB();                       break;
       case 'deleteAllDevices':        deleteAllDevices();                      break;
@@ -211,6 +212,36 @@ function deleteAllWithEmptyMACs() {
   }
 }
 
+//------------------------------------------------------------------------------
+//  Upgrade the database to enable new functionality
+//------------------------------------------------------------------------------
+function upgradeDB() {
+  global $db;
+  global $pia_lang;
+
+  // sql
+  $sql = '
+  -- Online_History definition
+
+  CREATE TABLE "Online_History" (
+    "Index"	INTEGER,
+    "Scan_Date"	TEXT,
+    "Online_Devices"	INTEGER,
+    "Down_Devices"	INTEGER,
+    "All_Devices"	INTEGER,
+    PRIMARY KEY("Index" AUTOINCREMENT)
+  );';
+  // execute sql
+  $result = $db->query($sql);
+
+  // check result
+  if ($result == TRUE) {
+    echo $pia_lang['BackDevices_DBTools_Upgrade'];
+  } else {
+    echo $pia_lang['BackDevices_DBTools_UpgradeError']."\n\n$sql \n\n". $db->lastErrorMsg();
+  }
+}
+
 //------------------------------------------------------------------------------
 //  Delete all devices with empty MAC addresses
 //------------------------------------------------------------------------------
diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index 2f7c8fce..7fcf563a 100644
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -226,11 +226,6 @@ function show_pia_servertime() {
         <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
           <a href="maintenance.php"><i class="fa fa-cog"></i> <span><?php echo $pia_lang['Navigation_Maintenance'];?></span></a>
         </li>
-
-        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
-          <a href="maintenance.php"><i class="fa fa-cog"></i> <span>Maintenance</span></a>
-        </li>
-
 <!--
         <li class="treeview">
           <a href="#"><i class="fa fa-link"></i> <span>Config</span>
diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php
index 36da6ed2..2f2b4d69 100644
--- a/front/php/templates/language/en_us.php
+++ b/front/php/templates/language/en_us.php
@@ -186,6 +186,8 @@ $pia_lang['Maintenance_Tool_del_empty_macs'] = 'Delete Devices with empty MACs';
 $pia_lang['Maintenance_Tool_del_empty_macs_text'] = 'Before using this function, please make a backup. The deletion cannot be undone. All devices without MAC will be deleted from the database.';
 $pia_lang['Maintenance_Tool_del_empty_macs_noti'] = 'Delete Devices';
 $pia_lang['Maintenance_Tool_del_empty_macs_noti_text'] = 'Are you sure you want to delete all devices with empty MAC addresses?<br>(maybe you prefer to archive it)';
+$pia_lang['Maintenance_Tool_upgrade_database_noti'] = 'Upgrade database';
+$pia_lang['Maintenance_Tool_upgrade_database_noti_text'] = 'Are you sure you want to upgrade the database?<br>(maybe you prefer to archive it)';
 $pia_lang['Maintenance_Tool_del_alldev'] = 'Delete all Devices';
 $pia_lang['Maintenance_Tool_del_alldev_text'] = 'Before using this function, please make a backup. The deletion cannot be undone. All devices will be deleted from the database.';
 $pia_lang['Maintenance_Tool_del_alldev_noti'] = 'Delete Devices';
@@ -229,5 +231,7 @@ $pia_lang['BackDevices_DBTools_DelDevError_a'] = 'Error deleting Device';
 $pia_lang['BackDevices_DBTools_DelDevError_b'] = 'Error deleting Devices';
 $pia_lang['BackDevices_DBTools_UpdDev'] = 'Device updated successfully';
 $pia_lang['BackDevices_DBTools_UpdDevError'] = 'Error updating device';
+$pia_lang['BackDevices_DBTools_Upgrade'] = 'Database upgraded successfully';
+$pia_lang['BackDevices_DBTools_UpgradeError'] = 'Database upgrade failed';
 ?>