Merge branch 'master' into 'master'

Marius Cramer

2014-05-19 9b4702d833708415d0cf05a98a00aac1bc850ff7

 Merge branch 'master' into 'master'

Master

 server/lib/classes/cron.d/100-monitor_email_quota.inc.php

@@ -77,10 +77,20 @@

        $mailboxes = $app->db->queryAllRecords("SELECT email,maildir FROM mail_user WHERE server_id = $server_id");
        if(is_array($mailboxes)) {

            //* with dovecot we can use doveadm instead of 'du -s'
            $dovecot = false;
            if (isset($mail_config['pop3_imap_daemon']) && $mail_config ['pop3_imap_daemon'] = 'dovecot' && is_executable('doveadm')) {
                $dovecot = true;
            }

            foreach($mailboxes as $mb) {
                $email = $mb['email'];
                $email_parts = explode('@', $mb['email']);
                $filename = $mb['maildir'].'/.quotausage';
                if(!file_exists($filename) && $dovecot) {
                    exec('doveadm quota recalc -u '.$email);
                }
                if(file_exists($filename) && !is_link($filename)) {
                    $quotafile = file($filename);
                    preg_match('/storage.*?([0-9]+)/s', implode('',$quotafile), $storage_value);

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -132,7 +132,7 @@
            }

        } else {
            $app->log('Unable to write DKIM settings; Check your config!', LOGLEVEL_ERROR);
            $app->log('Unable to write DKIM settings - no DKIM-Path defined', LOGLEVEL_ERROR);
            $check=false;
        }
        return $check;