From 00baa16a9e0905b3e5140349b723544597a017b9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 16 Nov 2011 06:08:09 -0500
Subject: [PATCH] Fixes for FS#1843 - mail quota usage statistics with courier
---
server/lib/classes/monitor_tools.inc.php | 2 +-
server/mods-available/monitor_core_module.inc.php | 7 +++++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 7d879c4..4761d96 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -177,7 +177,7 @@
unset($quotafile);
} else {
exec('du -s '.escapeshellcmd($filename),$out);
- $parts = explode(' ',$out);
+ $parts = explode(' ',$out[0]);
$data[$email]['used'] = intval($parts[0])*1024;
unset($out);
unset($parts);
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index ca1e9e4..bfb03be 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -120,6 +120,13 @@
global $app;
/*
+ * This monitoring is expensive, so do it only every 15 minutes
+ */
+ $min = @date('i');
+ if ($min % 15 != 0) return;
+
+
+ /*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorEmailQuota();
--
Gitblit v1.9.1