From d986e26be80535ce98fdaee7ae577a981b353cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tadas=20Ustinavi=C4=8Dius?= Date: Fri, 23 Feb 2018 09:09:01 +0200 Subject: [PATCH] Making virtualmaidel.php remove Sieve filters if they exist --- ADDITIONS/virtualmaildel.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ADDITIONS/virtualmaildel.php b/ADDITIONS/virtualmaildel.php index 66954067..0d6cceea 100644 --- a/ADDITIONS/virtualmaildel.php +++ b/ADDITIONS/virtualmaildel.php @@ -9,6 +9,7 @@ Changes: 2017.08.31 updated to use PHP mysqli extension. + 2018.02.23 removing Sieve filters if exists. Tadas Ustinavičius ( https://github.com/postfixadmin/postfixadmin/pull/70 ) */ @@ -165,10 +166,20 @@ if (is_array($dir)) { foreach ($value as $user => $value2) { // Nuke.. need any more explanations? $path = $homedir . '/' . $key . '/' . $user; + $sieve_path = $homedir . '/.sieve/' . $key . '/' . $user; + $sieve_exists = false; + // check if user has Sieve filters created + if (file_exists($sieve_path)) { + $sieve_exists = true; + } if ($MAKE_CHANGES) { deldir($path); + deldir($sieve_path); } else { echo " - Would recursively delete : $path \n"; + if ($sieve_exists) { + echo " - Would recursively delete Sieve filters : $sieve_path \n"; + } } } }