From 4a75ab8355ed787110579caca0240a4e44ec2f6e Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Thu, 19 May 2011 14:59:41 -0400
Subject: [PATCH] start enableing email quotas.
---
server/lib/classes/monitor_tools.inc.php | 2 --
install/tpl/debian6_dovecot.conf.master | 5 +----
interface/web/client/form/client.tform.php | 2 +-
server/mods-available/monitor_core_module.inc.php | 2 +-
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/install/tpl/debian6_dovecot.conf.master b/install/tpl/debian6_dovecot.conf.master
index e7b050f..2ce0db3 100644
--- a/install/tpl/debian6_dovecot.conf.master
+++ b/install/tpl/debian6_dovecot.conf.master
@@ -48,10 +48,7 @@
## Plugin settings
plugin {
- quota = maildir
-
- # Disabled user quota reporting for the first upload
- # quota = dict:user::file:/var/vmail/%n_%d_quota
+ quota = dict:user::file:/var/vmail/%n_%d_quota
# Because the mail quota is called in the user query
# the maildir quota does not need to be set.
# You do not need: quota = maildir
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index b6a54ae..be3c631 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -220,7 +220,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
- 'default' => 'DE',
+ 'default' => '$conf["country"]',
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
'keyfield'=> 'iso',
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 6baa1bb..f5258e3 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -149,7 +149,6 @@
return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
}
-/*
//** Email Quota
public function monitorEmailQuota() {
global $conf;
@@ -184,7 +183,6 @@
$res['state'] = $state;
return $res;
}
-*/
//** Filesystem Quota
public function monitorHDQuota() {
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index a0410c8..4294e54 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -86,7 +86,7 @@
/*
* Calls the single Monitoring steps
*/
-// $this->_monitorEmailQuota();
+ $this->_monitorEmailQuota();
$this->_monitorHDQuota();
$this->_monitorServer();
$this->_monitorOsVer();
--
Gitblit v1.9.1