From 402bb36d8b36991174508cef4093896823668b61 Mon Sep 17 00:00:00 2001
From: marknl <marknl@ispconfig3>
Date: Tue, 13 Sep 2011 03:39:57 -0400
Subject: [PATCH] FS#1681 - Out-of-Office too early - UNTESTED! http://bugtracker.ispconfig.org/index.php?do=details&task_id=1681
---
server/conf/sieve_filter.master | 5 ++++-
server/plugins-available/maildeliver_plugin.inc.php | 8 +++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 3bd42ed..9965ebb 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -1,5 +1,5 @@
-require ["fileinto", "regex", "vacation"];
+require ["fileinto", "regex", "date", "relational", "vacation"];
<tmpl_if name="cc">
# Send a copy of email to
@@ -29,8 +29,11 @@
# Stop here so that we do not reply on spams
stop;
}
+
+if allof(currentdate :value "ge" "date" "<tmpl_var name='start_date'>", currentdate :value "le" "date" "<tmpl_var name='end_date'>") {
vacation :days 1
:subject "Out of office reply"
<tmpl_var name='addresses'>
"<tmpl_var name='autoresponder_text'>";
+}
</tmpl_if>
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index a1573c9..61efb9c 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -112,7 +112,13 @@
// Move junk
$tpl->setVar('move_junk',$data["new"]["move_junk"]);
-
+
+ // Set autoresponder start date
+ $tpl->setVar('start_date',$data["new"]["autoresponder_start_date"]);
+
+ // Set autoresponder end date
+ $tpl->setVar('end_date',$data["new"]["autoresponder_end_date"]);
+
// Autoresponder
$tpl->setVar('autoresponder',$data["new"]["autoresponder"]);
--
Gitblit v1.9.1