github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1631 from alexander255/patch-1

Browse Source 
Allow users to send emails from alias domains
This commit is contained in:
Antoine Nguyen
2019-01-31 19:08:02 +01:00
committed by GitHub
parent 511a9c3124 e676261ec0
commit d1a5253e1f
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/postfix_maps.py
+24 -9
View File
@@ -116,10 +116,15 @@ class SenderLoginMap(object):
"WHERE sad.address='%s') "
"UNION "
"(SELECT concat(mb.address, '@', dom.name) FROM admin_mailbox mb "
"INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id"
" INNER JOIN admin_domain dom ON dom.id=mb.domain_id"
" INNER JOIN admin_alias al ON alr.alias_id=al.id "
"WHERE al.enabled=1 AND al.address='%s')"
"INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"INNER JOIN admin_alias al ON alr.alias_id=al.id "
"LEFT JOIN admin_domainalias adoma ON adoma.target_id=al.domain_id "
"LEFT JOIN admin_domain adom ON adom.id=adoma.target_id "
"WHERE al.enabled=1 AND ("
" al.address='%s' OR ("
" adoma.name='%d' AND al.address=concat('%u', '@', adom.name)"
")))"
)
postgres = (
"(SELECT email FROM core_user WHERE email='%s' AND is_active) "
@@ -130,10 +135,15 @@ class SenderLoginMap(object):
"WHERE sad.address='%s') "
"UNION "
"(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb "
"INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id"
" INNER JOIN admin_domain dom ON dom.id=mb.domain_id"
" INNER JOIN admin_alias al ON alr.alias_id=al.id "
"WHERE al.enabled AND al.address='%s')"
"INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"INNER JOIN admin_alias al ON alr.alias_id=al.id "
"LEFT JOIN admin_domainalias adoma ON adoma.target_id=al.domain_id "
"LEFT JOIN admin_domain adom ON adom.id=adoma.target_id "
"WHERE al.enabled AND ("
" al.address='%s' OR ("
" adoma.name='%d' AND al.address='%u'||'@'||adom.name"
")))"
)
sqlite = (
"SELECT email FROM core_user WHERE email='%s' AND is_active=1 "
@@ -147,5 +157,10 @@ class SenderLoginMap(object):
"INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"INNER JOIN admin_alias al ON alr.alias_id=al.id "
"WHERE al.enabled=1 AND al.address='%s'"
"LEFT JOIN admin_domainalias adoma ON adoma.target_id=al.domain_id "
"LEFT JOIN admin_domain adom ON adom.id=adoma.target_id "
"WHERE al.enabled=1 AND ("
" al.address='%s' OR ("
" adoma.name='%d' AND al.address='%u'||'@'||adom.name"
"))"
)