Skip to content

Commit aab989f

Browse files
author
Till Brehm
committed
Merge branch 'email_forward_only_with_auth' into 'stable-3.1'
email account forward See merge request ispconfig/ispconfig3!1009
2 parents 94be0a2 + ca9fab3 commit aab989f

File tree

71 files changed

+274
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+274
-133
lines changed

‎install/tpl/mysql-virtual_client.cf.master‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
table = mail_access
5-
select_field = access
6-
where_field = source
7-
additional_conditions = and type = 'client' and active = 'y'
8-
hosts = {mysql_server_ip}
4+
hosts = {mysql_server_ip}
5+
query = select access from mail_access where source = '%s' and type = 'client' and active = 'y'

‎install/tpl/mysql-virtual_domains.cf.master‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
table = mail_domain
5-
select_field = domain
6-
where_field = domain
7-
additional_conditions = and active = 'y' and server_id = {server_id}
8-
hosts = {mysql_server_ip}
4+
hosts = {mysql_server_ip}
5+
query = select domain from mail_domain where domain = '%s' and active = 'y' and server_id = {server_id}

‎install/tpl/mysql-virtual_email2email.cf.master‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
table = mail_user
5-
select_field = email
6-
where_field = email
7-
additional_conditions = and postfix = 'y' and server_id = {server_id}
8-
hosts = {mysql_server_ip}
4+
hosts = {mysql_server_ip}
5+
query = SELECT email FROM mail_user WHERE email = '%s' AND postfix = 'y' AND disabledeliver = 'n' AND server_id = {server_id}
6+
UNION
7+
SELECT cc AS email FROM mail_user WHERE email = '%s' AND postfix = 'y' AND disabledeliver = 'y' AND server_id = {server_id}

‎install/tpl/mysql-virtual_forwardings.cf.master‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,22 @@ user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
44
hosts = {mysql_server_ip}
5-
query = SELECT u.email as target FROM mail_forwarding as s INNER JOIN mail_user as u ON (u.email = CONCAT('%u@', SUBSTRING_INDEX(s.destination,'@',-1))) WHERE s.source = '@%d' AND s.type = 'aliasdomain' AND s.active = 'y' AND u.disabledeliver = 'n' AND s.server_id = {server_id} UNION SELECT s.destination as target FROM mail_forwarding as s WHERE s.source = '%s' AND s.type IN ('alias', 'forward') and s.active = 'y' AND s.server_id = {server_id} UNION SELECT s.destination as target FROM mail_forwarding as s INNER JOIN mail_forwarding as f ON (f.source = CONCAT('%u@', SUBSTRING_INDEX(s.destination,'@',-1))) WHERE s.source = '@%d' AND s.type = 'aliasdomain' AND s.active = 'y' AND f.active = 'y' AND s.server_id = {server_id} UNION SELECT s.destination as target FROM mail_forwarding as s WHERE s.source = '@%d' AND s.type IN ('catchall') and s.active = 'y' AND s.server_id = {server_id} UNION SELECT s.destination as target FROM mail_forwarding as s INNER JOIN mail_forwarding as t ON (t.source = s.destination AND t.type = 'catchall') WHERE s.source = '@%d' AND s.type = 'aliasdomain' and s.active = 'y' AND t.active = 'y' AND s.server_id = {server_id}
5+
query = SELECT u.email as target FROM mail_forwarding as s
6+
INNER JOIN mail_user as u ON (u.email = CONCAT('%u@', SUBSTRING_INDEX(s.destination,'@',-1)))
7+
WHERE s.source = '@%d' AND s.type = 'aliasdomain' AND s.active = 'y' AND u.disabledeliver = 'n' AND s.server_id = {server_id}
8+
UNION
9+
SELECT s.destination as target FROM mail_forwarding as s
10+
WHERE s.source = '%s' AND s.type IN ('alias', 'forward') and s.active = 'y' AND s.server_id = {server_id}
11+
UNION
12+
SELECT s.destination as target FROM mail_forwarding as s
13+
INNER JOIN mail_forwarding as f ON (f.source = CONCAT('%u@', SUBSTRING_INDEX(s.destination,'@',-1)))
14+
WHERE s.source = '@%d' AND s.type = 'aliasdomain' AND s.active = 'y' AND f.active = 'y' AND s.server_id = {server_id}
15+
UNION
16+
SELECT s.destination as target FROM mail_forwarding as s
17+
LEFT JOIN mail_user as uu ON (uu.email = '%s' AND uu.disabledeliver = 'n')
18+
LEFT JOIN mail_forwarding as uf ON (uf.source = '%s' AND uf.type IN ('alias', 'forward') AND uf.active = 'y')
19+
WHERE s.source = '@%d' AND s.type IN ('catchall') and s.active = 'y' AND uu.mailuser_id IS NULL AND uf.forwarding_id IS NULL AND s.server_id = {server_id}
20+
UNION
21+
SELECT s.destination as target FROM mail_forwarding as s
22+
INNER JOIN mail_forwarding as t ON (t.source = s.destination AND t.type = 'catchall')
23+
WHERE s.source = '@%d' AND s.type = 'aliasdomain' and s.active = 'y' AND t.active = 'y' AND s.server_id = {server_id}

