Integrate handle_mailbox_soft_deleted.sh into 500-clean_mailboxes.inc.php

Author: helmo

install/lib/installer_base.lib.php

@@ -3884,10 +3884,6 @@ public function install_crontab() {
 			$root_cron_jobs[] = "0 0 * * * ".$install_dir."/server/scripts/create_daily_nginx_access_logs.sh &> /dev/null";
 		}
 
-		if ($conf['services']['mail'] == 1) {
-			$root_cron_jobs[] = "30 23 * * * ".$install_dir."/server/scripts/handle_mailbox_soft_deleted.sh &> /dev/null";
-		}
-
 		foreach($root_cron_jobs as $cron_job) {
 			if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
 				$existing_root_cron_jobs[] = $cron_job."\n";

install/tpl/server.ini.master

@@ -56,7 +56,7 @@ relayhost_user=
 relayhost_password=
 mailbox_size_limit=0
 message_size_limit=0
-mailbox_soft_delete=n
+mailbox_soft_delete=0
 mailbox_quota_stats=y
 realtime_blackhole_list=zen.spamhaus.org
 overquota_notify_threshold=90

interface/web/admin/form/server_config.tform.php

@@ -736,9 +736,17 @@
 		),
 		'mailbox_soft_delete' => array (
 			'datatype' => 'VARCHAR',
-			'formtype' => 'CHECKBOX',
+			'formtype' => 'SELECT',
 			'default' => 'n',
-			'value' => array(0 => 'n', 1 => 'y')
+			'value' => array(
+				0 => 'soft_delete_directly_txt',
+				-1 => 'soft_delete_keep_indefinately_txt',
+				1 => 'soft_delete_keep_1_txt',
+				7 => 'soft_delete_keep_7_txt',
+				30 => 'soft_delete_keep_30_txt',
+				90 => 'soft_delete_keep_90_txt',
+				365 => 'soft_delete_keep_365_txt',
+			)
 		),
 		'mailbox_quota_stats' => array (
 			'datatype' => 'VARCHAR',

interface/web/admin/templates/server_config_mail_edit.htm

@@ -143,7 +143,9 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mailbox_soft_delete_txt'}</label>
                 <div class="col-sm-9">
-                    {tmpl_var name='mailbox_soft_delete'}&nbsp;{tmpl_var name='mailbox_soft_delete_info_txt'}
+                    <select name="mailbox_soft_delete" id="mailbox_soft_delete" class="form-control">
+                        {tmpl_var name='mailbox_soft_delete'}
+                    </select></a>
                 </div>
             </div>
             <div class="form-group">

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

@@ -53,15 +53,29 @@ public function onBeforeRun() {
 	public function onRunJob() {
 		global $app, $conf;
 
-		$trash_names=array('Trash', 'Papierkorb', 'Deleted Items', 'Deleted Messages', 'Corbeille');
-		$junk_names=array('Junk', 'Junk Email', 'SPAM');
+		$this->purge_junk_thrash();
+		$this->purge_soft_deleted_maildir();
+
+		parent::onRunJob();
+	}
+
+	private function purge_junk_thrash() {
+		global $app, $conf;
+
+		$trash_names = array('Trash', 'Papierkorb', 'Deleted Items', 'Deleted Messages', 'Corbeille');
+		$junk_names = array('Junk', 'Junk Email', 'SPAM');
 
 		$expunge_cmd = 'doveadm expunge -u ? mailbox ? sentbefore ';
 		$purge_cmd = 'doveadm purge -u ?';
 		$recalc_cmd = 'doveadm quota recalc -u ?';
 
 		$server_id = intval($conf['server_id']);
-		$records = $app->db->queryAllRecords("SELECT email, maildir, purge_trash_days, purge_junk_days, imap_prefix FROM mail_user WHERE maildir_format = 'maildir' AND disableimap = 'n' AND server_id = ? AND (purge_trash_days > 0 OR purge_junk_days > 0)", $server_id);
+		$records = $app->db->queryAllRecords("
+						SELECT email, maildir, purge_trash_days, purge_junk_days, imap_prefix
+						FROM mail_user
+						WHERE maildir_format = 'maildir' AND disableimap = 'n' AND server_id = ?
+							AND (purge_trash_days > 0 OR purge_junk_days > 0)",
+						$server_id);
 
 		if(is_array($records) && !empty($records)) {
 			foreach($records as $email) {
@@ -93,8 +107,34 @@ public function onRunJob() {
 				$app->system->exec_safe($recalc_cmd, $email['email']);
 			}
 		}
+	}
 
-		parent::onRunJob();
+	// Purge soft deleted mailboxes.
+	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]");
+
+			if (!empty($matched_dirs)) {
+				$delay_days = $mail_config['mailbox_soft_delete'];
+				foreach($matched_dirs as $dir) {
+					if (is_dir($dir)) {
+						$mtime = filemtime($dir);
+						echo "$mtime < " . strtotime("-$delay_days days") ;
+						if ($mtime < strtotime("-$delay_days days")) {
+							// do remove
+							$app->system->exec_safe('rm -rf ?', $dir);
+						}
+					}
+				}
+			}
+		}
 	}
 
 	/* this function is optional if it contains no custom code */