Merge pull request #359 from cvc90/Pi.Alert-Multiple-fixes-deviceDetails.php

Multiple fixes in deviceDetails.php

front/deviceDetails.php

@@ -1,11 +1,16 @@
-<!-- ---------------------------------------------------------------------------
+<!--
-#  Pi.Alert
+#---------------------------------------------------------------------------------#
-#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#  Pi.Alert                                                                       #
-#
+#  Open Source Network Guard / WIFI & LAN intrusion detector                      #  
-#  deviceDetails.php - Front module. Device management page
+#                                                                                 #
-#-------------------------------------------------------------------------------
+#  deviceDetails.php - Front module. Device management page                       #
-#  Puche 2021 / 2022+ jokob             jokob@duck.com                GNU GPLv3
+#---------------------------------------------------------------------------------#
-#--------------------------------------------------------------------------- -->
+#    Puche      2021        pi.alert.application@gmail.com   GNU GPLv3            #
+#    jokob-sk   2022        jokob.sk@gmail.com               GNU GPLv3            #
+#    leiweibau  2022        https://github.com/leiweibau     GNU GPLv3            #
+#    cvc90      2023        https://github.com/cvc90         GNU GPLv3            #
+#---------------------------------------------------------------------------------#
+-->
 
 <?php
   require 'php/templates/header.php';
@@ -100,7 +105,7 @@
             <ul class="nav nav-tabs" style="fon t-size:16px;">
               <li> <a id="tabDetails"  href="#panDetails"  data-toggle="tab"> <?= lang('DevDetail_Tab_Details');?>  </a></li>
                 <?php
-                if ($_REQUEST['mac'] == 'Internet') { $DevDetail_Tap_temp = "Tools"; } else { $DevDetail_Tap_temp = lang('DevDetail_Tab_Nmap');}
+                if ($_REQUEST['mac'] == 'Internet') { $DevDetail_Tap_temp = lang('DevDetail_Tab_Tools'); } else { $DevDetail_Tap_temp = lang('DevDetail_Tab_Nmap');}
                 ?>
               <li> <a id="tabNmap"     href="#panNmap"     data-toggle="tab"> <?php echo $DevDetail_Tap_temp;?>     </a></li>
               <li> <a id="tabSessions" href="#panSessions" data-toggle="tab"> <?= lang('DevDetail_Tab_Sessions');?> </a></li>
@@ -539,9 +544,9 @@
               <?php
               if ($_REQUEST['mac'] == 'Internet') {
               ?>
-                <h4 class="">Online Speedtest</h4>
+                <h4 class=""><?= lang('DevDetail_Internet_Speedtest');?></h4>
                 <div style="width:100%; text-align: center; margin-bottom: 50px;">
-                  <button type="button" id="speedtestcli" class="btn btn-primary pa-btn" style="margin: auto;" onclick="speedtestcli()">Start Speedtest</button>
+                  <button type="button" id="speedtestcli" class="btn btn-primary pa-btn" style="margin: auto;" onclick="speedtestcli()"><?= lang('DevDetail_Internet_Speedtest_Start');?></button>
                 </div>
                    
                   <script>
@@ -561,7 +566,7 @@
               <?php  
               }
               ?>
