From b20af097b730bfe31426d31a971a4e0a438fa609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cterorero=E2=80=9D?= <“devin@devinconde.com”>
Date: Sun, 24 Jul 2022 04:40:26 -0400
Subject: [PATCH 01/13] Update new lines

Update new lines
---
 front/php/templates/language/es_es.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/front/php/templates/language/es_es.php b/front/php/templates/language/es_es.php
index d00234f0..ea4be67c 100644
--- a/front/php/templates/language/es_es.php
+++ b/front/php/templates/language/es_es.php
@@ -1,6 +1,6 @@
 <?php
 //////////////////////////////////////////////////////////////////
-// Device Page - by @TeroRERO 23jul2022
+// Device Page - by @TeroRERO 24jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Navigation_Devices'] = 'Dispositivos';
@@ -37,7 +37,7 @@ $pia_lang['Device_Table_nav_next'] = 'Siguiente';
 $pia_lang['Device_Table_nav_prev'] = 'Anterior';
 
 //////////////////////////////////////////////////////////////////
-// Presence Page - by @TeroRERO 23jul2022
+// Presence Page - by @TeroRERO 24jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Presence_Title'] = 'Historial por dispositivo';
@@ -58,7 +58,7 @@ $pia_lang['Presence_CalHead_month'] = 'mes';
 $pia_lang['Presence_CalHead_week'] = 'semana';
 
 //////////////////////////////////////////////////////////////////
-// Events Page - by @TeroRERO 23jul2022
+// Events Page - by @TeroRERO 24jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Events_Title'] = 'Eventos';
@@ -94,7 +94,7 @@ $pia_lang['Events_Table_nav_next'] = 'Siguiente';
 $pia_lang['Events_Table_nav_prev'] = 'Anterior';
 
 //////////////////////////////////////////////////////////////////
-// Device Details Page - by @TeroRERO 23jul2022
+// Device Details Page - by @TeroRERO 24jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['DevDetail_Periodselect_today'] = 'Hoy';
@@ -155,7 +155,7 @@ $pia_lang['DevDetail_Nmap_buttonDefault_text'] = 'Escaneo predeterminado: NMAP e
 $pia_lang['DevDetail_Nmap_buttonDetail_text'] = 'Escaneo detallado: escaneo predeterminado con detección de sistema operativo habilitado, detección de versiones, escaneo de script y traceroute (hasta 30 segundos o más)';
 
 //////////////////////////////////////////////////////////////////
-// Maintenance Page - by @TeroRERO 23jul2022
+// Maintenance Page - by @TeroRERO 24jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Maintenance_Title'] = 'Herramientas de mantenimiento';
@@ -217,13 +217,13 @@ $pia_lang['Maintenance_Tool_restore'] = 'Restaurar DB';
 $pia_lang['Maintenance_Tool_restore_text'] = 'La última copia de seguridad se puede restaurar a través del botón, pero las copias de seguridad anteriores solo se pueden restaurar manualmente. Después de la restauración, realice una verificación de integridad en la base de datos por seguridad, en caso de que el DB estuviera actualmente en acceso de escritura cuando se creó la copia de seguridad.';
 $pia_lang['Maintenance_Tool_restore_noti'] = 'Restaurar DB';
 $pia_lang['Maintenance_Tool_restore_noti_text'] = '¿Estás seguro de que quieres hacer exactos la restauración de DB? Asegúrese de que ningún escaneo se esté ejecutando actualmente.';
-$pia_lang['Maintenance_Tool_purgebackup'] = 'Purge Backups';
-$pia_lang['Maintenance_Tool_purgebackup_text'] = 'All other backups will be deleted except for the last 3 backups.';
-$pia_lang['Maintenance_Tool_purgebackup_noti'] = 'Purge Backups';
-$pia_lang['Maintenance_Tool_purgebackup_noti_text'] = 'Are you sure you want to delete all backups except the last 3?';
+$pia_lang['Maintenance_Tool_purgebackup'] = 'Purgar Respaldos';
+$pia_lang['Maintenance_Tool_purgebackup_text'] = 'Todas las copias de seguridad serán eliminadas, excepto las 3 últimas.';
+$pia_lang['Maintenance_Tool_purgebackup_noti'] = 'Purgar Respaldos';
+$pia_lang['Maintenance_Tool_purgebackup_noti_text'] = '¿Está seguro de borrar todas las copias de seguridad excepto las 3 últimas?';
 
 //////////////////////////////////////////////////////////////////
-// Maintenance Page - by @TeroRERO 23jul2022
+// Maintenance Page - by @TeroRERO 24jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['BackDevices_Arpscan_disabled'] = 'Arp-Scan Desactivado';
@@ -246,6 +246,5 @@ $pia_lang['BackDevices_DBTools_UpdDev'] = 'Dispositivo actualizado con éxito';
 $pia_lang['BackDevices_DBTools_UpdDevError'] = 'Error al actualizar el dispositivo';
 $pia_lang['BackDevices_DBTools_Upgrade'] = 'Base de datos actualizada correctamente';
 $pia_lang['BackDevices_DBTools_UpgradeError'] = 'Falló la actualización de la base de datos';
