sieve template updates

latham · latham · commit 8cc164048cd9 · 2011-11-04T18:20:35.000Z
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
@@ -1,4 +1,3 @@
-
 require ["fileinto", "regex", "date", "relational", "vacation"];
 
 <tmpl_if name="cc">
@@ -30,9 +29,9 @@ if header :contains "X-Spam-Flag" "YES" {
   stop;
 }
 
-if allof(currentdate :value "ge" "date" "<tmpl_var name='start_date'>", currentdate :value "le" "date" "<tmpl_var name='end_date'>") {
+if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
 vacation  :days 1
-  :subject "Out of office reply"
+  :subject "<tmpl_var name='autoresponder_subject'>"
   <tmpl_var name='addresses'>
   "<tmpl_var name='autoresponder_text'>";
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`require ["fileinto", "regex", "date", "relational", "vacation"];`
`3`	`2`
`4`	`3`	`<tmpl_if name="cc">`
`@@ -30,9 +29,9 @@ if header :contains "X-Spam-Flag" "YES" {`
`30`	`29`	`stop;`
`31`	`30`	`}`
`32`	`31`
`33`		`-if allof(currentdate :value "ge" "date" "<tmpl_var name='start_date'>", currentdate :value "le" "date" "<tmpl_var name='end_date'>") {`
	`32`	`+if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {`
`34`	`33`	`vacation :days 1`
`35`		`- :subject "Out of office reply"`
	`34`	`+ :subject "<tmpl_var name='autoresponder_subject'>"`
`36`	`35`	`<tmpl_var name='addresses'>`
`37`	`36`	`"<tmpl_var name='autoresponder_text'>";`
`38`	`37`	`}`