From ab7597c7ec2d62aadf82c4c647d3dc63dae8de90 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Thu, 16 Aug 2012 14:53:05 -0400
Subject: [PATCH] Implemented FS#2379 - Add perl option to web sites (apache2 mod_perl2) Fixed (partly) FS#2310 - Template switch not working in mailuser module, for dashlets and the login page
---
server/mods-available/monitor_core_module.inc.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index fa1b189..099b89a 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -117,13 +117,17 @@
}
private function _monitorEmailQuota() {
- global $app;
+ global $app, $conf;
/*
* This monitoring is expensive, so do it only every 15 minutes
*/
$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;
/*
@@ -704,7 +708,7 @@
$res = $this->_tools->monitorISPCCronLog();
//* Ensure that output is encoded so that it does not break the serialize
- $res['data']['output'] = htmlentities($res['data']['output']);
+ $res['data'] = htmlentities($res['data']);
/*
* Insert the data into the database
--
Gitblit v1.9.1