General : cleaning and optimizing CSS

General : responsive design
General : reload button now spins when you reload block
General : update jQuery plugin Knob to 1.2.11
General : optimizing security (config file esm.config.json is now in the conf/ folder with an htaccess)
CPU : retrieves correctly CPU frequency for Raspberry Pi
CPU : add CPU temperature (+ option to enable/disable)
System : little correction for getting distro name
Swap : fix if swap is disabled
Services status : adds protocol TCP or UDP for checking service status
Services status : new option to hide port number (see show_port in services section)

1 files changed, 30 insertions, 1 deletions

diff --git a/libs/cpu.php b/libs/cpu.php
index 73a5409..9665c87 100644
--- a/libs/cpu.php
+++ b/libs/cpu.php
@@ -1,5 +1,6 @@
 <?php
-require 'Utils/Misc.class.php';
+require '../autoload.php';
+$Config = new Config();
 
 // Number of cores
 $num_cores = Misc::getCpuCoresNumber();
@@ -10,6 +11,7 @@ $model      = 'N.A';
 $frequency  = 'N.A';
 $cache      = 'N.A';
 $bogomips   = 'N.A';
+$temp       = 'N.A';
 
 if ($cpuinfo = shell_exec('cat /proc/cpuinfo'))
 {
@@ -50,6 +52,32 @@ if ($cpuinfo = shell_exec('cat /proc/cpuinfo'))
     }
 }
 
+if ($frequency == 'N.A')
+{
+    if ($f = shell_exec('cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq'))
+    {
+        $f = $f / 1000;
+        $frequency = $f.' MHz';
+    }
+}
+
+// CPU Temp
+if ($Config->get('cpu:enable_temperature'))
+{
+    if (exec('/usr/bin/sensors | grep -E "^(CPU Temp|Core 0)" | cut -d \'+\' -f2 | cut -d \'.\' -f1', $t))
+    {
+        if (isset($t[0]))
+            $temp = $t[0].' °C';
+    }
+    else
+    {
+        if (exec('cat /sys/class/thermal/thermal_zone0/temp', $t))
+        {
+            $temp = round($t[0] / 1000).' °C';
+        }
+    }
+}
+
 
 $datas = array(
     'model'      => $model,
@@ -57,6 +85,7 @@ $datas = array(
     'frequency'  => $frequency,
     'cache'      => $cache,
     'bogomips'   => $bogomips,
+    'temp'       => $temp,
 );
 
 echo json_encode($datas);
\ No newline at end of file