Merge pull request #424 from leiweibau/next_update

Next update
leiweibau · Nov 26, 2024 · 2f76928 · 2f76928
2 parents 58eb1a5 + cc725a9
commit 2f76928
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 58 deletions.
diff --git a/front/php/templates/footer.php b/front/php/templates/footer.php
@@ -11,13 +11,11 @@
   <!-- Main Footer -->
   <footer class="main-footer">
     <!-- Default to the left -->
-<?php
-echo '<span style="display:inline-block; transform: rotate(180deg)">&copy;</span> ' . $conf_data['VERSION_YEAR'] . ' Puche & leiweibau';
-?>
+    <a href="https://leiweibau.net/" target="_blank">leiweibau</a>
     <!-- To the right -->
     <div class="pull-right no-hidden-xs">
 <?php
-echo $conf_data['VERSION'] . '&nbsp;&nbsp;<small>(' . $conf_data['VERSION_DATE'] . ')</small>';
+echo 'Version: ' . $conf_data['VERSION_DATE'];
 ?>
     </div>
   </footer>

diff --git a/front/php/templates/language/de_de.php b/front/php/templates/language/de_de.php
@@ -506,15 +506,15 @@
 $pia_lang['MT_Stats_ToolTip_Jrn'] = 'Es befinden sich noch Journaleinträge im Zwischenspeicher';
 // Maintenance Page (Backend)
 //////////////////////////////////////////////////////////////////
-$pia_lang['BE_Dev_Arpscan_disabled'] = 'Automatischer Arp-Scan deaktiviert.';
-$pia_lang['BE_Dev_Arpscan_enabled'] = 'Automatischer Arp-Scan aktiviert';
+$pia_lang['BE_Dev_Arpscan_disabled'] = 'Alle Scan-Module und Importe deaktiviert';
+$pia_lang['BE_Dev_Arpscan_enabled'] = 'Alle Scan-Module und Importe aktiviert';
 $pia_lang['BE_Dev_setapikey'] = 'API-Key wurde gesetzt';
 $pia_lang['BE_Dev_test_notification'] = 'Testnachricht wurde gesendet';
 $pia_lang['BE_Dev_darkmode_disabled'] = 'Heller Modus aktiviert';
 $pia_lang['BE_Dev_darkmode_enabled'] = 'Dunkler Modus aktiviert';
 $pia_lang['BE_Dev_webservicemon_disabled'] = 'Web Service Überwachung ist deaktiviert';
 $pia_lang['BE_Dev_webservicemon_enabled'] = 'Web Service Überwachung ist aktiviert';
-$pia_lang['BE_Dev_MainScan_disabled'] = 'Haupt Scan ist deaktiviert';
+$pia_lang['BE_Dev_MainScan_disabled'] = 'Haupt Scan ist deaktiviert. Importe sind weiterhin aktiv';
 $pia_lang['BE_Dev_MainScan_enabled'] = 'Haupt Scan ist aktiviert';
 $pia_lang['BE_Dev_onlinehistorygraph_disabled'] = 'Aktivitätsverlauf deaktiviert';
 $pia_lang['BE_Dev_onlinehistorygraph_enabled'] = 'Aktivitätsverlauf aktiviert';

diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php
@@ -509,15 +509,15 @@
 $pia_lang['MT_Stats_ToolTip_Jrn'] = 'There are still journal entries in the cache';
 // Maintenance Page (Backend)
 //////////////////////////////////////////////////////////////////
-$pia_lang['BE_Dev_Arpscan_disabled'] = 'Arp-Scan Disabled';
-$pia_lang['BE_Dev_Arpscan_enabled'] = 'Arp-Scan Enabled';
+$pia_lang['BE_Dev_Arpscan_disabled'] = 'All scan modules and imports disabled';
+$pia_lang['BE_Dev_Arpscan_enabled'] = 'All scan modules and imports enabled';
 $pia_lang['BE_Dev_setapikey'] = 'API-Key set';
 $pia_lang['BE_Dev_test_notification'] = 'Notification sent';
 $pia_lang['BE_Dev_darkmode_disabled'] = 'Darkmode Disabled';
 $pia_lang['BE_Dev_darkmode_enabled'] = 'Darkmode Enabled';
 $pia_lang['BE_Dev_webservicemon_disabled'] = 'Web Service Monitoring Disabled';
 $pia_lang['BE_Dev_webservicemon_enabled'] = 'Web Service Monitoring Enabled';
