Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/mailfilter

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

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index c1ca0c0df69e48e8b18d8afb3a61ec775df2f8f8..381771577a1fb8cddf7fb9c1759b4f258a38e503 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,6 +1,3 @@
-# create table messages (msgid text unique not null, filename text
-# primary key not null unique, release_ts integer not null);
-

 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0


@@ -28,19 +25,11 @@
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 

-    DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite
-    DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
-
-    DATA="$MSGID"
-    INCLUDERC=$PMDIR/sql-escape
-
-    Q="insert into messages values
-      ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
-    TRAP="$TRAP; $DO_QUERY '$Q'"
-

     :0 fw
     |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
 
     :0 fw
     |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
 

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

     :0
     $DELAYED_QUEUE
   }
     :0
     $DELAYED_QUEUE
   }