X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/a3ee3c50317dcb2aa2b0041ee8c050d35220ff8b..bc7202c2a09ed0fc145ad3aa7a6b7dd52e9025db:/procmail/delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 3caf9f2..65f02e5 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,13 +1,22 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0
-* DELAY ?? .
-* ! DELAYED ?? .
+* POSTPONED ?? .
 {
-  :0
-  * DELAY ?? ^[0-9]
-  { DELAY="now + $DELAY" }
+  LOG="delay:       not delaying already-postponed message$NL"
+  :0 fw
+  |$FORMAIL -R X-Postponed X-Was-Postponed
+}
+
+:0 E
+* DISABLE_DELAYS ?? .
+{
+  LOG="delay:       delays disabled, thus not delaying$NL"
+}
 
+:0 E
+* DELAY ?? .
+{
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
 
@@ -26,11 +35,10 @@
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
     :0 fw
-    |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+    |$FORMAIL -I"X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
 
+    INCLUDERC=$PMDIR/record-delayed-mail
     :0
     $DELAYED_QUEUE
-
-    INCLUDERC=$PMDIR/record-delayed-mail
   }
 }