handle doveadm quota output from different versions

jnorell · jnorell · commit a4ae330f8720 · 2020-07-02T17:45:33.000-06:00
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
@@ -85,7 +85,11 @@ public function onRunJob() {
 				if ($retval = 64) {
 					foreach ($res as $v) {
 						$s = preg_split('/\s+/', $v);
-						if ($s[2] == 'STORAGE') $dovecotQuotaUsage[$s[0]] = $s[3] * 1024; // doveadm output is in kB
+						if ($s[2] == 'STORAGE') {
+							$dovecotQuotaUsage[$s[0]] = $s[3] * 1024; // doveadm output is in kB
+						} elseif ($s[3] == 'STORAGE') {
+							$dovecotQuotaUsage[$s[0]] = $s[4] * 1024; // doveadm output is in kB
+						}
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,11 @@ public function onRunJob() {`
`85`	`85`	`if ($retval = 64) {`
`86`	`86`	`foreach ($res as $v) {`
`87`	`87`	`$s = preg_split('/\s+/', $v);`
`88`		`- if ($s[2] == 'STORAGE') $dovecotQuotaUsage[$s[0]] = $s[3] * 1024; // doveadm output is in kB`
	`88`	`+ if ($s[2] == 'STORAGE') {`
	`89`	`+ $dovecotQuotaUsage[$s[0]] = $s[3] * 1024; // doveadm output is in kB`
	`90`	`+ } elseif ($s[3] == 'STORAGE') {`
	`91`	`+ $dovecotQuotaUsage[$s[0]] = $s[4] * 1024; // doveadm output is in kB`
	`92`	`+ }`
`89`	`93`	`}`
`90`	`94`	`}`
`91`	`95`	`}`