[Dovecot] Revert fd49958a00
				
					
				
			This commit is contained in:
		| @@ -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 = '' | ||||
|   | ||||
| @@ -188,7 +188,7 @@ services: | ||||
|             - sogo | ||||
|  | ||||
|     dovecot-mailcow: | ||||
|       image: mailcow/dovecot:1.116 | ||||
|       image: mailcow/dovecot:1.117 | ||||
|       depends_on: | ||||
|         - mysql-mailcow | ||||
|       dns: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user