Commit 9db56726 authored by tbrehm's avatar tbrehm
Browse files

Implemented: FS#2107 - Add option to disable mailbox quota statistics

parent 3560ade3
......@@ -31,6 +31,7 @@ relayhost_user=
relayhost_password=
mailbox_size_limit=0
message_size_limit=0
mailbox_quota_stats=y
realtime_blackhole_list=
[getmail]
......
......@@ -292,6 +292,12 @@ $form["tabs"]['mail'] = array(
'width' => '10',
'maxlength' => '15'
),
'mailbox_quota_stats' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array(0 => 'n',1 => 'y')
),
'realtime_blackhole_list' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......
......@@ -163,4 +163,5 @@ $wb["php_settings_txt"] = 'PHP Settings';
$wb["apps_vhost_settings_txt"] = 'Apps Vhost Settings';
$wb["awstats_settings_txt"] = 'AWStats Settings';
$wb["firewall_txt"] = 'Firewall';
$wb["mailbox_quota_stats_txt"] = 'Mailbox quota statistic';
?>
\ No newline at end of file
......@@ -71,6 +71,12 @@
<label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
<input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" />&nbsp;MB
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='mailbox_quota_stats_txt'}</p>
<div class="multiField">
{tmpl_var name='mailbox_quota_stats'}
</div>
</div>
<div class="ctrlHolder">
<label for="realtime_blackhole_list">{tmpl_var name='realtime_blackhole_list_txt'}</label>
<input name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='realtime_blackhole_list_note_txt'}
......
......@@ -117,7 +117,7 @@ class monitor_core_module {
}
private function _monitorEmailQuota() {
global $app;
global $app, $conf;
/*
* This monitoring is expensive, so do it only every 15 minutes
......@@ -125,6 +125,10 @@ class monitor_core_module {
$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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment