From ebd0e986ed11f2a34fb58cdd33efbfab192083ad Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:26:17 -0400
Subject: [PATCH] Added PHP 7 check in installer and updater.
---
server/conf/sieve_filter.master | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index e680462..e161a9f 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -1,9 +1,10 @@
-require ["fileinto", "regex", "date", "relational", "vacation"];
+require ["fileinto", "regex", "vacation"];
<tmpl_if name="cc">
# Send a copy of email to
-redirect "<tmpl_var name='cc'>";
-keep;
+<tmpl_loop name="ccloop">
+redirect "<tmpl_var name='address'>";
+</tmpl_loop>
</tmpl_if>
<tmpl_if name="move_junk" op="==" value="y">
@@ -17,6 +18,8 @@
<tmpl_var name='custom_mailfilter'>
+keep;
+
<tmpl_if name="autoresponder" op="==" value="y">
#################################################################
# Autoreply
@@ -28,11 +31,9 @@
# Stop here so that we do not reply on spams
stop;
}
-
-if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
vacation :days 1
- :subject "<tmpl_var name='autoresponder_subject'>"
+ :subject "Out of office reply"
+ # :addresses ["test@test.int", "till@test.int"]
<tmpl_var name='addresses'>
"<tmpl_var name='autoresponder_text'>";
-}
-</tmpl_if>
+</tmpl_if>
\ No newline at end of file
--
Gitblit v1.9.1