From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 10 May 2012 12:31:27 -0400 Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch. --- server/plugins-available/maildrop_plugin.inc.php | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php index 74437fa..085a992 100644 --- a/server/plugins-available/maildrop_plugin.inc.php +++ b/server/plugins-available/maildrop_plugin.inc.php @@ -211,10 +211,14 @@ unset($config_file_path); } else { // Delete the mailfilter recipe - $email_parts = explode("@",$data["old"]["email"]); - $file = $this->mailfilter_config_dir.'/'.$email_parts[1].'/'.$email_parts[0].'/.mailfilter'; - if(is_file($file)) unlink($file) or $app->log("Unable to delete file: $file",LOGLEVEL_WARN); - $app->log("Deleting custom Mailfiter".$file,LOGLEVEL_DEBUG); + if(isset($data["old"]["email"])) { + $email_parts = explode("@",$data["old"]["email"]); + $file = $this->mailfilter_config_dir.'/'.$email_parts[1].'/'.$email_parts[0].'/.mailfilter'; + if(is_file($file)) { + unlink($file) or $app->log("Unable to delete file: $file",LOGLEVEL_WARN); + $app->log("Deleting custom Mailfiter".$file,LOGLEVEL_DEBUG); + } + } } } } -- Gitblit v1.9.1