-                <h4 class="">Nmap Scans</h4>
+                <h4 class=""><?= lang('DevDetail_Nmap_Scans');?></h4>
                 <div style="width:100%; text-align: center;">
                   <script>
                       setTimeout(function(){
@@ -615,12 +620,12 @@
                 <table id="tableNmap" class="table table-bordered table-hover table-striped ">
                   <thead>
                   <tr>
-                    <th>Index</th>                    
+                    <th><?= lang("DevDetail_Tab_NmapTableIndex");?></th>                    
-                    <th>Time</th>
+                    <th><?= lang("DevDetail_Tab_NmapTableTime");?></th>
-                    <th>Port</th>
+                    <th><?= lang("DevDetail_Tab_NmapTablePort");?></th>
-                    <th>State</th>
+                    <th><?= lang("DevDetail_Tab_NmapTableState");?></th>
-                    <th>Service</th>
+                    <th><?= lang("DevDetail_Tab_NmapTableService");?></th>
-                    <th>Extra (Notes)</th>
+                    <th><?= lang("DevDetail_Tab_NmapTableExtra");?></th>
                   </tr>
                   </thead>
                   <!-- Comment out tbody when trying to implement better table with datatables here -->
@@ -671,10 +676,10 @@
                 <table id="tableEvents" class="table table-bordered table-hover table-striped ">
                   <thead>
                   <tr>
-                    <th>Date</th>
+                    <th><?= lang("DevDetail_Tab_EventsTableDate");?></th>
-                    <th>Event type</th>
+                    <th><?= lang("DevDetail_Tab_EventsTableEvent");?></th>
-                    <th>IP</th>
+                    <th><?= lang("DevDetail_Tab_EventsTableIP");?></th>
-                    <th>Additional info</th>
+                    <th><?= lang("DevDetail_Tab_EventsTableInfo");?></th>
                   </tr>
                   </thead>
                 </table>
@@ -685,13 +690,13 @@
               <table id="tablePholus" class="table table-bordered table-hover table-striped ">
                 <thead>
                 <tr>
-                  <th>Index</th>
+                  <th><?= lang("DevDetail_Tab_PholusTableIndex");?></th>
-                  <th>Info</th>
+                  <th><?= lang("DevDetail_Tab_PholusTableInfo");?></th>
-                  <th>Time</th>
+                  <th><?= lang("DevDetail_Tab_PholusTableTime");?></th>
-                  <th>IP</th>
+                  <th><?= lang("DevDetail_Tab_PholusTableIP");?></th>
-                  <th>Entry Type</th>
+                  <th><?= lang("DevDetail_Tab_PholusTableEntry");?></th>
-                  <th>Value</th>
+                  <th><?= lang("DevDetail_Tab_PholusTableValue");?></th>
-                  <th>Extra</th>
+                  <th><?= lang("DevDetail_Tab_PholusTableExtra");?></th>
                 </tr>
                 </thead>
                 <!-- Comment out tbody when trying to implement better table with datatables here -->

front/php/server/speedtestcli.php

@@ -1,7 +1,8 @@
 <?php
+require dirname(__FILE__).'/../server/init.php';
 exec('../../../back/speedtest-cli --secure --simple', $output);
 
-echo '<h4>Speedtest Results</h4>';
+echo '<h4>'. lang('Speedtest_Results') .'</h4>';
 echo '<pre style="border: none;">'; 
 foreach($output as $line){
     echo $line . "\n";

front/php/templates/language/de_de.json

@@ -114,10 +114,30 @@
         "DevDetail_Shortcut_Presence" : "Anwesenheit",
         "DevDetail_Shortcut_DownAlerts" : "Down Meldungen",
         "DevDetail_Tab_Details" : "Details",
+        "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Tools",
 	"DevDetail_Tab_Nmap" : "Nmap",
+	"DevDetail_Tab_NmapTableIndex": "Index",
+	"DevDetail_Tab_NmapTableTime": "Zeit",
+	"DevDetail_Tab_NmapTablePort": "Port",
+	"DevDetail_Tab_NmapTableState": "Status",
+	"DevDetail_Tab_NmapTableService": "Dienst",
+	"DevDetail_Tab_NmapTableExtra": "Extra",	    
         "DevDetail_Tab_Sessions" : "Sitzungen",
         "DevDetail_Tab_Presence" : "Anwesenheit",
         "DevDetail_Tab_Events" : "Ereignisse",
+	"DevDetail_Tab_EventsTableDate" : "Datum",
+	"DevDetail_Tab_EventsTableEvent" : "Ereignistype",
+	"DevDetail_Tab_EventsTableIP" : "IP",
+	"DevDetail_Tab_EventsTableInfo" : "Zusätzliche Informationen",
+	"DevDetail_Tab_PholusTableIndex" : "Index",
+	"DevDetail_Tab_PholusTableInfo" : "Info",
+	"DevDetail_Tab_PholusTableTime" : "Zeit",
+	"DevDetail_Tab_PholusTableIP" : "IP",
+	"DevDetail_Tab_PholusTableEntry" : "Eintragstyp",
+	"DevDetail_Tab_PholusTableValue" : "Wert",
+	"DevDetail_Tab_PholusTableExtra" : "Extra",	    
+	"DevDetail_Internet_Speedtest" : "Online Speedtest",
+	"DevDetail_Internet_Speedtest_Start" : "Speedtest starten",	    
         "DevDetail_MainInfo_Title" : "Haupt Infos",
         "DevDetail_MainInfo_mac" : "MAC",
         "DevDetail_MainInfo_Name" : "Name",
@@ -166,6 +186,7 @@
         "DevDetail_Nmap_buttonDetail_text" : "Detailierter Scan: Standardscan mit aktivierter Betriebssystemerkennung, Versionserkennung, Skript-Scan und Traceroute (bis zu 30 oder mehr Sekunden)",
         "DevDetail_Nmap_buttonSkipDiscovery" : "Ohne Erreichbarkeitsprüfung",
         "DevDetail_Nmap_buttonSkipDiscovery_text" : "Ohne Erreichbarkeitsprüfung (-Pn Parameter): Standard Scan bei dem nmap annimmt, dass der Host erreichbar ist.",
+	"DevDetail_Nmap_Scans": "Nmap Scans",	    
         "Maintenance_Title" : "Wartungswerkzeuge",
         "Maintenance_database_path" : "Datenbank-Pfad",
         "Maintenance_database_size" : "Datenbank-Größe",
@@ -322,6 +343,7 @@
         "REPORT_ERROR" : "Die gesuchte Seite ist vorübergehend nicht verfügbar. Bitte versuchen Sie es nach ein paar Sekunden erneut",
         "SYSTEM_TITLE" : "Systeminformationen",
         "Plugins_Out_of" : "von",
+        "Speedtest_Results" : "Ergebnisse des Geschwindigkeitstests",	    
         "Systeminfo_General" : "Allgemein",
         "Systeminfo_General_Full_Date": "Vollständiges Datum:",
         "Systeminfo_General_Date": "Datum:",

front/php/templates/language/en_us.json

@@ -137,16 +137,34 @@
         "DevDetail_Shortcut_Presence" : "Presence",
         "DevDetail_Shortcut_DownAlerts" : "Down Alerts",
         "DevDetail_Tab_Details" : "<i class=\"fa fa-info-circle\"></i> Details",
+	"DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Tools",	    
         "DevDetail_Tab_Nmap" : "<i class=\"fa fa-ethernet\"></i> Nmap",
         "DevDetail_Tab_Sessions" : "<i class=\"fa fa-list-ol\"></i> Sessions",
         "DevDetail_Tab_Presence" : "<i class=\"fa fa-calendar\"></i> Presence",
         "DevDetail_Tab_Events" : "<i class=\"fa fa-bolt\"></i> Events",
+	"DevDetail_Tab_EventsTableDate" : "Date",
+	"DevDetail_Tab_EventsTableEvent" : "Event type",
+	"DevDetail_Tab_EventsTableIP" : "IP",
+	"DevDetail_Tab_EventsTableInfo" : "Additional info",	    
         "DevDetail_Tab_Pholus" : "<i class=\"fa fa-search\"></i> Pholus",
         "DevDetail_Tab_PholusEmpty" : "Nothing sniffed out with Pholus for this device.",
+	"DevDetail_Tab_PholusTableIndex" : "Index",
+	"DevDetail_Tab_PholusTableInfo" : "Info",
+	"DevDetail_Tab_PholusTableTime" : "Time",
+	"DevDetail_Tab_PholusTableIP" : "IP",
+	"DevDetail_Tab_PholusTableEntry" : "Entry Type",
+	"DevDetail_Tab_PholusTableValue" : "Value",
+	"DevDetail_Tab_PholusTableExtra" : "Extra",	    
         "DevDetail_Tab_Plugins" : "<i class=\"fa fa-plug\"></i> Plugins",
         "DevDetail_Tab_NmapTableHeader" : "Scheduled scan results",
         "DevDetail_Tab_NmapTableText" : "Set up a schedule in <a href=\"/settings.php#NMAP_ACTIVE\">Settings</a>",
         "DevDetail_Tab_NmapEmpty" : "No ports detected with Nmap on this device.",
+	"DevDetail_Tab_NmapTableIndex" : "Index",
+	"DevDetail_Tab_NmapTableTime" : "Time",
+	"DevDetail_Tab_NmapTablePort" : "Port",
+	"DevDetail_Tab_NmapTableState" : "State",
+	"DevDetail_Tab_NmapTableService" : "Service",
+	"DevDetail_Tab_NmapTableExtra" : "Extra",	    
         "DevDetail_MainInfo_Title" : "<i class=\"fa fa-pencil\"></i> Main Info",
         "DevDetail_MainInfo_mac" : "MAC",
         "DevDetail_MainInfo_Name" : "Name",
@@ -156,6 +174,8 @@
         "DevDetail_Type_hover" : "The Type of the device. If you select any of the pre-defined network devices (e.g.: AP, Firewall, Router, Switch...) they will show up in the Network tree configuration as possible parent network nodes.",
         "DevDetail_Icon" : "Icon",
         "DevDetail_Icon_Descr" : "Enter a font awesome icon name without the fa- prefix or with complete class, e.g.: fa fa-brands fa-apple.",
+	"DevDetail_Internet_Speedtest" : "Online Speedtest",
+	"DevDetail_Internet_Speedtest_Start" : "Start Speedtest",	    
         "DevDetail_MainInfo_Vendor" : "Vendor",
         "DevDetail_Vendor_hover" : "Vendor should be auto-detected. You can overwrite or add your custom value.",
         "DevDetail_MainInfo_Favorite" : "Favorite",
@@ -209,6 +229,7 @@
         "DevDetail_Nmap_buttonSkipDiscovery" : "Skip host discovery",
         "DevDetail_Nmap_buttonSkipDiscovery_text" : "Skip host discovery (-Pn option): Default scan without host discovery",
         "DevDetail_Nmap_resultsLink" : "You can leave this page after starting a scan. Results will be also available in the <code>pialert_front.log</code> file.",
+	"DevDetail_Nmap_Scans": "Nmap Scans",	    
         "BackDevDetail_Actions_Title_Run" : "Run action",
         "BackDevDetail_Actions_Not_Registered" : "Action not registered: ",
         "BackDevDetail_Actions_Ask_Run" : "Do you want to execute the action?",
@@ -593,6 +614,7 @@
         "API_icon" : "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
         "API_CUSTOM_SQL_name" : "Custom endpoint",
         "API_CUSTOM_SQL_description" : "You can specify a custom SQL query which will generate a JSON file and then expose it via the <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code> file endpoint</a>.",
+        "Speedtest_Results" : "Speedtest Results",        
 	"Systeminfo_General" : "General",
 	"Systeminfo_General_Full_Date": "Full Date:",
 	"Systeminfo_General_Date": "Date:",

front/php/templates/language/es_es.json

@@ -137,22 +137,42 @@
         "DevDetail_Shortcut_Presence" : "Historial",
         "DevDetail_Shortcut_DownAlerts" : "Alerta(s) de caída(s)",
         "DevDetail_Tab_Details" : "<i class=\"fa fa-info-circle\"></i> Detalles",
+        "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Herramientas",        
         "DevDetail_Tab_Nmap" : "<i class=\"fa fa-ethernet\"></i> Nmap",
         "DevDetail_Tab_Sessions" : "<i class=\"fa fa-list-ol\"></i> Sesiones",
         "DevDetail_Tab_Presence" : "<i class=\"fa fa-calendar\"></i> Historial",
         "DevDetail_Tab_Events" : "<i class=\"fa fa-bolt\"></i> Eventos",
+        "DevDetail_Tab_EventsTableDate" : "Fecha",
+        "DevDetail_Tab_EventsTableEvent" : "Tipo de evento",
+        "DevDetail_Tab_EventsTableIP" : "IP",
+        "DevDetail_Tab_EventsTableInfo" : "Información adicional",        
         "DevDetail_Tab_Pholus" : "<i class=\"fa fa-search\"></i> Pholus",
         "DevDetail_Tab_PholusEmpty" : "No se ha encontrado nada para este dispositivo con Pholus.",
+        "DevDetail_Tab_PholusTableIndex": "Índice",
+        "DevDetail_Tab_PholusTableInfo": "Información",
+        "DevDetail_Tab_PholusTableTime": "Hora",
+        "DevDetail_Tab_PholusTableIP": "IP",
+        "DevDetail_Tab_PholusTableEntry": "Tipo de entrada",
+        "DevDetail_Tab_PholusTableValue": "Valor",
+        "DevDetail_Tab_PholusTableExtra": "Extra",
         "DevDetail_Tab_Plugins" : "<i class=\"fa fa-plug\"></i> Plugins",        
         "DevDetail_Tab_NmapTableHeader" : "Resultados del escaneo programado",
         "DevDetail_Tab_NmapTableText" : "Establece la programación en los <a href=\"/settings.php#NMAP_ACTIVE\">Ajustes</a>",
         "DevDetail_Tab_NmapEmpty" : "Ningún puerto detectado en este dispositivo con Nmap.",
+        "DevDetail_Tab_NmapTableIndex": "Índice",
+        "DevDetail_Tab_NmapTableTime": "Tiempo",
+        "DevDetail_Tab_NmapTablePort": "Puerto",
+        "DevDetail_Tab_NmapTableState": "Estado",
+        "DevDetail_Tab_NmapTableService": "Servicio",
+        "DevDetail_Tab_NmapTableExtra": "Extra",        
         "DevDetail_MainInfo_Title" : "<i class=\"fa fa-pencil\"></i> Información principal",
         "DevDetail_MainInfo_mac" : "MAC",
         "DevDetail_MainInfo_Name" : "Nombre",
         "DevDetail_MainInfo_Owner" : "Propietario",
         "DevDetail_MainInfo_Type" : "Tipo",
         "DevDetail_Icon" : "Icono",
+        "DevDetail_Internet_Speedtest": "Prueba de velocidad en línea",
+        "DevDetail_Internet_Speedtest_Start": "Iniciar prueba de velocidad",        
         "DevDetail_Icon_Descr" : "Ingrese un nombre de icono de fuente awesome sin el prefijo fa- o con clase completa, por ejemplo: fa fa-skin fa-apple.",
         "DevDetail_MainInfo_Vendor" : "Proveedor",
         "DevDetail_MainInfo_Favorite" : "Favorito",
@@ -202,6 +222,7 @@
         "DevDetail_Nmap_buttonSkipDiscovery" : "Omitir detección de host",
         "DevDetail_Nmap_buttonSkipDiscovery_text" : "Omitir detección de host (-Pn opción): Escaneo predeterminado sin detección de host",
         "DevDetail_Nmap_resultsLink" : "Puedes abandonar esta página después de empezar un escaneo. Los resultados también estarán disponibles en el archivo <code>pialert_front.log</code>.",
+        "DevDetail_Nmap_Scans": "Escaneos de Nmap",        
         "BackDevDetail_Actions_Title_Run" : "Ejecutar acción",
         "BackDevDetail_Actions_Not_Registered" : "Acción no registrada: ",
         "BackDevDetail_Actions_Ask_Run" : "¿Desea ejecutar la acción?",
@@ -584,6 +605,7 @@
         "API_icon" : "<i class=\"fa fa-arrow-down-up-across-line\"></i>",									  
         "API_CUSTOM_SQL_name" : "Endpoint personalizado",
         "API_CUSTOM_SQL_description" : "Puede especificar una consulta SQL personalizada que generará un archivo JSON y luego lo expondrá a través del <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\">archivo <code>table_custom_endpoint.json</code ></a>.",
+        "Speedtest_Results" : "Resultados de la prueba de velocidad",        
         "Systeminfo_General" : "General",
         "Systeminfo_General_Full_Date": "Fecha completa:",
         "Systeminfo_General_Date": "Fecha:",