latham
2011-05-19 4a75ab8355ed787110579caca0240a4e44ec2f6e
start enableing email quotas.

4 files modified
11 ■■■■ changed files
install/tpl/debian6_dovecot.conf.master 5 ●●●● patch | view | raw | blame | history
interface/web/client/form/client.tform.php 2 ●●● patch | view | raw | blame | history
server/lib/classes/monitor_tools.inc.php 2 ●●●●● patch | view | raw | blame | history
server/mods-available/monitor_core_module.inc.php 2 ●●● patch | view | raw | blame | history
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
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',
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() {
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();