From: martin f. krafft <madduck@madduck.net>
Date: Wed, 20 Feb 2008 12:10:53 +0000 (+0100)
Subject: fix tickler
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/42effe4dc98d32fde6d40f4038f106b205ee29df

fix tickler
---

diff --git a/procmail/defines b/procmail/defines
index ce23e44..a0da9d6 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -232,4 +232,4 @@ JUSTME
 
 # DISABLE_DELAYS
 # if set, disables delaying messages
-DISABLE_DELAYS=true
+DISABLE_DELAYS
diff --git a/procmail/tickle b/procmail/tickle
index f03d1ab..5c7d19b 100644
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -4,8 +4,8 @@
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 {
-  DELIVERY_TIME=04:20
-  STAMP
+  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]$
@@ -16,25 +16,23 @@
   * MATCH ?? ^\/[^h]+
   { DELAY="$DATE + $MATCH hours" }
 
-  JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
-
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+
-  { DELAY="$JUST_DATE + $MATCH months $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" }
 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+
-  { DELAY="$JUST_DATE + $MATCH weeks $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" }
 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+
-  { DELAY="$JUST_DATE + $MATCH days $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" }
 
   JUST_DATE
-  DELIVERY_TIME
+  DAILY_DELIVERY_TIME
 
   :0 E
   {
@@ -43,30 +41,10 @@
     HOST
   }
 
-  DELAYED_QUEUE=$BASE/.store/
-
   :0 fw
-  |$FORMAIL -i 'X-Tickle: yes'
+  |$FORMAIL -i "X-Tickle: $DELAY"
 
-#  :0
-#  * ! STAMP ?? .
-#  { STAMP=`$BIN_DATE +'%s (%c)' -d "$DELAY"` }
-#
-#  :0
-#  * ! STAMP ?? ^[0-9]+ \([A-Za-z ]+ [0-9 :]+\)$
-#  {
-#    LOG="tickle:      error creating timestamp ($STAMP), using \$now$NL"
-#    STAMP="`$BIN_DATE +%s` (ERROR: original stamp '$STAMP' invalid)"
-#  }
-#
-#  :0 E
-#  { LOG="tickle:      stamping message $MSGID with $STAMP$NL" }
-#
-#  :0 fw
-#  |$FORMAIL -i "X-Tickle: $STAMP"
-#
-#  :0
-#  { DEST=$TICKLER_QUEUE }
+  LOG="tickle:      delaying message until $DELAY$NL"
 }
 
 # vim:ft=procmail