From 4e7af155949b33ce78a8fc489d87b08ff3901772 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 30 Oct 2012 07:30:33 -0400
Subject: [PATCH] Fixed: FS#2398 - Setting autoresponder start/end dates for a mailbox fails
---
interface/web/mail/form/mail_user.tform.php | 5 +++++
interface/lib/classes/validate_autoresponder.inc.php | 12 ++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/validate_autoresponder.inc.php b/interface/lib/classes/validate_autoresponder.inc.php
index c8db6a9..c5e989e 100755
--- a/interface/lib/classes/validate_autoresponder.inc.php
+++ b/interface/lib/classes/validate_autoresponder.inc.php
@@ -33,8 +33,15 @@
{
function start_date($field_name, $field_value, $validator)
{
+ # save field value for later use in end_date()
+ $this->start_date = $field_value;
+
if ($this->_datetime_selected($field_value)) {
- return $this->is_future($field_name, $field_value, $validator);
+ # We just require a start date be set
+ return;
+ }
+ if($_POST['autoresponder'] == 'y') {
+ return "No start date selected";
}
}
@@ -42,7 +49,8 @@
{
global $app;
- $start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
+ $start_date = $this->start_date;
+ //$start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
$_msg = $this->not_empty('autoresponder_start_date', $start_date, $validator);
if (!$_msg) // Start date set
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 8d27e56..16543ca 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -263,6 +263,11 @@
'autoresponder_start_date' => array (
'datatype' => 'DATETIME',
'formtype' => 'DATETIME',
+ 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_autoresponder',
+ 'function' => 'start_date',
+ 'errmsg'=> 'autoresponder_start_date_is_required'),
+ )
),
'autoresponder_end_date' => array (
'datatype' => 'DATETIME',
--
Gitblit v1.9.1