From b4ad4f8663a37182188cbffd960651e089893e8a Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 22 Dec 2009 15:36:10 +0100
Subject: [PATCH] Support some non-standard Date: headers in Sieve vacation
 rules (Request #8783).

---
 ingo/docs/CHANGES         | 4 +++-
 ingo/lib/Script/Sieve.php | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
index bf873bda3..9e4dbc935 100644
--- a/ingo/docs/CHANGES
+++ b/ingo/docs/CHANGES
@@ -10,7 +10,9 @@ v2.0-git
 v1.2.4-cvs
 ----------
 
-[jan] Support composite header rules with IMAP backends (Bug #7343).
+[jan] Support some non-standard Date: headers in Sieve vacation rules
+      (Request #8783).
+[jan] Support composite header rules with IMAP backends (Request #7343).
 [jan] Fix unconditional debug output with Net_Sieve earlier than 1.2.0
       (Bug #8794).
 [jan] Add Sieve configuration to use UTF-8 encoded folder names (for Dovecot)
diff --git a/ingo/lib/Script/Sieve.php b/ingo/lib/Script/Sieve.php
index 0736c595e..5ea6daffa 100644
--- a/ingo/lib/Script/Sieve.php
+++ b/ingo/lib/Script/Sieve.php
@@ -2752,7 +2752,7 @@ class Sieve_Action_Vacation extends Sieve_Action {
             $code .= '|' . $i;
         }
         return $code
-            . ') (\\\\(.*\\\\) )?..:..:.. (\\\\(.*\\\\) )?(\\\\+|\\\\-)....( \\\\(.*\\\\))?$" {'
+            . ') (\\\\(.*\\\\) )?..:..:.. (\\\\(.*\\\\) )?((\\\\+|\\\\-)[[:digit:]]{4}|.{1,5})( \\\\(.*\\\\))?$" {'
             . "\n    ";
     }
 
@@ -2767,7 +2767,7 @@ class Sieve_Action_Vacation extends Sieve_Action {
             $code .= '|' . $months[$i - 1];
         }
         return $code
-            . ') (\\\\(.*\\\\) )?.... (\\\\(.*\\\\) )?..:..:.. (\\\\(.*\\\\) )?(\\\\+|\\\\-)....( \\\\(.*\\\\))?$" {'
+            . ') (\\\\(.*\\\\) )?.... (\\\\(.*\\\\) )?..:..:.. (\\\\(.*\\\\) )?((\\\\+|\\\\-)[[:digit:]]{4}|.{1,5})( \\\\(.*\\\\))?$" {'
             . "\n    ";
     }
 
@@ -2780,7 +2780,7 @@ class Sieve_Action_Vacation extends Sieve_Action {
             $code .= '|' . str_repeat('[0 ]', 2 - strlen($i)) . $i;
         }
         return $code
-            . ') (\\\\(.*\\\\) )?... (\\\\(.*\\\\) )?.... (\\\\(.*\\\\) )?..:..:.. (\\\\(.*\\\\) )?(\\\\+|\\\\-)....( \\\\(.*\\\\))?$" {'
+            . ') (\\\\(.*\\\\) )?... (\\\\(.*\\\\) )?.... (\\\\(.*\\\\) )?..:..:.. (\\\\(.*\\\\) )?((\\\\+|\\\\-)[[:digit:]]{4}|.{1,5})( \\\\(.*\\\\))?$" {'
             . "\n    ";
     }
 
-- 
2.11.0