From 1fc18284abbd319968a187136c93249fe46db2f2 Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 25 Mar 2020 21:14:43 +0100 Subject: [PATCH] [Dovecot] Revert fd49958a00cb8c98f2e81a95c4d0d46aa04ae450 --- data/Dockerfiles/dovecot/quarantine_notify.py | 5 +---- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/data/Dockerfiles/dovecot/quarantine_notify.py b/data/Dockerfiles/dovecot/quarantine_notify.py index 113bf8c4..a4a67f91 100755 --- a/data/Dockerfiles/dovecot/quarantine_notify.py +++ b/data/Dockerfiles/dovecot/quarantine_notify.py @@ -97,10 +97,7 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl): print('%s' % (ex)) time.sleep(3) -records = query_mysql('SELECT IFNULL(user_acl.quarantine, 0) AS quarantine_acl, count(id) AS counter, rcpt, sender FROM quarantine LEFT OUTER JOIN user_acl ON user_acl.username = rcpt WHERE notified = 0 AND rcpt in (SELECT username FROM mailbox) -# dont send notifications for blacklisted senders -AND (SELECT prefid FROM filterconf WHERE option = "blacklist_from" AND (object = rcpt OR object = SUBSTRING(rcpt, LOCATE("@", rcpt) + 1)) AND sender REGEXP(REPLACE(value, '*', '.+'))) IS NULL -GROUP BY rcpt') +records = query_mysql('SELECT IFNULL(user_acl.quarantine, 0) AS quarantine_acl, count(id) AS counter, rcpt FROM quarantine LEFT OUTER JOIN user_acl ON user_acl.username = rcpt WHERE notified = 0 AND rcpt in (SELECT username FROM mailbox) GROUP BY rcpt') for record in records: attrs = '' diff --git a/docker-compose.yml b/docker-compose.yml index d02be107..20f34a8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -188,7 +188,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.116 + image: mailcow/dovecot:1.117 depends_on: - mysql-mailcow dns: