fix regexp to avoid extracting sfid with msgid

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

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 9b795343cf9283ea54d3376ba47bd53c4aeb620b..65f02e5eb64b3053662fc4aec0f4a7eb8e0c7145 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,9 +1,21 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0
 #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 ?? .
 * DELAY ?? .

-* ! DELAYED ?? .

 {
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
 {
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"


@@ -23,10 +35,9 @@
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
     :0 fw
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
     :0 fw

-    |$FORMAIL -I "X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
+    |$FORMAIL -I"X-Postponed: $RELEASE_TS ($RELEASE_TIME)"

 
     INCLUDERC=$PMDIR/record-delayed-mail
 
     INCLUDERC=$PMDIR/record-delayed-mail

-

     :0
     $DELAYED_QUEUE
   }
     :0
     $DELAYED_QUEUE
   }