‎install/tpl/mysql-virtual_gids.cf.master‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
table = mail_user
5-
select_field = gid
6-
where_field = email
7-
additional_conditions = and postfix = 'y' and server_id = {server_id}
8-
hosts = {mysql_server_ip}
4+
hosts = {mysql_server_ip}
5+
query = select gid from mail_user where email = '%s' and postfix = 'y' and server_id = {server_id}

‎install/tpl/mysql-virtual_mailboxes.cf.master‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
table = mail_user
5-
select_field = CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/')
6-
where_field = login
7-
additional_conditions = and postfix = 'y' and server_id = {server_id}
84
hosts = {mysql_server_ip}
5+
query = select CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/') from mail_user where login = '%s' and postfix = 'y' and server_id = {server_id}

‎install/tpl/mysql-virtual_outgoing_bcc.cf‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎install/tpl/mysql-virtual_outgoing_bcc.cf.master‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
table = mail_user
5-
select_field = sender_cc
6-
where_field = email
7-
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n' and sender_cc != ''
8-
hosts = {mysql_server_ip}
4+
hosts = {mysql_server_ip}
5+
query = SELECT sender_cc FROM (
6+
SELECT SUBSTRING_INDEX(sender_cc, ',', 1) AS sender_cc
7+
FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND sender_cc != '' AND server_id = {server_id}
8+
UNION
9+
SELECT SUBSTRING_INDEX(u.sender_cc, ',', 1) AS sender_cc
10+
FROM mail_user u, mail_forwarding f
11+
WHERE f.destination REGEXP CONCAT( '((^|\\n)[[:blank:]]*,?|[[:alnum:]][[:blank:]]*,)[[:blank:]]*',
12+
REPLACE( REPLACE(u.email, '+', '\\+'), '.', '\\.' ),
13+
'[[:blank:]]*(,[[:blank:]]*[[:alnum:]]|,?[[:blank:]]*(\\r?\\n|$))' )
14+
AND u.disablesmtp = 'n' AND u.sender_cc != '' AND u.server_id = {server_id}
15+
AND f.source = '%s' AND f.allow_send_as = 'y' AND f.active = 'y' AND f.server_id = {server_id}
16+
) table1 WHERE sender_cc != '' LIMIT 1

‎install/tpl/mysql-virtual_policy_greylist.cf.master‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4+
hosts = {mysql_server_ip}
45
query = SELECT 'greylisting' FROM
5-
(SELECT `greylisting`, 1 as `prio` FROM `mail_user` WHERE `server_id` = {server_id} AND `email` = '%s'
6-
UNION SELECT `greylisting`, 2 as `prio` FROM `mail_forwarding` WHERE `server_id` = {server_id} AND `source` = '%s'
7-
UNION SELECT `greylisting`, 3 as `prio` FROM `mail_forwarding` WHERE `server_id` = {server_id} AND `source` = '@%d' ORDER BY `prio` ASC LIMIT 1) as rules
6+
(
7+
SELECT `greylisting`, 1 as `prio` FROM `mail_user` WHERE `server_id` = {server_id} AND `email` = '%s'
8+
UNION
9+
SELECT `greylisting`, 2 as `prio` FROM `mail_forwarding` WHERE `server_id` = {server_id} AND `source` = '%s'
10+
UNION
11+
SELECT `greylisting`, 3 as `prio` FROM `mail_forwarding` WHERE `server_id` = {server_id} AND `source` = '@%d' ORDER BY `prio` ASC LIMIT 1
12+
) AS rules
813
WHERE rules.greylisting = 'y'
9-
10-
hosts = {mysql_server_ip}

‎install/tpl/mysql-virtual_recipient.cf.master‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
table = mail_access
5-
select_field = access
6-
where_field = source
7-
additional_conditions = and type = 'recipient' and active = 'y' and server_id = {server_id}
8-
hosts = {mysql_server_ip}
4+
hosts = {mysql_server_ip}
5+
query = select access from mail_access where source = '%s' and type = 'recipient' and active = 'y' and server_id = {server_id}

0 commit comments

Comments
 (0)