fix up tickler

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index 5c7d19bc6b15f4aae5ce154ce689cd7998c39c98..65578489063b6d0fe28542b57ab87eedebf93826 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,50 +1,61 @@
+# The X-Tickle header has priority over the Original-To address
 :0
-* ! DEST ?? .
-* ! TICKLE_DELIVERED ?? .
+*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ TICKLE="$MATCH" }
+
+:0 E
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
+{ TICKLE="$MATCH" }
+
+:0
+* TICKLE ?? .
+* ! DEST ?? .
 {
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
 
   :0
-  * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
-  { DELAY="@$MATCH" }
+  * TICKLE ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
+  { DELAY="@$TICKLE" }
 
   :0 E
-  * MATCH ?? ^[0-9]+h$
-  * MATCH ?? ^\/[^h]+
+  * TICKLE ?? ^[0-9]+h$
+  * TICKLE ?? ^\/[^h]+
   { DELAY="$DATE + $MATCH hours" }
 
   :0 E
-  * MATCH ?? ^[0-9]+m$
-  * MATCH ?? ^\/[^m]+
+  * TICKLE ?? ^[0-9]+m$
+  * TICKLE ?? ^\/[^m]+
   { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" }
 
   :0 E
-  * MATCH ?? ^[0-9]+w$
-  * MATCH ?? ^\/[^w]+
+  * TICKLE ?? ^[0-9]+w$
+  * TICKLE ?? ^\/[^w]+
   { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" }
 
   :0 E
-  * MATCH ?? ^[0-9]+d?$
-  * MATCH ?? ^\/[^d]+
+  * TICKLE ?? ^[0-9]+d?$
+  * TICKLE ?? ^\/[^d]+
   { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" }
 
-  JUST_DATE
-  DAILY_DELIVERY_TIME
-
   :0 E
   {
-    LOG="tickle:      invalid date string: $MATCH$NL"
+    LOG="tickle:      invalid tickler date string: $TICKLE$NL"
     EXITCODE=69
     HOST
   }
 
-  :0 fw
-  |$FORMAIL -i "X-Tickle: $DELAY"
+  JUST_DATE
+  DAILY_DELIVERY_TIME
 
   LOG="tickle:      delaying message until $DELAY$NL"
+  DELAYED_QUEUE=$TICKLER_QUEUE
+
+  # unset DISABLE_DELAYS to enable delaying for tickle messages
+  DISABLE_DELAYS
 }
 
+TICKLE
+
 # vim:ft=procmail