-$pia_lang['BE_Dev_MainScan_disabled'] = 'Main Scan is disabled';
+$pia_lang['BE_Dev_MainScan_disabled'] = 'Main scan is disabled. Imports are still active';
 $pia_lang['BE_Dev_MainScan_enabled'] = 'Main Scan is enabled';
 $pia_lang['BE_Dev_onlinehistorygraph_disabled'] = 'Graph disabled.';
 $pia_lang['BE_Dev_onlinehistorygraph_enabled'] = 'Graph enabled.';

diff --git a/front/php/templates/language/es_es.php b/front/php/templates/language/es_es.php
@@ -509,15 +509,15 @@
 $pia_lang['MT_Stats_ToolTip_Jrn'] = 'Todavía hay entradas de diario en la caché';
 // Maintenance Page - Update by @TeroRERO 25jul2022 and leiweibau 29ago2022
 /////////////////////////////////////////////////////////////////////////////
-$pia_lang['BE_Dev_Arpscan_disabled'] = 'Arp-Scan Desactivado';
-$pia_lang['BE_Dev_Arpscan_enabled'] = 'Arp-Scan Activado';
+$pia_lang['BE_Dev_Arpscan_disabled'] = 'Todos los módulos de escaneo e importaciones desactivados';
+$pia_lang['BE_Dev_Arpscan_enabled'] = 'Todos los módulos de escaneo e importaciones activados';
 $pia_lang['BE_Dev_setapikey'] = 'API-Key set';
 $pia_lang['BE_Dev_test_notification'] = 'Notification sent';
 $pia_lang['BE_Dev_darkmode_disabled'] = 'Darkmode Desactivado';
 $pia_lang['BE_Dev_darkmode_enabled'] = 'Darkmode Activado';
 $pia_lang['BE_Dev_webservicemon_disabled'] = 'Web Service Monitoring Disabled';
 $pia_lang['BE_Dev_webservicemon_enabled'] = 'Web Service Monitoring Enabled';
-$pia_lang['BE_Dev_MainScan_disabled'] = 'El Escaneo Principal está desactivado';
+$pia_lang['BE_Dev_MainScan_disabled'] = 'El escaneo principal está desactivado. Las importaciones siguen activas';
 $pia_lang['BE_Dev_MainScan_enabled'] = 'El Escaneo Principal está activado';
 $pia_lang['BE_Dev_onlinehistorygraph_disabled'] = 'Graph disabled.';
 $pia_lang['BE_Dev_onlinehistorygraph_enabled'] = 'Graph enabled.';

diff --git a/front/php/templates/language/fr_fr.php b/front/php/templates/language/fr_fr.php
@@ -506,15 +506,15 @@
 $pia_lang['MT_Stats_ToolTip_Jrn'] = 'Il y a encore des entrées de journal dans le cache';
 // Maintenance Page (Backend)
 /////////////////////////////////////////////////////////////////////////////
-$pia_lang['BE_Dev_Arpscan_disabled'] = 'arp-scan automatique désactivé.';
-$pia_lang['BE_Dev_Arpscan_enabled'] = 'arp-scan automatique activé.';
+$pia_lang['BE_Dev_Arpscan_disabled'] = 'Tous les modules de scan et les importations désactivés';
+$pia_lang['BE_Dev_Arpscan_enabled'] = 'Tous les modules de scan et les importations activés';
 $pia_lang['BE_Dev_setapikey'] = 'La clé API a été définie';
 $pia_lang['BE_Dev_test_notification'] = 'Le message de test a été envoyé';
 $pia_lang['BE_Dev_darkmode_disabled'] = 'Mode clair activé.';
 $pia_lang['BE_Dev_darkmode_enabled'] = 'Mode sombre activé.';
 $pia_lang['BE_Dev_webservicemon_disabled'] = 'Web Service Monitoring Disabled';
 $pia_lang['BE_Dev_webservicemon_enabled'] = 'Web Service Monitoring Enabled';
-$pia_lang['BE_Dev_MainScan_disabled'] = 'La numérisation principale est désactivée';
+$pia_lang['BE_Dev_MainScan_disabled'] = 'Le scan principal est désactivé. Les importations restent actives';
 $pia_lang['BE_Dev_MainScan_enabled'] = 'La numérisation principale est activée';
 $pia_lang['BE_Dev_onlinehistorygraph_disabled'] = 'Historique d&apos;activité désactivé.';
 $pia_lang['BE_Dev_onlinehistorygraph_enabled'] = 'Historique d&apos;activité activé.';

diff --git a/front/php/templates/language/it_it.php b/front/php/templates/language/it_it.php
@@ -508,15 +508,15 @@
 $pia_lang['MT_Stats_ToolTip_Jrn'] = 'Ci sono ancora voci di diario nella cache';
 // Maintenance Page (Backend)
 //////////////////////////////////////////////////////////////////
