From 1c73edaf45252dfadc3e04a8f6b5eff38ef8ba04 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 17 Oct 2012 11:05:04 -0400
Subject: [PATCH] Fixed: FS#2398 - Setting autoresponder start/end dates for a mailbox fails
---
server/plugins-available/maildeliver_plugin.inc.php | 8 ++++++++
server/conf/sieve_filter_1.2.master | 6 ++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/server/conf/sieve_filter_1.2.master b/server/conf/sieve_filter_1.2.master
index 1c63ddf..a88dc2d 100644
--- a/server/conf/sieve_filter_1.2.master
+++ b/server/conf/sieve_filter_1.2.master
@@ -30,11 +30,17 @@
stop;
}
+<tmpl_if name="autoresponder_date_limit">
if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
+</tmpl_if>
+
vacation :days 1
:subject "<tmpl_var name='autoresponder_subject'>"
<tmpl_var name='addresses'>
"<tmpl_var name='autoresponder_text'>";
+
+<tmpl_if name="autoresponder_date_limit">
}
</tmpl_if>
+</tmpl_if>
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 25e4cf2..9df9fd6 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -127,6 +127,14 @@
// Move junk
$tpl->setVar('move_junk',$data["new"]["move_junk"]);
+
+ // Check autoresponder dates
+ if($data["new"]["autoresponder_start_date"] == '0000-00-00 00:00:00' && $data["new"]["autoresponder_end_date"] == '0000-00-00 00:00:00') {
+ $tpl->setVar('autoresponder_date_limit',0);
+ } else {
+ $tpl->setVar('autoresponder_date_limit',1);
+ }
+
// Set autoresponder start date
$data["new"]["autoresponder_start_date"] = str_replace (" ", "T", $data["new"]["autoresponder_start_date"]);
--
Gitblit v1.9.1