From 8e8e97e08d0162bd894a56d0099a343a19d7db3b Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 22 Apr 2022 23:21:37 +0200
Subject: [PATCH] Make the thrash filename extra obvious, also for a
mail_domain
---
server/plugins-available/mail_plugin.inc.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index 5850e527e4..53836a1392 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -486,7 +486,7 @@ class mail_plugin {
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_soft_delete'] == 'y') {
// Move it, adding a date based suffix. A cronjob should purge or archive.
- $thrash_maildomain_path = $old_maildomain_path . '-' . date("YmdHis");
+ $thrash_maildomain_path = $old_maildomain_path . '-deleted-' . date("YmdHis");
$app->system->exec_safe('mv ? ?', $old_maildomain_path, $thrash_maildomain_path);
// Update the dir's timestamp to make filtering on age easier in any cleanup cronjob.
--
GitLab