vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 01:26:11 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #354 from cvc90/Pi.Alert-fixes-improvements-systeminfo-v4

Browse Source 
Corrections and improvements in the "System info" menu v4
This commit is contained in:
jokob-sk
2023-08-14 06:19:58 +10:00
committed by GitHub
parent 93e76e27d7 ea05fd58c1
commit 725032d31f
4 changed files with 101 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
front/php/templates/language/de_de.json
View File

@@ -323,17 +323,40 @@
"SYSTEM_TITLE" : "Systeminformationen",
"Plugins_Out_of" : "von",
"Systeminfo_General" : "Allgemein",
"Systeminfo_General_Full_Date": "Vollständiges Datum:",
"Systeminfo_General_Date": "Datum:",
"Systeminfo_General_Date2" "Datum2:",
"Systeminfo_General_TimeZone": "Zeitzone:",
"Systeminfo_This_Client" : "Dieser Mandant",
"Systeminfo_Client_User_Agent": "Benutzeragent:",
"Systeminfo_Client_Resolution": "Browserauflösung:",
"Systeminfo_System" : "System",
"Systeminfo_Motherboard" : "Hauptplatine",
"Systeminfo_CPU" : "CPU",
"Systeminfo_CPU_Vendor": "CPU-Anbieter:",
"Systeminfo_CPU_Name": "CPU-Name:",
"Systeminfo_CPU_Cores": "CPU-Kerne:",
"Systeminfo_CPU_Speed": "CPU-Geschwindigkeit:",
"Systeminfo_CPU_Temp": "CPU-Temp:",
"Systeminfo_Memory" : "Speicher",
"Systeminfo_Memory_Usage": "Speichernutzung:",
"Systeminfo_Memory_Usage_Percent": "Speicher %:",
"Systeminfo_Memory_Total_Memory": "Gesamtspeicher:",
"Systeminfo_Storage" : "Lagerung",
"Systeminfo_Storage_usage" : "Speicherverwendung",
"Systeminfo_Storage_Mount": "Mountpunkt:",
"Systeminfo_Storage_Device": "Gerät:",
"Systeminfo_Storage_Size": "Größe:",
"Systeminfo_Storage_Type": "Typ:",
"Systeminfo_Storage_Usage" : "Speicherverwendung",
"Systeminfo_Storage_Usage_Mount": "Mountpunkt:",
"Systeminfo_Storage_Usage_Total": "Gesamt:",
"Systeminfo_Storage_Usage_Used": "Verwendet:",
"Systeminfo_Storage_Usage_Free": "Kostenlos:",
"Systeminfo_Network" : "Netzwerk",
"Systeminfo_Network_Hardware" : "Netzwerk Hardware",
"Systeminfo_Services" : "Dienste",
"Systeminfo_Services_Name": "Dienstname",
"Systeminfo_Services_Description": "Dienstbeschreibung",
"Systeminfo_USB_Devices" : "USB-Geräte"
}
}

26
front/php/templates/language/en_us.json
View File

@@ -588,16 +588,40 @@
"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>.",
"Systeminfo_General" : "General",
"Systeminfo_General_Full_Date": "Full Date:",
"Systeminfo_General_Date": "Date:",
"Systeminfo_General_Date2": "Date2:",
"Systeminfo_General_TimeZone": "Timezone:",
"Systeminfo_This_Client" : "This Client",
"Systeminfo_Client_User_Agent": "User Agent:",
"Systeminfo_Client_Resolution": "Browser Resolution:",
"Systeminfo_System" : "System",
"Systeminfo_Motherboard" : "Motherboard",
"Systeminfo_CPU" : "CPU",
"Systeminfo_CPU_Vendor": "CPU Vendor:",
"Systeminfo_CPU_Name": "CPU Name:",
"Systeminfo_CPU_Cores": "CPU Cores:",
"Systeminfo_CPU_Speed": "CPU Speed:",
"Systeminfo_CPU_Temp": "CPU Temp:",
"Systeminfo_Memory" : "Memory",
"Systeminfo_Memory_Usage": "Memory usage:",
"Systeminfo_Memory_Usage_Percent": "Memory %:",
"Systeminfo_Memory_Total_Memory": "Total memory:",
"Systeminfo_Storage" : "Storage",
"Systeminfo_Storage_usage" : "Storage usage",
"Systeminfo_Storage_Mount" : "Mount point:",
"Systeminfo_Storage_Device" : "Device:",
"Systeminfo_Storage_Size" : "Size:",
"Systeminfo_Storage_Type" : "Type:",
"Systeminfo_Storage_Usage" : "Storage usage",
"Systeminfo_Storage_Usage_Mount" : "Mount point:",
"Systeminfo_Storage_Usage_Total" : "Total:",
"Systeminfo_Storage_Usage_Used" : "Used:",
"Systeminfo_Storage_Usage_Free" : "Free:",
"Systeminfo_Network" : "Network",
"Systeminfo_Network_Hardware" : "Network Hardware",
"Systeminfo_Services" : "Services",
"Systeminfo_Services_Name" : "Service Name",
"Systeminfo_Services_Description" : "Service Description",
"Systeminfo_USB_Devices" : "USB Devices"
}
}

26
front/php/templates/language/es_es.json
View File

@@ -585,16 +585,40 @@
"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>.",
"Systeminfo_General" : "General",
"Systeminfo_General_Full_Date": "Fecha completa:",
"Systeminfo_General_Date": "Fecha:",
"Systeminfo_General_Date2": "Fecha2:",
"Systeminfo_General_TimeZone": "Zona horaria:",
"Systeminfo_This_Client": "Este cliente",
"Systeminfo_Client_User_Agent": "Agente de usuario:",
"Systeminfo_Client_Resolution": "Resolución del navegador:",
"Systeminfo_System": "Sistema",
"Systeminfo_Motherboard" : "Placa base",
"Systeminfo_CPU" : "CPU",
"Systeminfo_CPU_Vendor": "Proveedor de CPU:",
"Systeminfo_CPU_Name": "Nombre de la CPU:",
"Systeminfo_CPU_Cores": "Núcleos de CPU:",
"Systeminfo_CPU_Speed": "Velocidad de la CPU:",
"Systeminfo_CPU_Temp": "Temperatura de la CPU:",
"Systeminfo_Memory": "Memoria",
"Systeminfo_Memory_Usage": "Memoria en uso:",
"Systeminfo_Memory_Usage_Percent": "Memoria %:",
"Systeminfo_Memory_Total_Memory": "Memoria total:",
"Systeminfo_Storage": "Almacenamiento",
"Systeminfo_Storage_usage": "Uso de almacenamiento",
"Systeminfo_Storage_Mount": "Punto de montaje:",
"Systeminfo_Storage_Device" : "Dispositivo:",
"Systeminfo_Storage_Size": "Tamaño:",
"Systeminfo_Storage_Type": "Tipo:",
"Systeminfo_Storage_Usage": "Uso de almacenamiento",
"Systeminfo_Storage_Usage_Mount": "Punto de montaje:",
"Systeminfo_Storage_Usage_Total": "Total:",
"Systeminfo_Storage_Usage_Used": "Usado:",
"Systeminfo_Storage_Usage_Free": "Libre:",
"Systeminfo_Network": "Red",
"Systeminfo_Network_Hardware": "Hardware de red",
"Systeminfo_Services": "Servicios",
"Systeminfo_Services_Name": "Nombre del servicio",
"Systeminfo_Services_Description": "Descripción del servicio",
"Systeminfo_USB_Devices": "Dispositivos USB"
}
}

52
front/systeminfo.php
View File

