Actively update the mailbox_soft_delete config option

Author: helmo

install/sql/incremental/upd_dev_collection.sql

@@ -5,4 +5,8 @@ ALTER TABLE `mail_user` ADD COLUMN `imap_prefix` varchar(255) NULL default NULL
 UPDATE `dns_ssl_ca` SET `ca_issue` = 'sectigo.com' WHERE `ca_issue` = 'comodo.com';
 UPDATE `dns_ssl_ca` SET `ca_issue` = 'sectigo.com' WHERE `ca_issue` = 'comodoca.com';
 UPDATE `dns_ssl_ca` SET `ca_name` = 'Sectigo (formerly Comodo CA)' WHERE `ca_issue` = 'sectigo.com';
--- not updating the dns_rr table to change all CAA records that have comodo.com / comodoca.com - we should not touch users records imo - TP
+-- not updating the dns_rr table to change all CAA records that have comodo.com / comodoca.com - we should not touch users records imo - TP
+
+-- #6445 Update the mailbox_soft_delete config option to it's new structure.
+UPDATE server SET config=REGEXP_REPLACE(config, 'mailbox_soft_delete=n', 'mailbox_soft_delete=0') WHERE config LIKE '%mailbox_soft_delete=n%'
+UPDATE server SET config=REGEXP_REPLACE(config, 'mailbox_soft_delete=y', 'mailbox_soft_delete=7') WHERE config LIKE '%mailbox_soft_delete=y%'

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

@@ -115,10 +115,6 @@ private function purge_soft_deleted_maildir() {
 		global $app, $conf;
 		$mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail');
 
-		if ($mail_config['mailbox_soft_delete'] == 'y') {
-			// Backward compatibility for dev installs between 3.2.9 and 3.2.10.
-			$mail_config['mailbox_soft_delete'] = 7;
-		}
 		if ($mail_config['mailbox_soft_delete'] > 0) {
 			$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]");