From 75ae20a22be7615e991f13400c276bc13c24ba4c Mon Sep 17 00:00:00 2001
From: wyrie <wyrie@ispconfig3>
Date: Thu, 17 Dec 2009 05:19:28 -0500
Subject: [PATCH] Implemented: FS#1003 - Autoresponder: Start and end date (Interface)

---
 interface/web/mail/form/mail_user.tform.php |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index cf9985e..22dea84 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -94,10 +94,10 @@
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISINT',
 														'errmsg'=> 'quota_error_isint'),
 										1 => array (	'type'	=> 'REGEX',
-														'regex' => '/^(-1)|([1-9][0-9]*)$/',
+														'regex' => '/^([0-9]*)$/',
 														'errmsg'=> 'quota_error_value'),
 									),
-			'default'	=> '0',
+			'default'	=> '-1',
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
@@ -188,6 +188,24 @@
 			'default'	=> 'n',
 			'value'		=> array(1 => 'y',0 => 'n')
 		),
+		'autoresponder_start_date' => array (
+			'datatype'	=> 'DATETIME',
+			'formtype'	=> 'DATETIME',
+			'validators'=> array ( 	0 => array (	'type'	=> 'CUSTOM',
+													'class' => 'validate_autoresponder',
+													'function' => 'start_date',
+													'errmsg'=> 'autoresponder_start_date_isfuture'),
+								 ),
+		),
+		'autoresponder_end_date' => array (
+			'datatype'	=> 'DATETIME',
+			'formtype'	=> 'DATETIME',
+			'validators'=> array ( 	0 => array (	'type'	=> 'CUSTOM',
+													'class' => 'validate_autoresponder',
+													'function' => 'end_date',
+													'errmsg'=> 'autoresponder_end_date_isgreater'),
+								 ),
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################
@@ -202,7 +220,12 @@
 	##################################
 	# Begin Datatable fields
 	##################################
-		
+		'move_junk' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'n',
+			'value'		=> array(0 => 'n',1 => 'y')
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################

--
Gitblit v1.9.1