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

Fix SQL queries.

Browse Source 
fix #922
This commit is contained in:
Antoine Nguyen
2016-09-19 11:11:01 +02:00
parent 4b016e679c
commit 64ba41b72a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/getting_started/upgrade.rst
+2 -2
View File
@@ -68,8 +68,8 @@ following line to your crontab::
0 * * * * <modoboa_site>/manage.py communicate_with_public_api
Please also note that public API now uses TLS so you must update
your configuration as follows::
Please also note that public API now uses TLS so you must update your
configuration as follows::
MODOBOA_API_URL = 'https://api.modoboa.org/1/'
modoboa/admin/postfix_maps.py
+6 -3
View File
@@ -52,17 +52,20 @@ class AliasesMap(object):
mysql = (
"SELECT alr.address FROM modoboa_admin_aliasrecipient AS alr "
"INNER JOIN admin_alias AS al ON alr.alias_id=al.id "
"WHERE al.enabled=1 AND al.address='%s' AND al.expire_at>now()"
"WHERE al.enabled=1 AND al.address='%s' AND "
"(al.expire_at IS NULL OR al.expire_at>now())"
)
postgres = (
"SELECT alr.address FROM modoboa_admin_aliasrecipient AS alr "
"INNER JOIN admin_alias AS al ON alr.alias_id=al.id "
"WHERE al.enabled AND al.address='%s' AND al.expire_at>now()"
"WHERE al.enabled AND al.address='%s' AND "
"(al.expire_at IS NULL OR al.expire_at>now())"
)
sqlite = (
"SELECT alr.address FROM modoboa_admin_aliasrecipient AS alr "
"INNER JOIN admin_alias AS al ON alr.alias_id=al.id "
"WHERE al.enabled=1 AND al.address='%s' AND al.expire_at>now()"
"WHERE al.enabled=1 AND al.address='%s' AND "
"(al.expire_at IS NULL OR al.expire_at>now())"
)