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

Merge pull request #1795 from tsabi/master-domain-sender

Browse Source 
New functionality: account can send email from a domain with any address
This commit is contained in:
Antoine Nguyen
2020-03-09 15:43:56 +01:00
committed by GitHub
parent baa5fb4e4a 7eb1bd57c3
commit 9b27cf53d1
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -16,3 +16,5 @@ modoboa_test
.coverage
build/
dist/
/.project
/.pydevproject
modoboa/admin/postfix_maps.py
+18 -3
View File
@@ -119,7 +119,12 @@ class SenderLoginMap(object):
"WHERE al.enabled=1 AND ("
" al.address='%s' OR ("
" adoma.name='%d' AND al.address=concat('%u', '@', adom.name)"
")))"
"))) "
"UNION "
"(SELECT concat(mb.address, '@', dom.name) FROM admin_mailbox mb "
"INNER JOIN admin_senderaddress sad ON sad.mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"WHERE sad.address=concat('@','%d')) "
)
postgres = (
"(SELECT email FROM core_user WHERE email='%s' AND is_active) "
@@ -138,7 +143,12 @@ class SenderLoginMap(object):
"WHERE al.enabled AND ("
" al.address='%s' OR ("
" adoma.name='%d' AND al.address='%u'||'@'||adom.name"
")))"
"))) "
"UNION "
"(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb "
"INNER JOIN admin_senderaddress sad ON sad.mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"WHERE sad.address='@'||'%d') "
)
sqlite = (
"SELECT email FROM core_user WHERE email='%s' AND is_active=1 "
@@ -157,5 +167,10 @@ class SenderLoginMap(object):
"WHERE al.enabled=1 AND ("
" al.address='%s' OR ("
" adoma.name='%d' AND al.address='%u'||'@'||adom.name"
"))"
")) "
"UNION "
"(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb "
"INNER JOIN admin_senderaddress sad ON sad.mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"WHERE sad.address='@'||'%d') "
)