From 718a7b29da0a49d9ee82b07c5e76620fd79cf39c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 23 Jan 2022 22:17:19 +0100
Subject: [PATCH] s/safe_delete/soft_delete/
---
install/tpl/server.ini.master | 2 +-
interface/web/admin/form/server_config.tform.php | 2 +-
interface/web/admin/lib/lang/en_server_config.lng | 2 +-
interface/web/admin/templates/server_config_mail_edit.htm | 4 ++--
server/plugins-available/mail_plugin.inc.php | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 37054010d4..7fc1783f67 100644
--- a/install/tpl/server.ini.master
+++ b/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
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index ae3f84faa8..91ae7c8716 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/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',
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index c6dfdf65ab..f80c9f178c 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/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';
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index c9679fb448..110cd5c651 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/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">
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index bf6f958f85..70e477dea5 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/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);
--
GitLab