From d3be569127300fa335a659c3ea40c100763d5fa9 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 12 Jun 2014 07:36:09 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/lib/classes/cron.d/100-monitor_email_quota.inc.php | 3 ++-
1 files changed, 2 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 d6d5564..5d0c7a0 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
@@ -81,7 +81,8 @@
//* 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;
+ exec('doveadm quota 2>&1', $tmp_output, $tmp_retval); // with dovecot 2.2.x 'doveadm quota' is unuseable
+ if ($retval = 64) $dovecot = true;
}
foreach($mailboxes as $mb) {
--
Gitblit v1.9.1