X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/75e25f19dcf7f61080a1e728affd40e5ee7dcea0..259a4169f1bc8ece69ff289df7a47e0d84f4d418:/procmail/defines diff --git a/procmail/defines b/procmail/defines index a24641c..55508cb 100644 --- a/procmail/defines +++ b/procmail/defines @@ -48,7 +48,7 @@ SPAMCHECK_MAX_MESSAGE_SIZE=512000 # if crm114 is unsure and SA returns a score less-than-or-equal to this, # autotrain crm114 with ham -CRM_UNSURE_SA_AUTOTRAIN_LIMIT_HAM=2.0 +CRM_UNSURE_SA_AUTOTRAIN_LIMIT_HAM=0.0 # if crm114 classifies a message as spam but SA returns a score # less-than-or-equal to this, retrain crm114 CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_HAM=-1.0 @@ -80,8 +80,9 @@ DISCARD=$BASE/.discard/ SPAM=$BASE/.spam/ #DISCARD="'|$DELIVER -m BASE.discard'" -DELAY_NEXT_WEEKEND='next sunday 28 hours ago' # fri night, 20:00 +DELAY_NEXT_WEEKEND='next sunday 30 hours ago' # fri night, 18:00 DELAY_TONIGHT='tomorrow 00:00 4 hours ago' # tonight at 20:00 +DELAY_AFTERNOON='tomorrow 00:00 9 hours ago' # todat at 15:00 OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`" :0 @@ -156,12 +157,8 @@ INCLUDERC=$PMDIR/get-msgid { TRAINED_AS="$MATCH" } :0 -*$ ^X-Tickle-Delivered:$RE_EXTRACT_HEADER_VALUE -{ TICKLE_DELIVERED="$MATCH" } - -:0 -*$ ^X-Delayed:$RE_EXTRACT_HEADER_VALUE -{ DELAYED="$MATCH" } +*$ ^X-Postponed:$RE_EXTRACT_HEADER_VALUE +{ POSTPONED="$MATCH" } # fix variable values for special cases INCLUDERC=$PMDIR/normalise