Skip to content
Snippets Groups Projects
Unverified Commit ff445dc5 authored by Helmo's avatar Helmo
Browse files

logic fix

parent 13edba6b
No related branches found
No related tags found
1 merge request!1454Safe delete for mailboxes
...@@ -480,7 +480,7 @@ class mail_plugin { ...@@ -480,7 +480,7 @@ class mail_plugin {
//* Delete maildomain path //* Delete maildomain path
$old_maildomain_path = $mail_config['homedir_path'].'/'.$data['old']['domain']; $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($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'] == 'n') { if ($mail_config['mailbox_safe_delete'] == 'y') {
// Move it, adding a date based suffix. A cronjob should purge or archive. // 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 . '-' . date("YmdHis");
$app->system->exec_safe('mv ? ?', $old_maildomain_path, $thrash_maildomain_path); $app->system->exec_safe('mv ? ?', $old_maildomain_path, $thrash_maildomain_path);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment