From 38c7515bb1ad44ca7af451e0326813fe493598c2 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Wed, 7 Apr 2021 17:32:19 -0600
Subject: [PATCH] sieve: case insensitive move to junk test matched 'BAYES' for
 'Yes'

---
 server/conf/sieve_filter.master | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 16a39ec180..fd216d3d64 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -7,7 +7,7 @@ require ["fileinto", "mailbox", "regex", "date", "relational", "vacation", "imap
 
 <tmpl_if name="move_junk" op="==" value="y">
 # Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
+if anyof (header :is ["X-Spam", "X-Spam-Flag"] "Yes", header :matches "X-Spam-Status" "Yes, *") {
   fileinto :create "Junk";
   # Stop here so that we do not reply on spams
   stop;
@@ -33,7 +33,7 @@ require ["fileinto", "mailbox", "regex", "date", "relational", "vacation", "imap
 
 <tmpl_if name="move_junk" op="==" value="a">
 # Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
+if anyof (header :is ["X-Spam", "X-Spam-Flag"] "Yes", header :matches "X-Spam-Status" "Yes, *") {
   fileinto :create "Junk";
   # Stop here so that we do not reply on spams
   stop;
@@ -46,7 +46,7 @@ if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-S
 #################################################################
 
 # Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
+if anyof (header :is ["X-Spam", "X-Spam-Flag"] "Yes", header :matches "X-Spam-Status" "Yes, *") {
   # Stop here so that we do not reply on spams
   stop;
 }
-- 
GitLab