From 8057d49be049c85a45c2b07c0533e6d1cf753db9 Mon Sep 17 00:00:00 2001 From: Carlos V <76731844+cvc90@users.noreply.github.com> Date: Tue, 8 Aug 2023 03:58:08 +0200 Subject: [PATCH 1/4] Update systeminfo.php Updated the "Memory Statistics" formula variables Updated "Memory Statistics" echo variables Added new formula variables for "CPU Temp" Modified section "General" Added new section "System" Added new section "CPU" Added new section "Memory" --- front/systeminfo.php | 167 +++++++++++++++++++++++++++---------------- 1 file changed, 106 insertions(+), 61 deletions(-) diff --git a/front/systeminfo.php b/front/systeminfo.php index c0f58eed..7a168695 100644 --- a/front/systeminfo.php +++ b/front/systeminfo.php @@ -63,12 +63,15 @@ if (file_exists('/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq')) { // Fallback $stat['cpu_frequ'] = "unknown"; } +$cpu_temp = shell_exec('cat /sys/class/thermal/thermal_zone0/temp'); // Get the CPU temperature +$cpu_temp = floatval($cpu_temp) / 1000; // Convert the temperature to degrees Celsius //Memory stats -$total_memory = shell_exec("cat /proc/meminfo | grep MemTotal | cut -d' ' -f2-") / 1024 | bc; -$mem_result = shell_exec("cat /proc/meminfo | grep MemTotal"); -$stat['mem_total'] = round(preg_replace("#[^0-9]+(?:\.[0-9]*)?#", "", $mem_result) / 1024 / 1024, 3); -$stat['mem_used'] = round(memory_get_usage() / 1048576 * 100, 2); -$memory_usage_percent = round(($stat['mem_used'] / $stat['mem_total']), 2); +$total_memorykb = shell_exec("cat /proc/meminfo | grep MemTotal | awk '{print $2}'"); +$total_memorykb = number_format($total_memorykb, 0, '.', '.'); +$total_memorymb = shell_exec("cat /proc/meminfo | grep MemTotal | awk '{print $2/1024}'"); +$total_memorymb = number_format($total_memorymb, 0, '.', '.'); +$mem_used = round(memory_get_usage() / 1048576 * 100, 2); +$memory_usage_percent = round(($mem_used / $total_memorymb), 2); //Load System $load_average = sys_getloadavg(); //Date & Time @@ -106,71 +109,113 @@ echo '

This Client

-
-
User Agent
-
' . $_SERVER['HTTP_USER_AGENT'] . '
-
-
-
Browser Resolution:
-
-
+
+
User Agent
+
' . $_SERVER['HTTP_USER_AGENT'] . '
+
+
+
Browser Resolution:
+
+
'; +echo ''; + // General ---------------------------------------------------------- echo '

General

-
-
Full Date
-
' . $formatted_date . '
-
-
-
Date
-
' . $formatted_date2 . '
-
-
-
Date2
-
' . $formatted_date3 . '
-
-
-
Timezone
-
' . $timeZone . '
-
-
-
Uptime
-
' . $stat['uptime'] . '
-
-
-
Operating System
-
' . $stat['os_version'] . '
-
-
-
CPU Name:
-
' . $stat['cpu_model'] . '
-
-
-
CPU Cores:
-
' . $stat['cpu'] . ' @ ' . $stat['cpu_frequ'] . ' MHz
-
-
-
Memory:
-
' . $stat['mem_used'] . ' MB / ' . $stat['mem_total'] . ' MB
-
-
-
Memory %:
-
' . $memory_usage_percent . ' %
-
-
-
Total memory:
-
' . $total_memory . ' MB
-
-
-
Load AVG:
-
'. $load_average[0] .' '. $load_average[1] .' '. $load_average[2] .'
-
+
+
Full Date
+
' . $formatted_date . '
+
+
+
Date
+
' . $formatted_date2 . '
+
+
+
Date2
+
' . $formatted_date3 . '
+
+
+
Timezone
+
' . $timeZone . '
+
+
+
'; + +// System ---------------------------------------------------------- +echo '
+
+

System

+
+
+
+
Uptime
+
' . $stat['uptime'] . '
+
+
+
Operating System
+
' . $stat['os_version'] . '
+
+
+
Load AVG:
+
'. $load_average[0] .' '. $load_average[1] .' '. $load_average[2] .'
+
+
+
'; + +// CPU ---------------------------------------------------------- +echo '
+
+

CPU

+
+
+
+
CPU Name:
+
' . $stat['cpu_model'] . '
+
+
+
CPU Cores:
+
' . $stat['cpu'] . ' @ ' . $stat['cpu_frequ'] . ' MHz
+
+
+
CPU Temp:
+
'. $cpu_temp .' °C
+
+
+
'; + +// Memory ---------------------------------------------------------- +echo '
+
+

Memory

+
+
+
+
Memory:
+
' . $mem_used . ' MB / ' . $total_memorymb . ' MB
+
+
+
Memory %:
+
' . $memory_usage_percent . ' %
+
+
+
Total memory:
+
' . $total_memorymb . ' MB (' . $total_memorykb . ' KB)
+
'; From 3948557da80ec4785a4616c9db0f49122c079a3f Mon Sep 17 00:00:00 2001 From: Carlos V <76731844+cvc90@users.noreply.github.com> Date: Tue, 8 Aug 2023 04:11:35 +0200 Subject: [PATCH 2/4] Update systeminfo.php Change of order of "General" section Change of order of "This Client" section --- front/systeminfo.php | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/front/systeminfo.php b/front/systeminfo.php index 7a168695..13388e5f 100644 --- a/front/systeminfo.php +++ b/front/systeminfo.php @@ -103,6 +103,31 @@ $hdd_devices_mount = explode("\n", trim($hdd_result)); $usb_result = shell_exec("lsusb"); $usb_devices_mount = explode("\n", trim($usb_result)); +// General ---------------------------------------------------------- +echo '
+
+

General

+
+
+
+
Full Date
+
' . $formatted_date . '
+
+
+
Date
+
' . $formatted_date2 . '
+
+
+
Date2
+
' . $formatted_date3 . '
+
+
+
Timezone
+
' . $timeZone . '
+
+
+
'; + // Client ---------------------------------------------------------- echo '
@@ -131,31 +156,6 @@ echo ''; -// General ---------------------------------------------------------- -echo '
-
-

General

-
-
-
-
Full Date
-
' . $formatted_date . '
-
-
-
Date
-
' . $formatted_date2 . '
-
-
-
Date2
-
' . $formatted_date3 . '
-
-
-
Timezone
-
' . $timeZone . '
-
-
-
'; - // System ---------------------------------------------------------- echo '
From d5d23c8c60acb7b8576633d68d8480eb24f38f73 Mon Sep 17 00:00:00 2001 From: Carlos V <76731844+cvc90@users.noreply.github.com> Date: Tue, 8 Aug 2023 04:23:21 +0200 Subject: [PATCH 3/4] Update systeminfo.php Modified "Memory" section --- front/systeminfo.php | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/front/systeminfo.php b/front/systeminfo.php index 13388e5f..e8c2f2b1 100644 --- a/front/systeminfo.php +++ b/front/systeminfo.php @@ -204,14 +204,14 @@ echo '

Memory

-
-
Memory:
-
' . $mem_used . ' MB / ' . $total_memorymb . ' MB
-
Memory %:
' . $memory_usage_percent . ' %
-
+
+
+
Use memory:
+
' . $mem_used . ' MB / ' . $total_memorymb . ' MB
+
Total memory:
' . $total_memorymb . ' MB (' . $total_memorykb . ' KB)
@@ -219,17 +219,6 @@ echo '
'; -echo ''; - // Storage ---------------------------------------------------------- echo '
From 7c16bd31a292fc9b7c84b1997ca14291ec27ddf3 Mon Sep 17 00:00:00 2001 From: Carlos V <76731844+cvc90@users.noreply.github.com> Date: Tue, 8 Aug 2023 04:31:51 +0200 Subject: [PATCH 4/4] Update systeminfo.php Updated "Storage usage" section --- front/systeminfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/systeminfo.php b/front/systeminfo.php index e8c2f2b1..3825a5c7 100644 --- a/front/systeminfo.php +++ b/front/systeminfo.php @@ -275,7 +275,7 @@ for ($x = 0; $x < sizeof($hdd_devices); $x++) { echo '
'; } } -echo '
' . $pia_lang['SysInfo_storage_note']; +#echo '
' . $lang['SysInfo_storage_note']; echo '
';