From e403c9419be569b65215287f686a626f9ee2a531 Mon Sep 17 00:00:00 2001
From: Antennipasi <Antennipasi@ispconfig3>
Date: Fri, 02 Jan 2009 17:28:04 -0500
Subject: [PATCH] Changed diskusage-info human readable, added filesystem type..

---
 server/mods-available/monitor_core_module.inc.php |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 7a886fa..8bd12e9 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -192,7 +192,7 @@
         $state = 'ok';
 
         /** Fetch the data into a array */
-        $dfData = shell_exec("df");
+        $dfData = shell_exec("df -hTx tmpfs");
 
         // split into array
         $df = explode("\n", $dfData);
@@ -208,11 +208,12 @@
                  */
                 $s = preg_split ("/[\s]+/", $df[$i]);
                 $data[$i]['fs'] = $s[0];
-                $data[$i]['size'] = $s[1];
-                $data[$i]['used'] = $s[2];
-                $data[$i]['available'] = $s[3];
-                $data[$i]['percent'] = $s[4];
-                $data[$i]['mounted'] = $s[5];
+                $data[$i]['type'] = $s[1];
+                $data[$i]['size'] = $s[2];
+                $data[$i]['used'] = $s[3];
+                $data[$i]['available'] = $s[4];
+                $data[$i]['percent'] = $s[5];
+                $data[$i]['mounted'] = $s[6];
                 /*
                  * calculate the state
                  */
@@ -1304,4 +1305,4 @@
 
 } // end class
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1