From bfcdef6bc91753cb2044e3626f522b5b1aec129f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 14 Nov 2012 05:34:56 -0500
Subject: [PATCH] Merged revisions 3596-3670 from 3.0.5 stable branch.
---
interface/lib/classes/validate_autoresponder.inc.php | 12 ++++++++++--
1 files changed, 10 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
--
Gitblit v1.9.1