From 6e4e1f3d0b14a0c631cfde84fc9ad296dd6c367f Mon Sep 17 00:00:00 2001 From: ShevAbam Date: Tue, 11 Nov 2014 15:28:05 +0100 Subject: [PATCH] Add favicon ; change measurements ; fix on ping module --- esm.config.json | 2 +- favicon.ico | Bin 0 -> 15086 bytes index.php | 8 +++++--- libs/Utils/Misc.class.php | 2 +- libs/ping.php | 5 +++++ 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 favicon.ico diff --git a/esm.config.json b/esm.config.json index 2e8c11f..b65412c 100644 --- a/esm.config.json +++ b/esm.config.json @@ -1,6 +1,6 @@ { "esm": { - "version": "2.2", + "version": "2.3", "website": "http://www.ezservermonitor.com", "check_updates": true, "auto_refresh": 0 diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..50fd957771144b5484776d23f1cb48167e7f21da GIT binary patch literal 15086 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 Th9DDgg%CuWz8`;9=I?(4RY2hh literal 0 HcmV?d00001 diff --git a/index.php b/index.php index 8af45f3..4918e7b 100644 --- a/index.php +++ b/index.php @@ -11,9 +11,11 @@ $update = $Config->checkUpdate(); get('esm:auto_refresh') > 0): ?> + eZ Server Monitor - <?php echo Misc::getHostname(); ?> + @@ -117,17 +119,17 @@ $update = $Config->checkUpdate();
-
+

1 min

-
+

15 min

-
+

5 min

diff --git a/libs/Utils/Misc.class.php b/libs/Utils/Misc.class.php index 3fcfedb..d77bbf5 100644 --- a/libs/Utils/Misc.class.php +++ b/libs/Utils/Misc.class.php @@ -17,7 +17,7 @@ class Misc break; } - return round($filesize, $precision).' '.$units[$idUnit].'o'; + return round($filesize, $precision).' '.$units[$idUnit].'B'; } diff --git a/libs/ping.php b/libs/ping.php index 1cadb70..9ea0ec8 100644 --- a/libs/ping.php +++ b/libs/ping.php @@ -14,6 +14,11 @@ foreach ($hosts as $host) { exec('/bin/ping -qc 1 '.$host.' | awk -F/ \'/^rtt/ { print $5 }\'', $result); + if (!isset($result[0])) + { + $result[0] = 0; + } + $datas[] = array( 'host' => $host, 'ping' => $result[0],