From 9f56bd96367f7f3cfa295f23b9129a7dfa1f21af Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 24 Nov 2010 08:16:10 -0500
Subject: [PATCH] Merged revisions 2095-2129 which contain bugfixes from stable branch.
---
server/mods-available/monitor_core_module.inc.php | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 4555387..4392812 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -238,7 +238,7 @@
$state = 'ok';
/** Fetch the data for all users*/
- $dfData = shell_exec('repquota -asu');
+ $dfData = shell_exec('repquota -au');
// split into array
$df = explode("\n", $dfData);
@@ -253,14 +253,22 @@
*/
$s = preg_split ('/[\s]+/', $df[$i]);
$username = $s[0];
- $data['user'][$username]['used'] = $s[2];
- $data['user'][$username]['soft'] = $s[3];
- $data['user'][$username]['hard'] = $s[4];
+ if(substr($username,0,3) == 'web') {
+ if(isset($data['user'][$username])) {
+ $data['user'][$username]['used'] += $s[2];
+ $data['user'][$username]['soft'] += $s[3];
+ $data['user'][$username]['hard'] += $s[4];
+ } else {
+ $data['user'][$username]['used'] = $s[2];
+ $data['user'][$username]['soft'] = $s[3];
+ $data['user'][$username]['hard'] = $s[4];
+ }
+ }
}
}
/** Fetch the data for all users*/
- $dfData = shell_exec('repquota -asg');
+ $dfData = shell_exec('repquota -ag');
// split into array
$df = explode("\n", $dfData);
@@ -275,9 +283,17 @@
*/
$s = preg_split ('/[\s]+/', $df[$i]);
$groupname = $s[0];
- $data['group'][$groupname]['used'] = $s[1];
- $data['group'][$groupname]['soft'] = $s[2];
- $data['group'][$groupname]['hard'] = $s[3];
+ if(substr($groupname,0,6) == 'client') {
+ if(isset($data['group'][$groupname])) {
+ $data['group'][$groupname]['used'] += $s[1];
+ $data['group'][$groupname]['soft'] += $s[2];
+ $data['group'][$groupname]['hard'] += $s[3];
+ } else {
+ $data['group'][$groupname]['used'] = $s[1];
+ $data['group'][$groupname]['soft'] = $s[2];
+ $data['group'][$groupname]['hard'] = $s[3];
+ }
+ }
}
}
--
Gitblit v1.9.1