-$pia_lang['BackDevices_DBTools_Purge'] = 'The oldest backups were deleted';
+$pia_lang['BackDevices_DBTools_Purge'] = 'Las copias de seguridad más antiguas fueron eliminadas';
 ?>
-

From cf83abb16b28b37298aea74cda66f6d3d7995ed4 Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Sun, 24 Jul 2022 14:55:36 +0200
Subject: [PATCH 02/13] Update pialert.py

Change Request handling
---
 back/pialert.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/back/pialert.py b/back/pialert.py
index 1dd6278d..c1433bb3 100644
--- a/back/pialert.py
+++ b/back/pialert.py
@@ -27,8 +27,9 @@ import socket
 import io
 import smtplib
 import csv
-from urllib.parse import urlencode
-from urllib.request import Request, urlopen
+import requests
+#from urllib.parse import urlencode
+#from urllib.request import Request, urlopen
 
 
 #===============================================================================
@@ -1404,9 +1405,10 @@ def send_pushsafer (_Text):
         "ut" : 'Open Pi.Alert',
         "k" : PUSHSAFER_TOKEN,
         }
-
-    request = Request(url, urlencode(post_fields).encode())
-    json = urlopen(request).read().decode()
+    
+    requests.post(url, data=post_fields)
+    #request = Request(url, urlencode(post_fields).encode())
+    #json = urlopen(request).read().decode()
     # print(json)
 
 #-------------------------------------------------------------------------------

From d002b2d009e9ffcc742c1aa99a93f6dc10951a85 Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Sun, 24 Jul 2022 15:54:55 +0200
Subject: [PATCH 03/13] Update maintenance.php

---
 front/maintenance.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/front/maintenance.php b/front/maintenance.php
