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 branch '1.4.x'

Browse Source
This commit is contained in:
Antoine Nguyen
2016-02-22 14:03:22 +01:00
parent 89f499b164 0a62b0f9a4
commit 7e715c131d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/postfix_maps.py
+3 -3
View File
@@ -117,21 +117,21 @@ class SenderLoginAliasMap(object):
filename = "sql-sender-login-aliases.cf"
mysql = (
"SELECT concat(mb.address, '@', dom.name) FROM admin_mailbox mb "
"INNER JOIN admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id"
"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'"
)
postgres = (
"SELECT mb.address || '@' || dom.name FROM admin_mailbox mb "
"INNER JOIN admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id"
"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'"
)
sqlite = (
"SELECT mb.address || '@' || dom.name FROM admin_mailbox mb "
"INNER JOIN admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id"
"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'"