Merge branch 'jnorell-develop-patch-59386' into 'develop'

Update 500-clean_mailboxes.inc.php

Closes #5909

See merge request ispconfig/ispconfig3!1367

Author: Marius Burkard

server/lib/classes/cron.d/500-clean_mailboxes.inc.php

@@ -53,10 +53,11 @@ public function onBeforeRun() {
 	public function onRunJob() {
 		global $app, $conf;
 
-		$trash_names=array('Trash', 'Papierkorb', 'Deleted Items', 'Deleted Messages', 'INBOX.Trash', 'INBOX.Papierkorb', 'INBOX.Deleted Messages');
+		$trash_names=array('Trash', 'Papierkorb', 'Deleted Items', 'Deleted Messages', 'INBOX.Trash', 'INBOX.Papierkorb', 'INBOX.Deleted Messages', 'Corbeille');
 		$junk_names=array('Junk', 'Junk Email', 'SPAM', 'INBOX.SPAM');
 
-		$purge_cmd = 'doveadm expunge -u ? mailbox ? sentbefore ';
+		$expunge_cmd = 'doveadm expunge -u ? mailbox ? sentbefore ';
+		$purge_cmd = 'doveadm purge -u ?';
 		$recalc_cmd = 'doveadm quota recalc -u ?';
 
 		$server_id = intval($conf['server_id']);
@@ -67,17 +68,18 @@ public function onRunJob() {
 				if($email['purge_trash_days'] > 0) {
 					foreach($trash_names as $trash) {
 						if(is_dir($email['maildir'].'/Maildir/.'.$trash)) {
-							$app->system->exec_safe($purge_cmd.intval($email['purge_trash_days']).'d', $email['email'], $trash);
+							$app->system->exec_safe($expunge_cmd.intval($email['purge_trash_days']).'d', $email['email'], $trash);
 						}
 					}
 				}
 				if($email['purge_junk_days'] > 0) {
 					foreach($junk_names as $junk) {
 						if(is_dir($email['maildir'].'/Maildir/.'.$junk)) {
-							$app->system->exec_safe($purge_cmd.intval($email['purge_junk_days']).'d', $email['email'], $junk);
+							$app->system->exec_safe($expunge_cmd.intval($email['purge_junk_days']).'d', $email['email'], $junk);
 						}
 					}
 				}
+				$app->system->exec_safe($purge_cmd, $email['email']);
 				$app->system->exec_safe($recalc_cmd, $email['email']);
 			}
 		}