Skip to content

Commit d092bac

Browse files
author
Till Brehm
committed
Handle value conversion for mailbox_soft_delete in PHP code
1 parent ff3b2c1 commit d092bac

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ private function purge_soft_deleted_maildir() {
115115
global $app, $conf;
116116
$mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail');
117117

118+
// Convert olf values in mailbox_soft_delete field
119+
if(isset($mail_config['mailbox_soft_delete']) && $mail_config['mailbox_soft_delete'] == 'n') $mail_config['mailbox_soft_delete'] = 0;
120+
if(isset($mail_config['mailbox_soft_delete']) && $mail_config['mailbox_soft_delete'] == 'y') $mail_config['mailbox_soft_delete'] = 7;
121+
$mail_config['mailbox_soft_delete'] = intval($mail_config['mailbox_soft_delete']);
122+
123+
118124
if ($mail_config['mailbox_soft_delete'] > 0) {
119125
$matched_dirs = glob($mail_config['homedir_path'] . "/*/[a-z0-9.-]*-deleted-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]");
120126

0 commit comments

Comments
 (0)