Merge branch 'master' into 'master'

Marius Cramer · Marius Cramer · commit d3be56912730 · 2014-06-12T13:36:09.000+02:00
Master
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
@@ -81,7 +81,8 @@ public function onRunJob() {
 			//* 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) {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public function onRunJob() {`
`81`	`81`	`//* with dovecot we can use doveadm instead of 'du -s'`
`82`	`82`	`$dovecot = false;`
`83`	`83`	`if (isset($mail_config['pop3_imap_daemon']) && $mail_config ['pop3_imap_daemon'] = 'dovecot' && is_executable('doveadm')) {`
`84`		`- $dovecot = true;`
	`84`	`+ exec('doveadm quota 2>&1', $tmp_output, $tmp_retval); // with dovecot 2.2.x 'doveadm quota' is unuseable`
	`85`	`+ if ($retval = 64) $dovecot = true;`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`foreach($mailboxes as $mb) {`