From b5715fb4a82d6494e6fba5ffcc1b0af3c9d2421c Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Sat, 07 Jul 2012 13:12:41 -0400
Subject: [PATCH] removed hardcoded width for list search_limit select-element -> css defined
---
server/mods-available/monitor_core_module.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index fa1b189..2bc95d8 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -117,7 +117,7 @@
}
private function _monitorEmailQuota() {
- global $app;
+ global $app, $conf;
/*
* This monitoring is expensive, so do it only every 15 minutes
@@ -125,6 +125,10 @@
$min = @date('i');
if ($min % 15 != 0) return;
+ $app->uses('getconf');
+ $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+ if($mail_config['mailbox_quota_stats'] == 'n') return;
+
/*
* First we get the Monitoring-data from the tools
--
Gitblit v1.9.1