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)

2 files changed, 70 insertions, 7 deletions

diff --git a/libs/Utils/Config.class.php b/libs/Utils/Config.php
index c9140c6..212a227 100644
--- a/libs/Utils/Config.class.php
+++ b/libs/Utils/Config.php
@@ -9,7 +9,7 @@ class Config
     {
         $this->_checkPHPVersion(5.3);
 
-        $this->file = __DIR__.'/../../esm.config.json';
+        $this->file = __DIR__.'/../../conf/esm.config.json';
 
         if (!file_exists($this->file))
             throw new \Exception('Config file '.basename($this->file).' not found');
@@ -47,7 +47,8 @@ class Config
             }
         }
 
-        return $tab == $this->config ? null : $tab;
+        // return $tab == $this->config ? null : $tab;
+        return $tab;
     }
     
     
diff --git a/libs/Utils/Misc.class.php b/libs/Utils/Misc.php
index e2fe7cb..a86312b 100644
--- a/libs/Utils/Misc.class.php
+++ b/libs/Utils/Misc.php
@@ -4,6 +4,10 @@ class Misc
 {
     /**
      * Returns human size
+     *
+     * @param  float $filesize   File size
+     * @param  int   $precision  Number of decimals
+     * @return string            Human size
      */
     public static function getSize($filesize, $precision = 2)
     {
@@ -23,6 +27,8 @@ class Misc
     
     /**
      * Returns hostname
+     *
+     * @return  string  Hostname
      */
     public static function getHostname()
     {
@@ -32,6 +38,8 @@ class Misc
 
     /**
      * Returns CPU cores number
+     * 
+     * @return  int  Number of cores
      */
     public static function getCpuCoresNumber()
     {
@@ -52,6 +60,8 @@ class Misc
 
     /**
      * Returns server IP
+     *
+     * @return string Server local IP
      */
     public static function getLanIp()
     {
@@ -61,6 +71,11 @@ class Misc
 
     /**
      * Returns a command that exists in the system among $cmds
+     *
+     * @param  array  $cmds             List of commands
+     * @param  string $args             List of arguments (optional)
+     * @param  bool   $returnWithArgs   If true, returns command with the arguments
+     * @return string                   Command
      */
     public static function whichCommand($cmds, $args = '', $returnWithArgs = true)
     {
@@ -89,14 +104,61 @@ class Misc
      * Ex : echo 'cheva'.Misc::pluralize(5, 'ux', 'l'); ==> prints chevaux
      * Ex : echo 'cheva'.Misc::pluralize(1, 'ux', 'l'); ==> prints cheval
      * 
-     * @param int $nb
-     * @param string $plural
-     * @param string $singular
-     * 
-     * @return string
+     * @param  int       $nb         Number
+     * @param  string    $plural     String for plural word
+     * @param  string    $singular   String for singular word
+     * @return string                String pluralized
      */
     public static function pluralize($nb, $plural = 's', $singular = '')
     {
         return $nb > 1 ? $plural : $singular;
     }
+
+
+    /**
+     * Checks if a port is open (TCP or UPD)
+     *
+     * @param  string   $host       Host to check
+     * @param  int      $port       Port number
+     * @param  string   $protocol   tcp or udp
+     * @param  integer  $timeout    Timeout
+     * @return bool                 True if the port is open else false
+     */
+    public static function scanPort($host, $port, $protocol = 'tcp', $timeout = 3)
+    {
+        if ($protocol == 'tcp')
+        {
+            $handle = @fsockopen($host, $port, $errno, $errstr, $timeout);
+
+            if ($handle)
+                return true;
+            else
+                return false;
+        }
+        elseif ($protocol == 'udp')
+        {
+            $handle = @fsockopen('udp://'.$host, $port, $errno, $errstr, $timeout);
+
+            socket_set_timeout($handle, $timeout);
+
+            $write = fwrite($handle, 'x00');
+
+            $startTime = time();
+
+            $header = fread($handle, 1);
+
+            $endTime = time();
+
+            $timeDiff = $endTime - $startTime; 
+            
+            fclose($handle);
+
+            if ($timeDiff >= $timeout)
+                return true;
+            else
+                return false;
+        }
+
+        return false;
+    }
 }
\ No newline at end of file