diff --git a/front/systeminfo.php b/front/systeminfo.php index c0f58eed..3825a5c7 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 @@ -100,91 +103,122 @@ $hdd_devices_mount = explode("\n", trim($hdd_result)); $usb_result = shell_exec("lsusb"); $usb_devices_mount = explode("\n", trim($usb_result)); -// Client ---------------------------------------------------------- -echo '
-
-

This Client

-
-
-
-
User Agent
-
' . $_SERVER['HTTP_USER_AGENT'] . '
-
-
-
Browser Resolution:
-
-
-
-
'; - // 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 . '
+
+
+
'; + +// Client ---------------------------------------------------------- +echo '
+
+

This Client

+
+
+
+
User Agent
+
' . $_SERVER['HTTP_USER_AGENT'] . '
+
+
+
Browser Resolution:
+
+
'; echo ''; +// 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 %:
+
' . $memory_usage_percent . ' %
+
+
+
Use memory:
+
' . $mem_used . ' MB / ' . $total_memorymb . ' MB
+
+
+
Total memory:
+
' . $total_memorymb . ' MB (' . $total_memorykb . ' KB)
+
+
+
'; + // Storage ---------------------------------------------------------- echo '
@@ -241,7 +275,7 @@ for ($x = 0; $x < sizeof($hdd_devices); $x++) { echo '
'; } } -echo '
' . $pia_lang['SysInfo_storage_note']; +#echo '
' . $lang['SysInfo_storage_note']; echo '
';