Merge branch '6433-safe-delete-warning' into 'develop'

Avoid a warning is the dir does not exist

Closes #6433

See merge request ispconfig/ispconfig3!1677

Author: Till Brehm

server/plugins-available/mail_plugin.inc.php

@@ -429,7 +429,7 @@ function user_delete($event_name, $data) {
 		$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_soft_delete'] == 'y') {
+			if ($mail_config['mailbox_soft_delete'] == 'y' && is_dir($old_maildir_path)) {
 				// Move it, adding a date based suffix. A cronjob should purge or archive.
 				$thrash_maildir_path = $old_maildir_path . '-deleted-' . date("YmdHis");
 				$app->system->exec_safe('mv ? ?', $old_maildir_path, $thrash_maildir_path);
@@ -484,7 +484,7 @@ function domain_delete($event_name, $data) {
 		//* 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_soft_delete'] == 'y') {
+			if ($mail_config['mailbox_soft_delete'] == 'y' && is_dir($old_maildomain_path)) {
 				// Move it, adding a date based suffix. A cronjob should purge or archive.
 				$thrash_maildomain_path = $old_maildomain_path . '-deleted-' . date("YmdHis");
 				$app->system->exec_safe('mv ? ?', $old_maildomain_path, $thrash_maildomain_path);