From 9970343fe5c8226f25234addc6b80836c092fe1f Mon Sep 17 00:00:00 2001 From: ShevAbam Date: Tue, 7 Jul 2015 15:57:41 +0200 Subject: 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) --- libs/Utils/Config.class.php | 137 -------------------------------------------- 1 file changed, 137 deletions(-) delete mode 100644 libs/Utils/Config.class.php (limited to 'libs/Utils/Config.class.php') diff --git a/libs/Utils/Config.class.php b/libs/Utils/Config.class.php deleted file mode 100644 index c9140c6..0000000 --- a/libs/Utils/Config.class.php +++ /dev/null @@ -1,137 +0,0 @@ -_checkPHPVersion(5.3); - - $this->file = __DIR__.'/../../esm.config.json'; - - if (!file_exists($this->file)) - throw new \Exception('Config file '.basename($this->file).' not found'); - - $this->_readFile(); - } - - private function _readFile() - { - $content = file_get_contents($this->file); - $this->config = json_decode(utf8_encode($content), true); - - if ($this->config == null && json_last_error() != JSON_ERROR_NONE) - { - throw new \LogicException(sprintf("Failed to parse config file '%s'. Error: '%s'", basename($this->file) , json_last_error_msg())); - } - } - - - /** - * Returns a specific config variable - * Ex : get('ping:hosts') - */ - public function get($var) - { - $tab = $this->config; - - $explode = explode(':', $var); - - foreach ($explode as $vartmp) - { - if (isset($tab[$vartmp])) - { - $tab = $tab[$vartmp]; - } - } - - return $tab == $this->config ? null : $tab; - } - - - /** - * Returns all config variables - */ - public function getAll() - { - return $this->config; - } - - - /** - * Checks the PHP version compared to the required version - */ - private function _checkPHPVersion($min) - { - if (!version_compare(phpversion(), $min, '>=')) - throw new \Exception('Your PHP version is too old ! PHP '.$min.' is required.'); - - return true; - } - - - /** - * Checks if there is an eSM`Web update available - */ - public function checkUpdate() - { - if ($this->get('esm:check_updates') === false) - return null; - - $response = null; - $this_version = $this->get('esm:version'); - $update_url = $this->get('esm:website').'/esm-web/update/'.$this_version; - - if (!function_exists('curl_version')) - { - $tmp = @file_get_contents($update_url); - $response = json_decode($tmp, true); - } - else - { - $curl = curl_init(); - - curl_setopt_array($curl, array( - CURLOPT_CONNECTTIMEOUT => 10, - CURLOPT_RETURNTRANSFER => true, - CURLOPT_SSL_VERIFYPEER => false, - CURLOPT_TIMEOUT => 60, - CURLOPT_USERAGENT => 'eZ Server Monitor `Web', - CURLOPT_URL => $update_url, - )); - - $response = json_decode(curl_exec($curl), true); - - curl_close($curl); - } - - if (!is_null($response) && !empty($response)) - { - if (is_null($response['error'])) - { - return $response['datas']; - } - } - } -} - - -// PHP 5.5.0 -if (!function_exists('json_last_error_msg')) -{ - function json_last_error_msg() - { - static $errors = array( - JSON_ERROR_NONE => null, - JSON_ERROR_DEPTH => 'Maximum stack depth exceeded', - JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch', - JSON_ERROR_CTRL_CHAR => 'Unexpected control character found', - JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON', - JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded' - ); - $error = json_last_error(); - return array_key_exists($error, $errors) ? $errors[$error] : "Unknown error ({$error})"; - } -} \ No newline at end of file -- cgit v1.3