Skip to content

Commit 036575e

Browse files
committed
respect outgoing bcc for mail aliases/forwards
1 parent 3b8f575 commit 036575e

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

install/tpl/mysql-virtual_outgoing_bcc.cf.master

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,10 @@ user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
44
hosts = {mysql_server_ip}
5-
query = select sender_cc from mail_user where email = '%s' and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n' and sender_cc != ''
5+
query = SELECT sender_cc FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND sender_cc != '' AND server_id = {server_id}
6+
UNION
7+
SELECT u.sender_cc
8+
FROM mail_user u, mail_forwarding f
9+
WHERE f.destination REGEXP CONCAT( '(^|\\n)[[:blank:]]*,?[[:blank:]]*', u.email, '[[:blank:]]*,?[[:blank:]]*(\\r?\\n|$)' )
10+
AND u.disablesmtp = 'n' AND u.sender_cc != '' AND u.server_id = {server_id}
11+
AND f.source = '%s' AND f.active = 'y' AND f.allow_send_as = 'y' AND f.server_id = {server_id}

0 commit comments

Comments
 (0)