From a0fd5ab7b5412985324e970573ca22a27b3a94d3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 16 Apr 2013 05:56:06 -0400
Subject: [PATCH] - Merged revisions 3922-3958 from svn stable branch - Added backup size to web backups
---
server/lib/classes/monitor_tools.inc.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index d1ed129..92b3ecb 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -135,7 +135,7 @@
} elseif (strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
$distname = 'Debian';
$distver = 'Wheezy/Sid';
- $distid = 'debian70';
+ $distid = 'debian60';
$distbaseid = 'debian';
} else {
$distname = 'Debian';
@@ -302,7 +302,7 @@
$state = 'ok';
//* Fetch the data for all users
- $dfData = shell_exec('repquota -au');
+ $dfData = shell_exec('repquota -au 2>/dev/null');
//* Split into array
$df = explode("\n", $dfData);
@@ -330,7 +330,7 @@
}
//** Fetch the data for all users
- $dfData = shell_exec('repquota -ag');
+ $dfData = shell_exec('repquota -ag 2>/dev/null');
//* split into array
$df = explode("\n", $dfData);
@@ -485,7 +485,7 @@
$state = 'ok';
/** Fetch the data of ALL devices into a array (needed for monitoring!) */
- $dfData = shell_exec('df -hT');
+ $dfData = shell_exec('df -hT 2>/dev/null');
// split into array
$df = explode("\n", $dfData);
@@ -1309,7 +1309,7 @@
system('which iptables', $retval); // Debian, Ubuntu, Fedora
if ($retval === 0) {
/* Get the data of the log */
- $data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S');
+ $data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S 2>/dev/null');
/*
* At this moment, there is no state (maybe later)
@@ -1325,7 +1325,7 @@
system('which ip6tables', $retval); // Debian, Ubuntu, Fedora
if ($retval === 0) {
/* Get the data of the log */
- $data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S');
+ $data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S 2>/dev/null');
/*
* At this moment, there is no state (maybe later)
--
Gitblit v1.9.1