]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/delay-delivery

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

only delay if not already delayed
[etc/mailfilter.git] / procmail / delay-delivery
index 381771577a1fb8cddf7fb9c1759b4f258a38e503..6a4717c3227479caba0b5f8922bfbfad885504ff 100644 (file)
@@ -1,13 +1,22 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0
 #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'`"
 
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
 
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
-
-    :0 fw
-    |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"
 
     INCLUDERC=$PMDIR/record-delayed-mail
 
     INCLUDERC=$PMDIR/record-delayed-mail
+    INCLUDERC=$PMDIR/addheaders
 
     :0
     $DELAYED_QUEUE
 
     :0
     $DELAYED_QUEUE