refactor justme

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 715f82d09bf0fdf9936f7b48ce88fb5171988af3..e10d302713d12c8a82eee2dab603ad7bc40aff75 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -82,9 +82,9 @@ DISCARD=$BASE/.discard/
 SPAM=$BASE/.spam/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
 SPAM=$BASE/.spam/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 

-DELAY_NEXT_WEEKEND='next sunday 30 hours ago' # fri night, 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
 DELAY_TONIGHT='tomorrow 00:00 4 hours ago' # tonight at 20:00

-DELAY_AFTERNOON='tomorrow 00:00 5 hours ago' # today at 19:00
+DELAY_AFTERNOON='tomorrow 00:00 8 hours ago' # today at 16:00

 
 OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 :0
 
 OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 :0


@@ -136,14 +136,10 @@ INCLUDERC=$PMDIR/get-msgid
 {
   SUBJECT=$MATCH
 
 {
   SUBJECT=$MATCH
 

-  # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1

   :0
   :0

-  * SUBJECT ?? =\?iso-8859-1\?[QBqb]\?.+\?=
+  * SUBJECT ?? =\?.+\?[QBqb]\?.+\?=

   {
   {

-    DECODED="`echo Subject: $SUBJECT | mimedecode | iconv -f latin1 -t utf-8`"
-    :0
-    *$ DECODED ?? ^Subject:$RE_EXTRACT_HEADER_VALUE
-    { SUBJECT=$MATCH }
+    SUBJECT="`PERL_UNICODE=S perl -MEncode=decode -e \"print decode(\\\"MIME-Header\\\", \\\"$SUBJECT\\\") . \\\"\n\\\";\"`"

   }
 }
 
   }
 }
 


@@ -237,4 +233,9 @@ DELAY
 # released. Overrides DELAY.
 RELEASE
 
 # released. Overrides DELAY.
 RELEASE
 

+# MARK_READ
+# when set, causes mails to be marked as read when delivered. Can be
+# initialised with DELIVER_READ
+MARK_READ=$DELIVER_READ
+

 # vim:ft=procmail
 # vim:ft=procmail