index 50db2ae1..5fd51823 100644
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -214,7 +214,6 @@ if (submit && isset($_POST['langselector_set'])) {
           </div>
       </div>
 
-
     <div class="nav-tabs-custom">
     <ul class="nav nav-tabs">
         <li class="active"><a href="#tab_Settings" data-toggle="tab"><?php echo $pia_lang['Maintenance_Tools_Tab_Settings'];?></a></li>
@@ -338,8 +337,6 @@ if (submit && isset($_POST['langselector_set'])) {
     </div>
 </div>
 
-
-
 <div style="width: 100%; height: 20px;"></div>
     <!-- ----------------------------------------------------------------------- -->
 
@@ -354,7 +351,6 @@ if (submit && isset($_POST['langselector_set'])) {
   require 'php/templates/footer.php';
 ?>
 
-
 <script>
 
 // delete devices with emty macs

From a5a3507667c740994eadf555fcba108fc22462ea Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Sun, 24 Jul 2022 16:15:04 +0200
Subject: [PATCH 04/13] Rollback some unused changes

---
 back/pialert.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/back/pialert.py b/back/pialert.py
index c1433bb3..be91a372 100644
--- a/back/pialert.py
+++ b/back/pialert.py
@@ -28,9 +28,6 @@ import io
 import smtplib
 import csv
 import requests
-#from urllib.parse import urlencode
-#from urllib.request import Request, urlopen
-
 
 #===============================================================================
 # CONFIG CONSTANTS
@@ -711,8 +708,8 @@ def print_scan_stats ():
     History_Online = sql.fetchall()
     History_Online_Devices  = len(History_Online)
     History_Offline_Devices = History_All_Devices - History_Archived_Devices - History_Online_Devices
-    sql.execute ("INSERT INTO Online_History (Scan_Date, Online_Devices, Down_Devices, All_Devices, Archived_Devices, ScanCycle) "+
-                 "VALUES ( ?, ?, ?, ?, ?, ?)", (startTime, History_Online_Devices, History_Offline_Devices, History_All_Devices, History_Archived_Devices, cycle ) )
+    sql.execute ("INSERT INTO Online_History (Scan_Date, Online_Devices, Down_Devices, All_Devices, Archived_Devices ) "+
+                 "VALUES ( ?, ?, ?, ?, ?)", (startTime, History_Online_Devices, History_Offline_Devices, History_All_Devices, History_Archived_Devices ) )
 
 #-------------------------------------------------------------------------------
 def create_new_devices ():

From 337dec8ec33bd32de91692a6a33e6eb7be2b2abd Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Sun, 24 Jul 2022 16:15:59 +0200
Subject: [PATCH 05/13] merge commit
 https://github.com/jokob-sk/Pi.Alert/commit/3df87f6f36645cfef4f427c782b5df573db45194

---
 front/php/server/events.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/front/php/server/events.php b/front/php/server/events.php
index 1d0fa228..60e79478 100644
--- a/front/php/server/events.php
+++ b/front/php/server/events.php
@@ -267,7 +267,7 @@ function getDevicePresence() {
 
   // SQL
   $SQL = 'SELECT ses_EventTypeConnection, ses_DateTimeConnection,
-                 ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo,
+                 ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo, ses_StillConnected,
             
                  CASE
                    WHEN ses_EventTypeConnection = "<missing event>" THEN
@@ -290,11 +290,13 @@ function getDevicePresence() {
   // arrays of rows
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
     // Event color
-    if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
-      $color = '#f39c12';
-    } else {
-      $color = '#0073b7';
-    }
+  if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
+        $color = '#f39c12';
+      } elseif ($row['ses_StillConnected'] == 1 ) {
+        $color = '#00a659';
+      } else {
+        $color = '#0073b7';
+      }
 
     // tooltip
     $tooltip = 'Connection: '    . formatEventDate ($row['ses_DateTimeConnection'],    $row['ses_EventTypeConnection'])    . chr(13) .
@@ -333,7 +335,7 @@ function getEventsCalendar() {
 
   // SQL
   $SQL = 'SELECT ses_MAC, ses_EventTypeConnection, ses_DateTimeConnection,
-                 ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo,
+                 ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo, ses_StillConnected,
             
                  CASE
                    WHEN ses_EventTypeConnection = "<missing event>" THEN
@@ -356,10 +358,12 @@ function getEventsCalendar() {
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
     // Event color
     if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
-      $color = '#f39c12';
-    } else {
-      $color = '#0073b7';
-    }
+        $color = '#f39c12';
+      } elseif ($row['ses_StillConnected'] == 1 ) {
+        $color = '#00a659';
+      } else {
+        $color = '#0073b7';
+      }
 
     // tooltip
     $tooltip = 'Connection: '    . formatEventDate ($row['ses_DateTimeConnection'],    $row['ses_EventTypeConnection'])    . chr(13) .

From d1d79691dd39451d7cfcbf74c49dbe0b9559a273 Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Mon, 25 Jul 2022 11:17:07 +0200
Subject: [PATCH 06/13] Quickfix if an old config file is involved

a missing key could cause, that login not possible when PIALERT_WEB_PROTECTION and PIALERT_WEB_PRASSWORD missing. A more advanced fix will follow.
---
 front/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/index.php b/front/index.php
index 55005e41..4aae0831 100644
--- a/front/index.php
+++ b/front/index.php
@@ -19,7 +19,7 @@ $config_file_lines_bypass = array_values(preg_grep('/^PIALERT_WEB_PROTECTION\s.*
 $protection_line = explode("=", $config_file_lines_bypass[0]);
 $Pia_WebProtection = strtolower(trim($protection_line[1]));
 
-if ($Pia_WebProtection == 'false')
+if ($Pia_WebProtection != 'true')
   {
       header('Location: /pialert/devices.php');
       $_SESSION["login"] = 1;
@@ -156,4 +156,4 @@ if ($ENABLED_DARKMODE === True) {
 <?php
 
   }
-?>
\ No newline at end of file
+?>

From d5582b318df6e9edab71f37ea06348896d9e04ec Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Mon, 25 Jul 2022 14:10:23 +0200
Subject: [PATCH 07/13] More robust script

If the necessary entries do not exist in the configuration file, they will be created now.
---
 config/reset_password.sh | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/config/reset_password.sh b/config/reset_password.sh
index a7f933ee..97258d53 100644
--- a/config/reset_password.sh
+++ b/config/reset_password.sh
@@ -1,7 +1,35 @@
-cp pialert.conf pialert.conf.bak
+#!/bin/sh
+PIA_CONF_FILE='pialert.conf'
 PIA_PASS=$1
-echo "The password '$1' is hashed"
-PIA_PASS_HASH=$(echo -n $PIA_PASS | sha256sum | awk '{print $1}')
-echo "The hashed password is: $PIA_PASS_HASH"
-sed -i "/PIALERT_WEB_PASSWORD/c\PIALERT_WEB_PASSWORD = '$PIA_PASS_HASH'" pialert.conf
-echo "The hash was saved in the configuration file"
\ No newline at end of file
+echo "Check of key PIALERT_WEB_PROTECTION exists:"
+CHECK_PROT=$(grep "PIALERT_WEB_PROTECTION" $PIA_CONF_FILE | wc -l)
+if [ $CHECK_PROT -eq 0 ]
+then
+    echo "   Key not found. Key 'PIALERT_WEB_PROTECTION' will be created."
+    echo "   Check Config after the script is finished."
+    sed "/^VENDORS_DB.*/a PIALERT_WEB_PROTECTION = True" $PIA_CONF_FILE > pialert.tmp
+    rm $PIA_CONF_FILE.bak
+    mv $PIA_CONF_FILE $PIA_CONF_FILE.bak
+    mv pialert.tmp $PIA_CONF_FILE
+else
+    echo "   Key exists. Nothing to do."
+fi
+echo ""
+echo "Check of key PIALERT_WEB_PASSWORD exists:"
+CHECK_PWD=$(grep "PIALERT_WEB_PASSWORD" $PIA_CONF_FILE | wc -l)
+if [ $CHECK_PWD -eq 0 ]
+then
+    echo "   Key not found. Key 'PIALERT_WEB_PASSWORD' will be created."
+    echo "   Check Config after the script is finished."
+    echo "   If the key is just created, please run the script again to set a new password".
+    sed "/^PIALERT_WEB_PROTECTION.*/a PIALERT_WEB_PASSWORD = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'" $PIA_CONF_FILE > pialert.tmp
+    rm $PIA_CONF_FILE.bak
+    mv $PIA_CONF_FILE $PIA_CONF_FILE.bak
+    mv pialert.tmp $PIA_CONF_FILE
+else
+    echo "   The password '$1' is hashed"
+    PIA_PASS_HASH=$(echo -n $PIA_PASS | sha256sum | awk '{print $1}')
+    echo "   The hashed password is: $PIA_PASS_HASH"
+    sed -i "/PIALERT_WEB_PASSWORD/c\PIALERT_WEB_PASSWORD = '$PIA_PASS_HASH'" $PIA_CONF_FILE
+    echo "   The hash was saved in the configuration file"
+fi

From 415ca8a1fff7dff201de36a0413a838c20253356 Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Mon, 25 Jul 2022 14:37:30 +0200
Subject: [PATCH 08/13] Update reset_password.sh

---
 config/reset_password.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/reset_password.sh b/config/reset_password.sh
index 97258d53..82af304c 100644
--- a/config/reset_password.sh
+++ b/config/reset_password.sh
@@ -7,7 +7,7 @@ if [ $CHECK_PROT -eq 0 ]
 then
     echo "   Key not found. Key 'PIALERT_WEB_PROTECTION' will be created."
     echo "   Check Config after the script is finished."
-    sed "/^VENDORS_DB.*/a PIALERT_WEB_PROTECTION = True" $PIA_CONF_FILE > pialert.tmp
+    sed "/^VENDORS_DB.*/a PIALERT_WEB_PROTECTION = False" $PIA_CONF_FILE > pialert.tmp
     rm $PIA_CONF_FILE.bak
     mv $PIA_CONF_FILE $PIA_CONF_FILE.bak
     mv pialert.tmp $PIA_CONF_FILE

From 4d59388c83edcc2dba190e6bd10f3f3f337701e5 Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Mon, 25 Jul 2022 16:55:37 +0200
Subject: [PATCH 09/13] improve reset_password script

---
 config/reset_password.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/config/reset_password.sh b/config/reset_password.sh
index 82af304c..6f79e7a4 100644
--- a/config/reset_password.sh
+++ b/config/reset_password.sh
@@ -5,12 +5,10 @@ echo "Check of key PIALERT_WEB_PROTECTION exists:"
 CHECK_PROT=$(grep "PIALERT_WEB_PROTECTION" $PIA_CONF_FILE | wc -l)
 if [ $CHECK_PROT -eq 0 ]
 then
+    cp $PIA_CONF_FILE $PIA_CONF_FILE.bak1
     echo "   Key not found. Key 'PIALERT_WEB_PROTECTION' will be created."
     echo "   Check Config after the script is finished."
-    sed "/^VENDORS_DB.*/a PIALERT_WEB_PROTECTION = False" $PIA_CONF_FILE > pialert.tmp
-    rm $PIA_CONF_FILE.bak
-    mv $PIA_CONF_FILE $PIA_CONF_FILE.bak
-    mv pialert.tmp $PIA_CONF_FILE
+    sed -i "/^VENDORS_DB.*/a PIALERT_WEB_PROTECTION = False" $PIA_CONF_FILE > pialert.tmp
 else
     echo "   Key exists. Nothing to do."
 fi
@@ -19,17 +17,16 @@ echo "Check of key PIALERT_WEB_PASSWORD exists:"
 CHECK_PWD=$(grep "PIALERT_WEB_PASSWORD" $PIA_CONF_FILE | wc -l)
 if [ $CHECK_PWD -eq 0 ]
 then
+    cp $PIA_CONF_FILE $PIA_CONF_FILE.bak2
     echo "   Key not found. Key 'PIALERT_WEB_PASSWORD' will be created."
     echo "   Check Config after the script is finished."
     echo "   If the key is just created, please run the script again to set a new password".
-    sed "/^PIALERT_WEB_PROTECTION.*/a PIALERT_WEB_PASSWORD = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'" $PIA_CONF_FILE > pialert.tmp
-    rm $PIA_CONF_FILE.bak
-    mv $PIA_CONF_FILE $PIA_CONF_FILE.bak
-    mv pialert.tmp $PIA_CONF_FILE
+    sed -i "/^PIALERT_WEB_PROTECTION.*/a PIALERT_WEB_PASSWORD = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'" $PIA_CONF_FILE
 else
     echo "   The password '$1' is hashed"
     PIA_PASS_HASH=$(echo -n $PIA_PASS | sha256sum | awk '{print $1}')
-    echo "   The hashed password is: $PIA_PASS_HASH"
+    echo "   The hashed password is:"
+    echo "   $PIA_PASS_HASH"
     sed -i "/PIALERT_WEB_PASSWORD/c\PIALERT_WEB_PASSWORD = '$PIA_PASS_HASH'" $PIA_CONF_FILE
     echo "   The hash was saved in the configuration file"
 fi

From fe2049c5fe2b55467ada7bb927b2788c5c0479a6 Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Mon, 25 Jul 2022 16:55:43 +0200
Subject: [PATCH 10/13] Update dark-patch.css

---
 front/css/dark-patch.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/front/css/dark-patch.css b/front/css/dark-patch.css
index d49882d7..40811a98 100644
--- a/front/css/dark-patch.css
+++ b/front/css/dark-patch.css
@@ -640,6 +640,9 @@ input[type="password"]::-webkit-caps-lock-indicator {
   background-color: #272c30;
   color: #bec5cb;
 }
+.nav-tabs-custom > .nav-tabs {
+  background-color: #353c42;
+}
 .nav-tabs-custom .tab-content {
   background-color: #272c30;
 }

From e7614de332c49bb8535082e4230ca5f4d034974e Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Mon, 25 Jul 2022 16:56:02 +0200
Subject: [PATCH 11/13] Update pialert_patch_DB.sh

---
 install/pialert_patch_DB.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/install/pialert_patch_DB.sh b/install/pialert_patch_DB.sh
index fd99ca26..bc036abb 100755
--- a/install/pialert_patch_DB.sh
+++ b/install/pialert_patch_DB.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
+DB_NAME="pialert.db"
 echo "Create backup before insert new table"
-cp ../db/pialert.db ../db/pialert.db.bak
-echo "Insert new table 'Online_History' to pialert.db"
-sqlite3 ../db/pialert.db  "CREATE TABLE 'Online_History' ('Index' INTEGER, 'Scan_Date' TEXT, 'Online_Devices' INTEGER, 'Down_Devices' INTEGER, 'All_Devices' INTEGER, 'Archived_Devices' INTEGER, PRIMARY KEY('Index' AUTOINCREMENT));"
+cp ../db/$DB_NAME ../db/pialert.db.bak
+echo "Insert new table 'Online_History' to $DB_NAME"
+sqlite3 ../db/$DB_NAME "CREATE TABLE 'Online_History' ('Index' INTEGER, 'Scan_Date' TEXT, 'Online_Devices' INTEGER, 'Down_Devices' INTEGER, 'All_Devices' INTEGER, 'Archived_Devices' INTEGER, PRIMARY KEY('Index' AUTOINCREMENT));"
+

From 35ea34592267478deec853ab59f5b51d7b4ed93b Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Mon, 25 Jul 2022 18:00:35 +0200
Subject: [PATCH 12/13] add reset activity graph

---
 front/maintenance.php                  | 22 ++++++++++++++
 front/php/server/devices.php           | 23 ++++++++++++++-
 front/php/templates/language/de_de.php | 40 +++++++++++++++-----------
 front/php/templates/language/en_us.php |  4 +++
 front/php/templates/language/es_es.php |  4 +++
 5 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/front/maintenance.php b/front/maintenance.php
index 5fd51823..7616919e 100644
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -310,6 +310,14 @@ if (submit && isset($_POST['langselector_set'])) {
                         </div>
                         <div class="db_tools_table_cell_b"><?php echo $pia_lang['Maintenance_Tool_del_allevents_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="btnDeleteActHistory" onclick="askDeleteActHistory()"><?php echo $pia_lang['Maintenance_Tool_del_ActHistory'];?></button>
+                        </div>
+                        <div class="db_tools_table_cell_b"><?php echo $pia_lang['Maintenance_Tool_del_ActHistory_text'];?></div>
+                    </div>
                 </div>
         </div>
         <div class="tab-pane" id="tab_BackupRestore">
@@ -409,6 +417,20 @@ function deleteEvents()
   });
 }
 
+// delete Hostory 
+function askDeleteActHistory () {
+  // Ask 
+  showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_ActHistory_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_ActHistory_noti_text'];?>',
+    'Cancel', 'Delete', 'deleteActHistory');
+}
+function deleteActHistory()
+{ 
+  // Execute
+  $.get('php/server/devices.php?action=deleteActHistory', function(msg) {
+    showMessage (msg);
+  });
+}
+
 // Backup DB to Archive 
 function askPiaBackupDBtoArchive () {
   // Ask 
diff --git a/front/php/server/devices.php b/front/php/server/devices.php
index b317bb25..406acf37 100644
--- a/front/php/server/devices.php
+++ b/front/php/server/devices.php
@@ -43,6 +43,7 @@ if (strlen($pia_lang_selected) == 0) {$pia_lang_selected = 'en_us';}
       case 'runScan1min':             runScan1min();                           break;
       case 'deleteUnknownDevices':    deleteUnknownDevices();                  break;
       case 'deleteEvents':            deleteEvents();                          break;
+      case 'deleteActHistory':        deleteActHistory();                      break;
       case 'PiaBackupDBtoArchive':    PiaBackupDBtoArchive();                  break;
       case 'PiaRestoreDBfromArchive': PiaRestoreDBfromArchive();               break;
       case 'PiaPurgeDBBackups':       PiaPurgeDBBackups();                     break;
@@ -274,6 +275,26 @@ function deleteEvents() {
   }
 }
 
+//------------------------------------------------------------------------------
+//  Delete History
+//------------------------------------------------------------------------------
+function deleteActHistory() {
+  global $db;
+  global $pia_lang;
+
+  // sql
+  $sql = 'DELETE FROM Online_History';
+  // execute sql
+  $result = $db->query($sql);
+
+  // check result
+  if ($result == TRUE) {
+    echo $pia_lang['BackDevices_DBTools_DelActHistory'];
+  } else {
+    echo $pia_lang['BackDevices_DBTools_DelActHistoryError']."\n\n$sql \n\n". $db->lastErrorMsg();
+  }
+}
+
 //------------------------------------------------------------------------------
 //  Backup DB to Archiv
 //------------------------------------------------------------------------------
@@ -360,7 +381,7 @@ function PiaPurgeDBBackups() {
   echo $pia_lang['BackDevices_DBTools_Purge'];
   echo("<meta http-equiv='refresh' content='1'>");
     
-  }
+}
 
 //------------------------------------------------------------------------------
 //  Toggle Dark/Light Themes
diff --git a/front/php/templates/language/de_de.php b/front/php/templates/language/de_de.php
index 35bab965..9e3febbe 100644
--- a/front/php/templates/language/de_de.php
+++ b/front/php/templates/language/de_de.php
@@ -221,31 +221,37 @@ $pia_lang['Maintenance_Tool_purgebackup'] = 'Sicherungen aufräumen';
 $pia_lang['Maintenance_Tool_purgebackup_text'] = 'Es werden, bis auf die letzten 3 Backups, alle übrigen Backups gelöscht.';
 $pia_lang['Maintenance_Tool_purgebackup_noti'] = 'Sicherungen aufräumen';
 $pia_lang['Maintenance_Tool_purgebackup_noti_text'] = 'Sind Sie sicher, alle Backups, bis auf die letzten 3 löschen möchten?';
+$pia_lang['Maintenance_Tool_del_ActHistory'] = 'Löschen der Netzwerkaktivität';
+$pia_lang['Maintenance_Tool_del_ActHistory_text'] = 'Der Graph für die Netzwerkaktivität wird zurückgesetzt. Hierbei werden die Events nicht beeinflusst.';
+$pia_lang['Maintenance_Tool_del_ActHistory_noti'] = 'Netzwerkaktivität löschen';
+$pia_lang['Maintenance_Tool_del_ActHistory_noti_text'] = 'Sind Sie sicher, dass Sie die Netzwerkaktivität zurücksetzen möchten?';
 
 //////////////////////////////////////////////////////////////////
 // Maintenance Page
 //////////////////////////////////////////////////////////////////
 
-$pia_lang['BackDevices_Arpscan_disabled'] = 'Automatischer Arp-Scan deaktiviert';
-$pia_lang['BackDevices_Arpscan_enabled'] = 'Automatischer Arp-Scan aktiviert';
-$pia_lang['BackDevices_darkmode_disabled'] = 'Heller Modus aktiviert';
-$pia_lang['BackDevices_darkmode_enabled'] = 'Dunkler Modus aktiviert';
+$pia_lang['BackDevices_Arpscan_disabled'] = 'Automatischer Arp-Scan deaktiviert.';
+$pia_lang['BackDevices_Arpscan_enabled'] = 'Automatischer Arp-Scan aktiviert.';
+$pia_lang['BackDevices_darkmode_disabled'] = 'Heller Modus aktiviert.';
+$pia_lang['BackDevices_darkmode_enabled'] = 'Dunkler Modus aktiviert.';
 $pia_lang['BackDevices_Restore_CopError'] = 'Die originale Datenbank konnte nicht kopiert werden.';
-$pia_lang['BackDevices_Restore_okay'] = 'Die Wiederherstellung wurde erfolgreich ausgeführt';
+$pia_lang['BackDevices_Restore_okay'] = 'Die Wiederherstellung wurde erfolgreich ausgeführt.';
 $pia_lang['BackDevices_Restore_Failed'] = 'Die Wiederherstellung ist fehlgeschlagen. Stellen Sie das Backup manuell her.';
 $pia_lang['BackDevices_Backup_CopError'] = 'Die originale Datenbank konnte nicht gesichert werden.';
-$pia_lang['BackDevices_Backup_okay'] = 'Das Backup wurde erfolgreich beendet';
+$pia_lang['BackDevices_Backup_okay'] = 'Das Backup wurde erfolgreich beendet.';
 $pia_lang['BackDevices_Backup_Failed'] = 'Das Backup wurde teilweise ausgeführt. Das Archiv ist entweder leer oder nicht vorhanden.';
-$pia_lang['BackDevices_DBTools_DelDev_a'] = 'Gerät erfolgreich gelöscht';
-$pia_lang['BackDevices_DBTools_DelDev_b'] = 'Geräte erfolgreich gelöscht';
-$pia_lang['BackDevices_DBTools_DelEvents'] = 'Events erfolgreich gelöscht';
-$pia_lang['BackDevices_DBTools_DelEventsError'] = 'Fehler beim Löschen der Ereignisse';
-$pia_lang['BackDevices_DBTools_DelDevError_a'] = 'Fehler beim Löschen des Gerätes';
-$pia_lang['BackDevices_DBTools_DelDevError_b'] = 'Fehler beim Löschen der Geräte';
-$pia_lang['BackDevices_DBTools_UpdDev'] = 'Gerät erfolgreich aktualisiert';
-$pia_lang['BackDevices_DBTools_UpdDevError'] = 'Fehler beim Aktualisieren des Gerätes';
-$pia_lang['BackDevices_DBTools_Upgrade'] = 'Datenbank erfolgreich aktualisiert';
-$pia_lang['BackDevices_DBTools_UpgradeError'] = 'Fehler beim Aktualisieren der Datenbank';
-$pia_lang['BackDevices_DBTools_Purge'] = 'Die ältesten Backups wurden gelöscht';
+$pia_lang['BackDevices_DBTools_DelDev_a'] = 'Gerät erfolgreich gelöscht.';
+$pia_lang['BackDevices_DBTools_DelDev_b'] = 'Geräte erfolgreich gelöscht.';
+$pia_lang['BackDevices_DBTools_DelEvents'] = 'Events erfolgreich gelöscht.';
+$pia_lang['BackDevices_DBTools_DelEventsError'] = 'Fehler beim Löschen der Ereignisse.';
+$pia_lang['BackDevices_DBTools_DelDevError_a'] = 'Fehler beim Löschen des Gerätes.';
+$pia_lang['BackDevices_DBTools_DelDevError_b'] = 'Fehler beim Löschen der Geräte.';
+$pia_lang['BackDevices_DBTools_UpdDev'] = 'Gerät erfolgreich aktualisiert.';
+$pia_lang['BackDevices_DBTools_UpdDevError'] = 'Fehler beim Aktualisieren des Gerätes.';
+$pia_lang['BackDevices_DBTools_Upgrade'] = 'Datenbank erfolgreich aktualisiert.';
+$pia_lang['BackDevices_DBTools_UpgradeError'] = 'Fehler beim Aktualisieren der Datenbank.';
+$pia_lang['BackDevices_DBTools_Purge'] = 'Die ältesten Backups wurden gelöscht.';
+$pia_lang['BackDevices_DBTools_DelActHistory'] = 'Die Anzeige der Netzwerkaktivität wurde zurückgesetzt.';
+$pia_lang['BackDevices_DBTools_DelActHistoryError'] = 'Fehler beim Zurücksetzen der Netzwerkaktivitätsanzeige.';
 ?>
 
diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php
index cf3d5614..d8c23f6b 100644
--- a/front/php/templates/language/en_us.php
+++ b/front/php/templates/language/en_us.php
@@ -221,6 +221,10 @@ $pia_lang['Maintenance_Tool_purgebackup'] = 'Purge Backups';
 $pia_lang['Maintenance_Tool_purgebackup_text'] = 'All other backups will be deleted except for the last 3 backups.';
 $pia_lang['Maintenance_Tool_purgebackup_noti'] = 'Purge Backups';
 $pia_lang['Maintenance_Tool_purgebackup_noti_text'] = 'Are you sure you want to delete all backups except the last 3?';
+$pia_lang['Maintenance_Tool_del_ActHistory'] = 'Deleting the network activity';
+$pia_lang['Maintenance_Tool_del_ActHistory_text'] = 'The network activity graph is reset. This does not affect the events.';
+$pia_lang['Maintenance_Tool_del_ActHistory_noti'] = 'Delete network activity';
+$pia_lang['Maintenance_Tool_del_ActHistory_noti_text'] = 'Are you sure you want to reset the network activity?';
 
 //////////////////////////////////////////////////////////////////
 // Maintenance Page
diff --git a/front/php/templates/language/es_es.php b/front/php/templates/language/es_es.php
index ea4be67c..1b352be1 100644
--- a/front/php/templates/language/es_es.php
+++ b/front/php/templates/language/es_es.php
@@ -221,6 +221,10 @@ $pia_lang['Maintenance_Tool_purgebackup'] = 'Purgar Respaldos';
 $pia_lang['Maintenance_Tool_purgebackup_text'] = 'Todas las copias de seguridad serán eliminadas, excepto las 3 últimas.';
 $pia_lang['Maintenance_Tool_purgebackup_noti'] = 'Purgar Respaldos';
 $pia_lang['Maintenance_Tool_purgebackup_noti_text'] = '¿Está seguro de borrar todas las copias de seguridad excepto las 3 últimas?';
+$pia_lang['Maintenance_Tool_del_ActHistory'] = 'Deleting the network activity';
+$pia_lang['Maintenance_Tool_del_ActHistory_text'] = 'The network activity graph is reset. This does not affect the events.';
+$pia_lang['Maintenance_Tool_del_ActHistory_noti'] = 'Delete network activity';
+$pia_lang['Maintenance_Tool_del_ActHistory_noti_text'] = 'Are you sure you want to reset the network activity?';
 
 //////////////////////////////////////////////////////////////////
 // Maintenance Page - by @TeroRERO 24jul2022

From 2675401a40181ee8bbb54b6011a81629328d8579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cterorero=E2=80=9D?= <“devin@devinconde.com”>
Date: Mon, 25 Jul 2022 16:06:08 -0400
Subject: [PATCH 13/13] Update spanish new lines

---
 front/php/templates/language/es_es.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/front/php/templates/language/es_es.php b/front/php/templates/language/es_es.php
index 1b352be1..6634170d 100644
--- a/front/php/templates/language/es_es.php
+++ b/front/php/templates/language/es_es.php
@@ -1,6 +1,6 @@
 <?php
 //////////////////////////////////////////////////////////////////
-// Device Page - by @TeroRERO 24jul2022
+// Device Page - Update by @TeroRERO 25jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Navigation_Devices'] = 'Dispositivos';
@@ -37,7 +37,7 @@ $pia_lang['Device_Table_nav_next'] = 'Siguiente';
 $pia_lang['Device_Table_nav_prev'] = 'Anterior';
 
 //////////////////////////////////////////////////////////////////
-// Presence Page - by @TeroRERO 24jul2022
+// Presence Page - Update by @TeroRERO 25jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Presence_Title'] = 'Historial por dispositivo';
@@ -58,7 +58,7 @@ $pia_lang['Presence_CalHead_month'] = 'mes';
 $pia_lang['Presence_CalHead_week'] = 'semana';
 
 //////////////////////////////////////////////////////////////////
-// Events Page - by @TeroRERO 24jul2022
+// Events Page - Update by @TeroRERO 25jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Events_Title'] = 'Eventos';
@@ -94,7 +94,7 @@ $pia_lang['Events_Table_nav_next'] = 'Siguiente';
 $pia_lang['Events_Table_nav_prev'] = 'Anterior';
 
 //////////////////////////////////////////////////////////////////
-// Device Details Page - by @TeroRERO 24jul2022
+// Device Details Page - Update by @TeroRERO 25jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['DevDetail_Periodselect_today'] = 'Hoy';
@@ -155,7 +155,7 @@ $pia_lang['DevDetail_Nmap_buttonDefault_text'] = 'Escaneo predeterminado: NMAP e
 $pia_lang['DevDetail_Nmap_buttonDetail_text'] = 'Escaneo detallado: escaneo predeterminado con detección de sistema operativo habilitado, detección de versiones, escaneo de script y traceroute (hasta 30 segundos o más)';
 
 //////////////////////////////////////////////////////////////////
-// Maintenance Page - by @TeroRERO 24jul2022
+// Maintenance Page - Update by @TeroRERO 25jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Maintenance_Title'] = 'Herramientas de mantenimiento';
@@ -221,13 +221,13 @@ $pia_lang['Maintenance_Tool_purgebackup'] = 'Purgar Respaldos';
 $pia_lang['Maintenance_Tool_purgebackup_text'] = 'Todas las copias de seguridad serán eliminadas, excepto las 3 últimas.';
 $pia_lang['Maintenance_Tool_purgebackup_noti'] = 'Purgar Respaldos';
 $pia_lang['Maintenance_Tool_purgebackup_noti_text'] = '¿Está seguro de borrar todas las copias de seguridad excepto las 3 últimas?';
-$pia_lang['Maintenance_Tool_del_ActHistory'] = 'Deleting the network activity';
-$pia_lang['Maintenance_Tool_del_ActHistory_text'] = 'The network activity graph is reset. This does not affect the events.';
-$pia_lang['Maintenance_Tool_del_ActHistory_noti'] = 'Delete network activity';
-$pia_lang['Maintenance_Tool_del_ActHistory_noti_text'] = 'Are you sure you want to reset the network activity?';
+$pia_lang['Maintenance_Tool_del_ActHistory'] = 'Eliminar la actividad de la red';
+$pia_lang['Maintenance_Tool_del_ActHistory_text'] = 'El gráfico de actividad de la red se resetea. Esto no afecta a los eventos.';
+$pia_lang['Maintenance_Tool_del_ActHistory_noti'] = 'Borrar la actividad de la red';
+$pia_lang['Maintenance_Tool_del_ActHistory_noti_text'] = '¿Está seguro de restablecer la actividad de la red?';
 
 //////////////////////////////////////////////////////////////////
-// Maintenance Page - by @TeroRERO 24jul2022
+// Maintenance Page - Update by @TeroRERO 25jul2022
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['BackDevices_Arpscan_disabled'] = 'Arp-Scan Desactivado';