s/safe_delete/soft_delete/

install/tpl/server.ini.master

@@ -52,7 +52,7 @@ relayhost_user=
 relayhost_password=
 mailbox_size_limit=0
 message_size_limit=0
-mailbox_safe_delete=n
+mailbox_soft_delete=n
 mailbox_quota_stats=y
 realtime_blackhole_list=zen.spamhaus.org
 overquota_notify_admin=y

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

@@ -685,7 +685,7 @@ $form["tabs"]['mail'] = array(
 			'default' => 'y',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
-		'mailbox_safe_delete' => array (
+		'mailbox_soft_delete' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'y',

interface/web/admin/lib/lang/en_server_config.lng

@@ -332,4 +332,4 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
 $wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
 $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
 $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
-$wb['mailbox_safe_delete_txt'] = 'Mailbox direct delete';
+$wb['mailbox_soft_delete_txt'] = 'Mailbox direct delete';

interface/web/admin/templates/server_config_mail_edit.htm

@@ -121,9 +121,9 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='mailbox_safe_delete_txt'}</label>
+                <label class="col-sm-3 control-label">{tmpl_var name='mailbox_soft_delete_txt'}</label>
                 <div class="col-sm-9">
-                    {tmpl_var name='mailbox_safe_delete'}
+                    {tmpl_var name='mailbox_soft_delete'}
                 </div>
             </div>
             <div class="form-group">

server/plugins-available/mail_plugin.inc.php

@@ -429,7 +429,7 @@ class mail_plugin {
 		$maildir_path_deleted = false;
 		$old_maildir_path = $data['old']['maildir'];
 		if($old_maildir_path != $mail_config['homedir_path'] && strlen($old_maildir_path) > strlen($mail_config['homedir_path']) && !stristr($old_maildir_path, '//') && !stristr($old_maildir_path, '..') && !stristr($old_maildir_path, '*') && strlen($old_maildir_path) >= 10) {
-			if ($mail_config['mailbox_safe_delete'] == 'y') {
+			if ($mail_config['mailbox_soft_delete'] == 'y') {
 				// Move it, adding a date based suffix. A cronjob should purge or archive.
 				$thrash_maildir_path = $old_maildir_path . '-' . date("YmdHis");
 				$app->system->exec_safe('mv ? ?', $old_maildir_path, $thrash_maildir_path);
@@ -480,7 +480,7 @@ class mail_plugin {
 		//* Delete maildomain path
 		$old_maildomain_path = $mail_config['homedir_path'].'/'.$data['old']['domain'];
 		if($old_maildomain_path != $mail_config['homedir_path'] && !stristr($old_maildomain_path, '//') && !stristr($old_maildomain_path, '..') && !stristr($old_maildomain_path, '*') && !stristr($old_maildomain_path, '&') && strlen($old_maildomain_path) >= 10  && !empty($data['old']['domain'])) {
-			if ($mail_config['mailbox_safe_delete'] == 'y') {
+			if ($mail_config['mailbox_soft_delete'] == 'y') {
 				// Move it, adding a date based suffix. A cronjob should purge or archive.
 				$thrash_maildomain_path = $old_maildomain_path . '-' . date("YmdHis");
 				$app->system->exec_safe('mv ? ?', $old_maildomain_path, $thrash_maildomain_path);