handle delay disabling more verbosely

[etc/mailfilter.git] / procmail / delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 9b795343cf9283ea54d3376ba47bd53c4aeb620b..6a4717c3227479caba0b5f8922bfbfad885504ff 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,9 +1,21 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0
-* ! DISABLE_DELAYS ?? .
+* POSTPONED ?? .
+{
+  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 ?? .
-* ! DELAYED ?? .
 {
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
@@ -21,11 +33,10 @@
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
-
-    :0 fw
-    |$FORMAIL -I "X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
+    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"
 
     INCLUDERC=$PMDIR/record-delayed-mail
+    INCLUDERC=$PMDIR/addheaders
 
     :0
     $DELAYED_QUEUE