improved spamtrapping of msgids

[etc/mailfilter.git] / procmail / handlespam

diff --git a/procmail/handlespam b/procmail/handlespam
index 4095f60844eb53ff2ae1710df4b74ff7e46edd01..9d5e05a59f57588191b3d8e1942d572494836171 100644 (file)
--- a/procmail/handlespam
+++ b/procmail/handlespam
@@ -12,16 +12,12 @@
 #     symptom:  $IS_SPAM is set
 #     reaction: file as spam
 #
 #     symptom:  $IS_SPAM is set
 #     reaction: file as spam
 #

-# 4a. message needs to be retrained as spam
-#     symptom:  $CRM_RETRAIN is set to spam
+# 4. message needs to be retrained as spam
+#     symptom:  $RETRAIN is set to spam

 #     reaction: retrain filters, report, and file as spam
 #
 #     reaction: retrain filters, report, and file as spam
 #

-# 4b.  message is spamtrapped
-#     symptom:  $SPAMTRAPPED is set
-#     reaction: train filters, report, and file as spam
-#

 # 5.  message needs to be retrained as ham
 # 5.  message needs to be retrained as ham

-#     symptom:  $CRM_RETRAIN is set to ham
+#     symptom:  $RETRAIN is set to ham

 #     reaction: retrain crm114 and resubmit the message to the spamfilter
 #
 # 6.  spam degree is unknown:
 #     reaction: retrain crm114 and resubmit the message to the spamfilter
 #
 # 6.  spam degree is unknown:


@@ -38,7 +34,10 @@
 {
   LOG="spamfilter:  filing as unsure$NL"
   :0
 {
   LOG="spamfilter:  filing as unsure$NL"
   :0

-  $INBOX/.retrain.unsure/
+  {
+    DEST=retrain.unsure
+    DELAY=$DELAY_TONIGHT
+  }

 }
 
 :0 E
 }
 
 :0 E


@@ -46,12 +45,14 @@
 {
   LOG="spamfilter:  filing as disagreed$NL"
   :0
 {
   LOG="spamfilter:  filing as disagreed$NL"
   :0

-  $INBOX/.retrain.disagree/
+  {
+    DEST=retrain.disagree
+    DELAY=$DELAY_TONIGHT
+  }

 }
 
 :0 E
 }
 
 :0 E

-* 1^0 CRM_RETRAIN ?? spam
-* 1^0 SPAMTRAPPED ?? .
+* RETRAIN ?? spam

 {
   LOG="spamfilter:  (re)training as spam$NL"
   :0 fw
 {
   LOG="spamfilter:  (re)training as spam$NL"
   :0 fw


@@ -60,7 +61,7 @@
 }
 
 :0 E
 }
 
 :0 E

-* CRM_RETRAIN ?? ham
+* RETRAIN ?? ham

 {
   LOG="spamfilter:  retraining as ham$NL"
   :0 fw
 {
   LOG="spamfilter:  retraining as ham$NL"
   :0 fw


@@ -75,10 +76,10 @@
 {
   LOG="spamfilter:  filing as spam$NL"
   :0
 {
   LOG="spamfilter:  filing as spam$NL"
   :0

-  $INBOX/.spam/
+  $SPAM

 }
 
 }
 

-:0
+:0 E

 { LOG="spamfilter:  allowed to pass$NL" }
 
 #:0 E
 { LOG="spamfilter:  allowed to pass$NL" }
 
 #:0 E