diff --git a/install/tpl/mysql-virtual_outgoing_bcc.cf.master b/install/tpl/mysql-virtual_outgoing_bcc.cf.master index 1501154e161d63a26d27a265c557e396ae18b92f..3ae466d0aa3a815f2481290236768f1a4e0937f3 100644 --- a/install/tpl/mysql-virtual_outgoing_bcc.cf.master +++ b/install/tpl/mysql-virtual_outgoing_bcc.cf.master @@ -5,7 +5,10 @@ hosts = {mysql_server_ip} query = SELECT sender_cc FROM ( SELECT SUBSTRING_INDEX(sender_cc, ',', 1) AS sender_cc FROM mail_user - WHERE email = '%s' AND disablesmtp = 'n' AND sender_cc != '' AND server_id = {server_id} + WHERE (email = '%s' + OR email = regexp_replace('%s', '^srs0=.+?=..=(.+)=(.+)@.*$', '\\2@\\1') + OR email = regexp_replace('%s', '^srs0=.+?=..=(.+)=(.+)@.*$', '@\\1') + ) AND disablesmtp = 'n' AND sender_cc != '' AND server_id = {server_id} AND EXISTS (SELECT domain_id FROM mail_domain WHERE domain = SUBSTRING_INDEX('%s', '@', -1) AND active = 'y' AND server_id = {server_id}) UNION SELECT SUBSTRING_INDEX(u.sender_cc, ',', 1) AS sender_cc