@@ -134,19 +134,19 @@ echo '<div class="box box-solid">
</div>
<div class="box-body">
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">Full Date:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_General_Full_Date') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $formatted_date . '</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">Date:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_General_Date') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $formatted_date2 . '</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">Date2:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_General_Date2') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $formatted_date3 . '</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">Timezone:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_General_TimeZone') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $timeZone . '</div>
</div>
</div>
@@ -159,11 +159,11 @@ echo '<div class="box box-solid">
</div>
<div class="box-body">
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">User Agent:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_Client_User_Agent') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $_SERVER['HTTP_USER_AGENT'] . '</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">Browser Resolution:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_Client_Resolution') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b" id="resolution"></div>
</div>
</div>
@@ -240,7 +240,7 @@ echo '<div class="box box-solid">
<div class="col-sm-9 sysinfo_gerneral_b">' . $motherboard_bios . '</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">BIOS date_</div>
<div class="col-sm-3 sysinfo_gerneral_a">BIOS date:</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $motherboard_biosdate . '</div>
</div>
<div class="row">
@@ -257,23 +257,23 @@ echo '<div class="box box-solid">
</div>
<div class="box-body">
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">CPU Vendor:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_CPU_Vendor') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $cpu_vendor . '</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">CPU Name:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_CPU_Name') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $stat['cpu_model'] . '</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">CPU Cores:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_CPU_Cores') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $stat['cpu'] . '</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">CPU Speed:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_CPU_Speed') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $stat['cpu_frequ'] . ' MHz</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">CPU Temp:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_CPU_Temp') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">'. $cpu_temp .' °C</div>
</div>';
// Get the number of CPU cores
@@ -306,15 +306,15 @@ echo '<div class="box box-solid">
</div>
<div class="box-body">
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">Memory %:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_Memory_Usage_Percent') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $memory_usage_percent . ' %</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">Use memory:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_Memory_Usage') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $mem_used . ' MB / ' . $total_memorymb . ' MB</div>
</div>
<div class="row">
<div class="col-sm-3 sysinfo_gerneral_a">Total memory:</div>
<div class="col-sm-3 sysinfo_gerneral_a">' . lang('Systeminfo_Memory_Total_Memory') . '</div>
<div class="col-sm-9 sysinfo_gerneral_b">' . $total_memorymb . ' MB (' . $total_memorykb . ' KB)</div>
</div>
</div>
@@ -344,13 +344,13 @@ for ($x = 0; $x < sizeof($storage_lsblk_line); $x++) {
//if (stristr($hdd_devices[$x], '/dev/')) {
echo '<div class="row">';
if (preg_match('~[0-9]+~', $storage_lsblk_line[$x][0])) {
echo '<div class="col-sm-4 sysinfo_gerneral_a">Mount point "' . $storage_lsblk_line[$x][3] . '"</div>';
echo '<div class="col-sm-4 sysinfo_gerneral_a">"' . lang('Systeminfo_Storage_Mount') . ' ' . $storage_lsblk_line[$x][3] . '"</div>';
} else {
echo '<div class="col-sm-4 sysinfo_gerneral_a">"' . str_replace('_', ' ', $storage_lsblk_line[$x][3]) . '"</div>';
}
echo '<div class="col-sm-3 sysinfo_gerneral_b">Device: /dev/' . $storage_lsblk_line[$x][0] . '</div>';
echo '<div class="col-sm-2 sysinfo_gerneral_b">Size: ' . $storage_lsblk_line[$x][1] . '</div>';
echo '<div class="col-sm-2 sysinfo_gerneral_b">Type: ' . $storage_lsblk_line[$x][2] . '</div>';
echo '<div class="col-sm-3 sysinfo_gerneral_b">' . lang('Systeminfo_Storage_Device') . ' /dev/' . $storage_lsblk_line[$x][0] . '</div>';
echo '<div class="col-sm-2 sysinfo_gerneral_b">' . lang('Systeminfo_Storage_Size') . ' ' . $storage_lsblk_line[$x][1] . '</div>';
echo '<div class="col-sm-2 sysinfo_gerneral_b">' . lang('Systeminfo_Storage_Type') . ' ' . $storage_lsblk_line[$x][2] . '</div>';
echo '</div>';
//}
}
@@ -360,7 +360,7 @@ echo ' </div>
// Storage usage ----------------------------------------------------------
echo '<div class="box box-solid">
<div class="box-header">
<h3 class="box-title sysinfo_headline"><i class="fa fa-hdd"></i> ' . lang('Systeminfo_Storage_usage') . '</h3>
<h3 class="box-title sysinfo_headline"><i class="fa fa-hdd"></i> ' . lang('Systeminfo_Storage_Usage') . '</h3>
</div>
<div class="box-body">';
for ($x = 0; $x < sizeof($hdd_devices); $x++) {
@@ -369,10 +369,10 @@ for ($x = 0; $x < sizeof($hdd_devices); $x++) {
if ($hdd_devices_used[$x] == 0) {$temp_used = 0;} else { $temp_used = number_format(round(($hdd_devices_used[$x] / 1024 / 1024), 2), 2, ',', '.'); $temp_used = trim($temp_total);}
if ($hdd_devices_free[$x] == 0) {$temp_free = 0;} else { $temp_free = number_format(round(($hdd_devices_free[$x] / 1024 / 1024), 2), 2, ',', '.'); $temp_free = trim($temp_total);}
echo '<div class="row">';
echo '<div class="col-sm-4 sysinfo_gerneral_a">Mount point "' . $hdd_devices_mount[$x] . '"</div>';
echo '<div class="col-sm-2 sysinfo_gerneral_b">Total: ' . $temp_total . ' GB</div>';
echo '<div class="col-sm-3 sysinfo_gerneral_b">Used: ' . $temp_used . ' GB (' . number_format($hdd_devices_percent[$x], 1, ',', '.') . '%)</div>';
echo '<div class="col-sm-2 sysinfo_gerneral_b">Free: ' . $temp_free . ' GB</div>';
echo '<div class="col-sm-4 sysinfo_gerneral_a">"' . lang('Systeminfo_Storage_Usage_Mount') . ' ' . $hdd_devices_mount[$x] . '"</div>';
echo '<div class="col-sm-2 sysinfo_gerneral_b">' . lang('Systeminfo_Storage_Usage_Total') . ' ' . $temp_total . ' GB</div>';
echo '<div class="col-sm-3 sysinfo_gerneral_b">' . lang('Systeminfo_Storage_Usage_Used') . ' ' . $temp_used . ' GB (' . number_format($hdd_devices_percent[$x], 1, ',', '.') . '%)</div>';
echo '<div class="col-sm-2 sysinfo_gerneral_b">' . lang('Systeminfo_Storage_Usage_Free') . ' ' . $temp_free . ' GB</div>';
echo '</div>';
}
}
@@ -491,8 +491,8 @@ exec('systemctl --type=service --state=running', $running_services);
echo '<table class="table table-bordered table-hover table-striped dataTable no-footer" style="margin-bottom: 10px;">';
echo '<thead>
<tr role="row">
<th style="padding: 8px;">Service Name</th>
<th style="padding: 8px;">Service Description</th>
<th style="padding: 8px;">' . lang('Systeminfo_Services_Name') . '</th>
<th style="padding: 8px;">' . lang('Systeminfo_Services_Description') . '</th>
</tr>
</thead>';
$table_color = 'odd';