From 9b4702d833708415d0cf05a98a00aac1bc850ff7 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 19 May 2014 08:55:47 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/plugins-available/mail_plugin_dkim.inc.php | 2 +-
server/lib/classes/cron.d/100-monitor_email_quota.inc.php | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/cron.d/100-monitor_email_quota.inc.php b/server/lib/classes/cron.d/100-monitor_email_quota.inc.php
index 62e97b4..d6d5564 100644
--- a/server/lib/classes/cron.d/100-monitor_email_quota.inc.php
+++ b/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);
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 0f0f6ef..268c9c5 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/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;
--
Gitblit v1.9.1