X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/a1da13bec5188842b3cd49a51e0bc19521142bdf..5012327c3710688429161b890226d95b9d99edf8:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index 9d53e91..a24641c 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -75,13 +75,13 @@ DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
 DELAYED_QUEUE=$BASE/.delayed/
-TICKLER_QUEUE=$BASE/.tickler/
+TICKLER_QUEUE=$BASE/.store/
 DISCARD=$BASE/.discard/
 SPAM=$BASE/.spam/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
-DELAY_NEXT_WEEKEND='next sunday 30 hours ago' # fri night, 18:00
-DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18:00
+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
@@ -130,12 +130,25 @@ INCLUDERC=$PMDIR/get-msgid
 
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
-{ SUBJECT="$MATCH" }
+{
+  SUBJECT=$MATCH
+
+  # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1
+  :0
+  * SUBJECT ?? ^=\?iso-8859-1\?[QB]\?.+\?=$
+  {
+    DECODED="`echo Subject: $SUBJECT | mimedecode | iconv -f latin1 -t utf-8`"
+    :0
+    *$ DECODED ?? ^Subject:$RE_EXTRACT_HEADER_VALUE
+    { SUBJECT=$MATCH }
+  }
+}
 
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E
+* ^Received:
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 :0
@@ -210,3 +223,7 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
+
+# DISABLE_DELAYS
+# if set, disables delaying messages
+DISABLE_DELAYS