From 56ae2538dde73a415909cc6f398f86489a722006 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 12 Jun 2014 11:45:21 +0200
Subject: [PATCH] make sure "doveadm quota" works and quota is enabled (seems
 to be broken in dovecot 2.2.x)

---
 server/lib/classes/cron.d/100-monitor_email_quota.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 d6d55645da..5d0c7a0bc4 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 @@ class cronjob_monitor_email_quota extends cronjob {
 			//* 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) {
-- 
GitLab