Browse Source

[Dovecot] Revert notification excludes (there are no blacklisted elements in quarantine anymore)

andryyy 4 years ago
parent
commit
efc6f214d1
1 changed files with 1 additions and 7 deletions
  1. 1 7
      data/Dockerfiles/dovecot/quarantine_notify.py

+ 1 - 7
data/Dockerfiles/dovecot/quarantine_notify.py

@@ -108,13 +108,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 = ''