summaryrefslogtreecommitdiff
path: root/libs/Utils/Config.class.php
diff options
context:
space:
mode:
authorShevAbam <shevabam@gmail.com>2014-06-18 10:15:18 +0200
committerShevAbam <shevabam@gmail.com>2014-06-18 10:15:18 +0200
commit3f6a49bae3ec616469f21dfbbbaff052055b0c0e (patch)
treec59f35c5a6b84b05a2bacd61e4c9655cfb554688 /libs/Utils/Config.class.php
parent20705a550df5b13a544dc0865c6aef16e64c99d9 (diff)
- System : fix to get the distro name
- Services : fix on service names with accent - Services : ability to specify a host for each service - Network usage : fix to retrieve the name of the network interfaces - Memory : the cached and buffers memory are added to free memory now - Load Average : taking into account the number of cores - Disk usage : new option to hide tmpfs mountpoints - General : remove all PHP short tags
Diffstat (limited to 'libs/Utils/Config.class.php')
-rw-r--r--libs/Utils/Config.class.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/Utils/Config.class.php b/libs/Utils/Config.class.php
index 8111b32..a332b91 100644
--- a/libs/Utils/Config.class.php
+++ b/libs/Utils/Config.class.php
@@ -7,7 +7,7 @@ class Config
public function __construct()
{
- $this->file = $_SERVER['DOCUMENT_ROOT'].'/esm.config.json';
+ $this->file = __DIR__.'/../../esm.config.json';
if (file_exists($this->file))
$this->_readFile();
@@ -16,7 +16,7 @@ class Config
private function _readFile()
{
$content = file_get_contents($this->file);
- $this->config = json_decode($content, true);
+ $this->config = json_decode(utf8_encode($content), true);
}