From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
server/lib/classes/monitor_tools.inc.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 00b9759..a8a4025 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -241,10 +241,12 @@
$data['user'][$username]['used'] += $s[2];
$data['user'][$username]['soft'] += $s[3];
$data['user'][$username]['hard'] += $s[4];
+ $data['user'][$username]['files'] += $s[5];
} else {
$data['user'][$username]['used'] = $s[2];
$data['user'][$username]['soft'] = $s[3];
$data['user'][$username]['hard'] = $s[4];
+ $data['user'][$username]['files'] = $s[5];
}
}
}
@@ -1020,7 +1022,7 @@
/*
* Fetch the output
*/
- $data['output'] = shell_exec('mpt-status --autoload -n');
+ $data['output'] = shell_exec('mpt-status --autoload');
/*
* Then calc the state.
@@ -1032,7 +1034,7 @@
* The output contains information for every RAID and every HDD.
* We only need the state of the RAID
*/
- if (strpos($item, 'raidlevel:') !== false) {
+ if (strpos($item, 'state ') !== false) {
/*
* We found a raid, process the state of it
*/
--
Gitblit v1.9.1