X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/26fe4fa08d155002f7e444fd805f2829137fd8f0..23f3aaa4478aab4cc239c756274a54727ccaf6e0:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index af431c1..a7acfab 100644
--- 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/"
@@ -76,9 +77,13 @@ NULL=/dev/null
 DELAYED_QUEUE=$BASE/.delayed/
 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
+SPAM=$BASE/.spam/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
-OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
+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" }
@@ -86,12 +91,9 @@ OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 *$ OURDATE ?? ^[0-9]+${RE_SPACE}+\/${RE_NOT_SPACE}+
 { OURDATE_SHORT="$MATCH" }
 :0
-*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/.+
 { OURDATE="$MATCH" }
 
-DELAY_NEXT_WEEKEND='next monday 54 hours ago' # fri night, 18:00 CET
-DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18:00 CET
-
 ### variables from the message
 
 ### local recipient data
@@ -128,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