7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Postfix] BCC destination must be single email address, fixes #993

Browse Source
This commit is contained in:
andre.peters
2018-02-03 07:47:52 +01:00
parent cf1e46723a
commit 9069a6f358
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data/web/inc/functions.address_rewriting.inc.php
View File

@@ -15,7 +15,7 @@ function bcc($_action, $_data = null, $attr = null) {
return false; return false;
} }
$local_dest = strtolower(trim($_data['local_dest'])); $local_dest = strtolower(trim($_data['local_dest']));
$bcc_dest = array_map('trim', preg_split( "/( |,|;|\n)/", $_data['bcc_dest'])); $bcc_dest = $_data['bcc_dest'];
$active = intval($_data['active']); $active = intval($_data['active']);
$type = $_data['type']; $type = $_data['type'];
if ($type != 'sender' && $type != 'rcpt') { if ($type != 'sender' && $type != 'rcpt') {
@@ -60,18 +60,10 @@ function bcc($_action, $_data = null, $attr = null) {
else { else {
return false; return false;
} }
foreach ($bcc_dest as &$bcc_dest_e) { if (!filter_var($bcc_dest, FILTER_VALIDATE_EMAIL)) {
if (!filter_var($bcc_dest_e, FILTER_VALIDATE_EMAIL)) {
$bcc_dest_e = null;;
}
$bcc_dest_e = strtolower($bcc_dest_e);
}
$bcc_dest = array_filter($bcc_dest);
$bcc_dest = implode(",", $bcc_dest);
if (empty($bcc_dest)) {
$_SESSION['return'] = array( $_SESSION['return'] = array(
'type' => 'danger', 'type' => 'danger',
'msg' => 'BCC map destination cannot be empty' 'msg' => 'BCC map must be a valid email address'
); );
return false; return false;
} }
@@ -142,16 +134,14 @@ function bcc($_action, $_data = null, $attr = null) {
); );
return false; return false;
} }
$bcc_dest = array_map('trim', preg_split( "/( |,|;|\n)/", $bcc_dest));
$active = intval($_data['active']); $active = intval($_data['active']);
foreach ($bcc_dest as &$bcc_dest_e) { if (!filter_var($bcc_dest, FILTER_VALIDATE_EMAIL)) {
if (!filter_var($bcc_dest_e, FILTER_VALIDATE_EMAIL)) { $_SESSION['return'] = array(
$bcc_dest_e = null;; 'type' => 'danger',
} 'msg' => 'BCC map must be a valid email address'
$bcc_dest_e = strtolower($bcc_dest_e); );
return false;
} }
$bcc_dest = array_filter($bcc_dest);
$bcc_dest = implode(",", $bcc_dest);
if (empty($bcc_dest)) { if (empty($bcc_dest)) {
$_SESSION['return'] = array( $_SESSION['return'] = array(
'type' => 'danger', 'type' => 'danger',