From 1fbc12ec1e44cd322fc1efa2536e820a56875200 Mon Sep 17 00:00:00 2001 From: Alexander Schlarb Date: Sun, 9 Dec 2018 20:47:21 +0000 Subject: [PATCH] Code style checkers suck :slightly_frowning_face: --- modoboa/admin/postfix_maps.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modoboa/admin/postfix_maps.py b/modoboa/admin/postfix_maps.py index 328d734cd..14aca3026 100644 --- a/modoboa/admin/postfix_maps.py +++ b/modoboa/admin/postfix_maps.py @@ -120,7 +120,10 @@ class SenderLoginMap(object): " INNER JOIN admin_domain dom ON dom.id=mb.domain_id" " INNER JOIN admin_domainalias adom ON adom.target_id=dom.id" " INNER JOIN admin_alias al ON alr.alias_id=al.id " - "WHERE al.enabled=1 AND (al.address='%s' OR (adom.name='@d' AND al.address='%u'||'@'||dom.name)))" + "WHERE al.enabled=1 AND (" + " al.address='%s' OR (" + " adom.name='@d' AND al.address='%u'||'@'||dom.name" + ")))" ) postgres = ( "(SELECT email FROM core_user WHERE email='%s' AND is_active) " @@ -135,7 +138,10 @@ class SenderLoginMap(object): " INNER JOIN admin_domain dom ON dom.id=mb.domain_id" " INNER JOIN admin_domainalias adom ON adom.target_id=dom.id" " INNER JOIN admin_alias al ON alr.alias_id=al.id " - "WHERE al.enabled AND (al.address='%s' OR (adom.name='@d' AND al.address='%u'||'@'||dom.name)))" + "WHERE al.enabled AND (" + " al.address='%s' OR (" + " adom.name='@d' AND al.address='%u'||'@'||dom.name" + ")))" ) sqlite = ( "SELECT email FROM core_user WHERE email='%s' AND is_active=1 " @@ -150,5 +156,8 @@ class SenderLoginMap(object): "INNER JOIN admin_domain dom ON dom.id=mb.domain_id " "INNER JOIN admin_domainalias adom ON adom.target_id=dom.id " "INNER JOIN admin_alias al ON alr.alias_id=al.id " - "WHERE al.enabled=1 AND (al.address='%s' OR (adom.name='@d' AND al.address='%u'||'@'||dom.name))" + "WHERE al.enabled=1 AND (" + " al.address='%s' OR (" + " adom.name='@d' AND al.address='%u'||'@'||dom.name" + "))" )