From baa7f2736bc91ca3feaed685e8a67a46db4fbb98 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 17 Feb 2014 05:02:38 -0500
Subject: [PATCH] Fixed vhostsubdomain not empty regex check to allow 1 char subdomains.
---
server/plugins-available/maildrop_plugin.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php
index 73bace8..37b0306 100644
--- a/server/plugins-available/maildrop_plugin.inc.php
+++ b/server/plugins-available/maildrop_plugin.inc.php
@@ -192,7 +192,11 @@
$mailfilter_content = '';
if($data["new"]["cc"] != '') {
- $mailfilter_content .= "cc \"!".$data["new"]["cc"]."\"\n";
+ $tmp_mails_arr = explode(',',$data["new"]["cc"]);
+ foreach($tmp_mails_arr as $address) {
+ if(trim($address) != '') $mailfilter_content .= "cc \"!".trim($address)."\"\n";
+ }
+ //$mailfilter_content .= "cc \"!".$data["new"]["cc"]."\"\n";
$app->log("Added CC address ".$data["new"]["cc"].' to mailfilter file.', LOGLEVEL_DEBUG);
}
--
Gitblit v1.9.1