fix sql escaping and sqlite error reporting

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 62464dd0164114ae67fd6ef2c35f396cee6b4f3f..ce23e442fc3a15de80b034898cedc4f2769380ee 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -25,6 +25,7 @@ PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 FORMAIL="$NICE /usr/bin/formail -f"
 EGREP="$NICE /bin/egrep"
 SED="$NICE /bin/sed"
+BIN_DATE="/bin/date"
 DELIVER="$NICE /usr/lib/dovecot/deliver"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
@@ -36,9 +37,6 @@ TRAINER="$NICE $MAILFILT/bin/train"
 
 SQLITE="$NICE /usr/bin/sqlite3"
 
-OURDATE="`date -R`"
-OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
-
 BASE=$HOME/.maildir
 
 #DEFAULT="|$DELIVER"
@@ -79,8 +77,23 @@ NULL=/dev/null
 DELAYED_QUEUE=$BASE/.delayed/
 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
+SPAM=$BASE/.spam/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
+DELAY_NEXT_WEEKEND='next sunday 28 hours ago' # fri night, 20:00
+DELAY_TONIGHT='tomorrow 00:00 4 hours ago' # tonight at 20:00
+
+OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
+:0
+*$ OURDATE ?? ^\/${RE_NOT_SPACE}+
+{ OURDATE_TS="$MATCH" }
+:0
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ OURDATE_SHORT="$MATCH" }
+:0
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/.+
+{ OURDATE="$MATCH" }
+
 ### variables from the message
 
 ### local recipient data
@@ -117,7 +130,26 @@ INCLUDERC=$PMDIR/get-msgid
 
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
-{ SUBJECT="$MATCH" }
+{
+  SUBJECT=$MATCH
+
+#TODO
+#  :0
+#  * SUBJECT ?? ()\?=\?(iso-8859-1|utf-8)\?\/..[^\?]*
+#  {
+#    :0
+#    * MATCH ?? B\?\/[^\?]*
+#    { BBB=`echo $SUBJECT | mimencode -u | cat -v` }
+#
+#    :0
+#    * MATCH ?? Q\?\/[^\?]*
+#    { QQQ=`echo $SUBJECT | mimencode -u -q | cat -v` }
+#
+#    SUBJECT="$QQQ$BBB"
+#  }
+
+SUBJECT="$MATCH"
+}
 
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
@@ -133,6 +165,10 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^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
 
@@ -193,3 +229,7 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
+
+# DISABLE_DELAYS
+# if set, disables delaying messages
+DISABLE_DELAYS=true