Fix procmail vacation rule if no dates are set (Gaudenz Steinlin <gaudenz@debian...

diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
index a7f269c..24330e4 100644 (file)
--- a/ingo/docs/CHANGES
+++ b/ingo/docs/CHANGES
@@ -10,6 +10,8 @@ v2.0-git
 v1.2.5-cvs
 ----------
 
+[jan] Fix procmail vacation rule if no dates are set (Gaudenz Steinlin
+      <gaudenz@debian.org>, Bug #8982).
 [jan] Fix filtering only unseen message if rule should filter all messages in
       IMAP driver (Jan Kuipers <jrkuipers@lauwerscollege.nl>, Bug #9077).
 

diff --git a/ingo/lib/Script/Procmail/Recipe.php b/ingo/lib/Script/Procmail/Recipe.php
index e49ecd6..6dee0e2 100644 (file)
--- a/ingo/lib/Script/Procmail/Recipe.php
+++ b/ingo/lib/Script/Procmail/Recipe.php
@@ -139,9 +139,9 @@ class Ingo_Script_Procmail_Recipe
                     $this->_action[] = '    :0 Whc: ${VACATION_DIR:-.}/vacation.lock';
                     if ($timed) {
                         $this->_action[] = '    * ? test $DATE -gt $START && test $END -gt $DATE';
-                       $this->_action[] = '    {';
-                        $this->_action[] = '      :0 Wh';
                     }
+                   $this->_action[] = '    {';
+                    $this->_action[] = '      :0 Wh';
                     $this->_action[] = '      * ^TO_' . $address;
                     $this->_action[] = '      * !^X-Loop: ' . $address;
                     $this->_action[] = '      * !^X-Spam-Flag: YES';
@@ -172,9 +172,7 @@ class Ingo_Script_Procmail_Recipe
                     $reason = addcslashes($reason, "\\\n\r\t\"`");
                     $this->_action[] = '       ' . $this->_params['echo'] . ' -e "' . $reason . '" \\';
                     $this->_action[] = '      ) | $SENDMAIL -f' . $address . ' -oi -t';
-                    if ($timed) {
-                        $this->_action[] = '    }';
-                    }
+                    $this->_action[] = '    }';
                     $this->_action[] = '  }';
                 }
             }