From 11d53c9a5b8b0596b857d35b3abbbab1bcd1ed7c Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Mon, 8 Feb 2021 10:13:08 -0700
Subject: [PATCH] filter Junk mail based on X-Spam* headers, not Subject
---
server/conf/autoresponder.master | 4 ++--
server/conf/sieve_filter.master | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/conf/autoresponder.master b/server/conf/autoresponder.master
index 114db23d64..fc5519a0ac 100644
--- a/server/conf/autoresponder.master
+++ b/server/conf/autoresponder.master
@@ -4,7 +4,7 @@ if ($RETURNCODE==1)
{
if (!/^List-Unsubscribe:.*/:h )
{
- if (!/^(X-Spam-Flag: YES|X-Spam: Yes|Subject: \*\*\*\s*SPAM\s*\*\*\*.*)/:h )
+ if (!/^(X-Spam-Flag: YES|X-Spam: Yes)/:h )
{
NOW=time
if ({start_date} lt $NOW && {end_date} gt $NOW)
@@ -20,4 +20,4 @@ if ($RETURNCODE==1)
}
}
}
-}
\ No newline at end of file
+}
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index dd2dfb9647..538e8cf328 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" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "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" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "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" "Yes",
#################################################################
# Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes") {
# Stop here so that we do not reply on spams
stop;
}
--
GitLab