-$pia_lang['BE_Dev_Arpscan_disabled'] = 'Scansione ARP automatica disattivata.';
-$pia_lang['BE_Dev_Arpscan_enabled'] = 'Scansione ARP automatica abilitata';
+$pia_lang['BE_Dev_Arpscan_disabled'] = 'Tutti i moduli di scansione e le importazioni disattivati';
+$pia_lang['BE_Dev_Arpscan_enabled'] = 'Tutti i moduli di scansione e le importazioni attivati';
 $pia_lang['BE_Dev_setapikey'] = 'Chiave API impostata';
 $pia_lang['BE_Dev_test_notification'] = 'Messaggio di test inviato';
 $pia_lang['BE_Dev_darkmode_disabled'] = 'Modalità scura disattivata';
 $pia_lang['BE_Dev_darkmode_enabled'] = 'Modalità scura abilitata';
 $pia_lang['BE_Dev_webservicemon_disabled'] = 'Monitoraggio del servizio web disattivato';
 $pia_lang['BE_Dev_webservicemon_enabled'] = 'Monitoraggio del servizio web abilitato';
-$pia_lang['BE_Dev_MainScan_disabled'] = 'Scansione principale disattivata';
+$pia_lang['BE_Dev_MainScan_disabled'] = 'La scansione principale è disattivata. Le importazioni restano attive';
 $pia_lang['BE_Dev_MainScan_enabled'] = 'Scansione principale abilitata';
 $pia_lang['BE_Dev_onlinehistorygraph_disabled'] = 'Cronologia dell&apos;attività online disattivata';
 $pia_lang['BE_Dev_onlinehistorygraph_enabled'] = 'Cronologia dell&apos;attività online abilitata';

diff --git a/install/pialert_install.sh b/install/pialert_install.sh
@@ -43,13 +43,6 @@
 
   FIRST_SCAN_KNOWN=true
 
-  REPORT_MAIL=False
-  REPORT_TO=user@gmail.com
-  SMTP_SERVER=smtp.gmail.com
-  SMTP_PORT=587
-  SMTP_USER=user@gmail.com
-  SMTP_PASS=password
-
   DDNS_ACTIVE=False
   DDNS_DOMAIN='your_domain.freeddns.org'
   DDNS_USER='dynu_user'
@@ -176,30 +169,6 @@ ask_config() {
             "Do you want to mark the new devices as known devices during the first scan?" "YES"
   FIRST_SCAN_KNOWN=$ANSWER
 
-  # Ask e-mail notification config
-  MAIL_REPORT=false
-  ask_yesno "Pi.Alert can notify you by e-mail when a network event occurs" \
-            "Do you want to activate this feature ?"
-  if $ANSWER ; then
-    ask_yesno "e-mail notification needs a SMTP server (i.e. smtp.gmail.com)" \
-              "Do you want to continue activating this feature ?"
-    MAIL_REPORT=$ANSWER
-  fi
-
-  if $MAIL_REPORT ; then
-    ask_input "" "Notify alert to this e-mail address:" "user@gmail.com"
-    REPORT_TO=$ANSWER
-
-    ask_input "" "SMTP server:" "smtp.gmail.com"
-    SMTP_SERVER=$ANSWER
-
-    ask_input "" "SMTP user:" "user@gmail.com"
-    SMTP_USER=$ANSWER
-
-    ask_input "" "SMTP password:" "password"
-    SMTP_PASS=$ANSWER
-  fi
-
   # Ask Dynamic DNS config
   DDNS_ACTIVE=false
   ask_yesno "Pi.Alert can update your Dynamic DNS IP (i.e with www.dynu.net)" \
@@ -494,17 +463,10 @@ download_pialert() {
 # Configure Pi.Alert parameters
 # ------------------------------------------------------------------------------
 configure_pialert() {
-  print_msg "- Settting Pi.Alert config file"
+  print_msg "- Setting Pi.Alert config file"
 
   set_pialert_parameter PIALERT_PATH    "'$PIALERT_HOME'"
 
-  set_pialert_parameter REPORT_MAIL     "$REPORT_MAIL"
-  set_pialert_parameter REPORT_TO       "'$REPORT_TO'"
-  set_pialert_parameter SMTP_SERVER     "'$SMTP_SERVER'"
-  set_pialert_parameter SMTP_PORT       "$SMTP_PORT"
-  set_pialert_parameter SMTP_USER       "'$SMTP_USER'"
-  set_pialert_parameter SMTP_PASS       "'$SMTP_PASS'"
-
   set_pialert_parameter DDNS_ACTIVE     "$DDNS_ACTIVE"
   set_pialert_parameter DDNS_DOMAIN     "'$DDNS_DOMAIN'"
   set_pialert_parameter DDNS_USER       "'$DDNS_USER'"