SPAMASSASSIN="$NICE /usr/bin/spamassassin --prefs-file=$SA_PREFS"
SPAMC="$NICE /usr/bin/spamc --log-to-stderr --no-safe-fallback"
#SPAMC="$SPAMASSASSIN"
-TRAINER="$MAILFILT/bin/train"
+TRAINER="$NICE $MAILFILT/bin/train"
-OURDATE=`date -R`
+SQLITE="$NICE /usr/bin/sqlite3"
+
+OURDATE="`date -R`"
OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
BASE=$HOME/.maildir
"
RE_MYDOMAIN="(.+\.)*madduck\.net"
RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
-RE_SPACE_NEWLINE="(^|[ ])"
+RE_SPACE="[ ]"
+RE_NOT_SPACE="[^ ]"
+RE_SPACE_NEWLINE="(^|$RE_SPACE)"
RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
RE_LASTNAME="kraff?t"
-RE_EXTRACT_HEADER_VALUE="[ ]*\/[^ ].*"
+RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
DEJAVU_HEADER=X-Deja-Vu
NULL=/dev/null
+DELAYED_QUEUE=$BASE/.delayed/
+TICKLER_QUEUE=$BASE/.tickler/
DISCARD=$BASE/.discard/
#DISCARD="'|$DELIVER -m BASE.discard'"
:0 E
{ LOG="NO ORIGINAL_TO: $MSGID" }
+:0
+*$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
+{ TRAINED_AS="$MATCH" }
+
+:0
+*$ ^X-Tickle-Delivered:$RE_EXTRACT_HEADER_VALUE
+{ TICKLE_DELIVERED="$MATCH" }
+
+:0
+*$ ^X-Delayed:$RE_EXTRACT_HEADER_VALUE
+{ DELAYED="$MATCH" }
+
# fix variable values for special cases
INCLUDERC=$PMDIR/normalise
# to the X-Been-There header).
MSG_DEJAVU=!
+# DEST
+# set this to a folder if the message should be delivered elsewhere than the
+# default
+DEST
+
# SKIP_SPAMCHECKS
# if set, cuases spamchecks to be skipped, value lists reason
SKIP_SPAMCHECKS
# JUSTME
# if set, contains reason why justme message was passed
JUSTME
-
-# TRAINED_AS
-# if set, contains category with which this message has just been trained
-TRAINED_AS