added checks for junk filtering

This commit is contained in:
Matthew Saunders Brown 2021-11-20 15:34:43 -08:00
parent 75489ce102
commit 9fdbdf7692

View File

@ -725,7 +725,7 @@ junk_filter:
local_part_suffix = +* local_part_suffix = +*
local_part_suffix_optional = true local_part_suffix_optional = true
condition = ${if eq {$header_X-Junk-Flag:}{YES}} condition = ${if eq {$header_X-Junk-Flag:}{YES}}
condition = ${lookup mysql{SELECT vm_mboxes.id FROM vm_domains, vm_mboxes WHERE vm_domains.domain='${domain}' AND vm_mboxes.mbox='${local_part}' AND vm_domains.id = vm_mboxes.domain_id AND vm_domains.status = '1' AND vm_mboxes.status = '1'}} condition = ${lookup mysql{SELECT vm_mboxes.id FROM vm_domains, vm_mboxes WHERE vm_domains.domain='${domain}' AND vm_mboxes.mbox='${local_part}' AND vm_domains.id = vm_mboxes.domain_id AND vm_domains.status = '1' AND vm_mboxes.status = '1' AND vm_mboxes.filter > '0'}}
transport = junk_delivery transport = junk_delivery
spam_filter: spam_filter:
@ -737,7 +737,7 @@ spam_filter:
{ eq {$received_protocol}{spam-scanned}} \ { eq {$received_protocol}{spam-scanned}} \
{ eq {$header_X-Spam-Flag:}{YES}} \ { eq {$header_X-Spam-Flag:}{YES}} \
} {yes}{no}} } {yes}{no}}
condition = ${lookup mysql{SELECT vm_mboxes.id FROM vm_domains, vm_mboxes WHERE vm_domains.domain='${domain}' AND vm_mboxes.mbox='${local_part}' AND vm_domains.id = vm_mboxes.domain_id AND vm_domains.status = '1' AND vm_mboxes.status = '1'}} condition = ${lookup mysql{SELECT vm_mboxes.id FROM vm_domains, vm_mboxes WHERE vm_domains.domain='${domain}' AND vm_mboxes.mbox='${local_part}' AND vm_domains.id = vm_mboxes.domain_id AND vm_domains.status = '1' AND vm_mboxes.status = '1' AND vm_mboxes.filter = '2'}}
transport = junk_delivery transport = junk_delivery
virtual_vacation: virtual_vacation: