From b4945ae0c3f4e108090d05b34b3e7df8a753a2ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 07 Jul 2014 13:07:17 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/lib/classes/validate_autoresponder.inc.php | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/interface/lib/classes/validate_autoresponder.inc.php b/interface/lib/classes/validate_autoresponder.inc.php
index c8db6a9..fa29b7e 100755
--- a/interface/lib/classes/validate_autoresponder.inc.php
+++ b/interface/lib/classes/validate_autoresponder.inc.php
@@ -27,33 +27,42 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-include_once('validate_datetime.inc.php');
+include_once 'validate_datetime.inc.php';
-class validate_autoresponder extends validate_datetime
+class validate_autoresponder extends validate_datetime
{
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";
}
}
-
+
function end_date($field_name, $field_value, $validator)
{
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
- {
- if ( !($_msg = $this->not_empty($field_name, $field_value, $validator)) ) // End date set
+ if (!$_msg) // Start date set
{
+ if ( !($_msg = $this->not_empty($field_name, $field_value, $validator)) ) // End date set
+ {
$validator['compare'] = $this->_get_timestamp_value($start_date);
$_msg = $this->is_greater($field_name, $field_value, $validator);
}
-
+
return $_msg;
}
}
-}
\ No newline at end of file
+
+}
--
Gitblit v1.9.1