From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index f8f9f44..9b4ff8f 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -203,6 +203,14 @@
 			'width'  => '30',
 			'maxlength' => '255'
 		),
+		'maildir_format' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '',
+			'value'  => '',
+			'width'  => '30',
+			'maxlength' => '255'
+		),
 		'homedir' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
@@ -231,6 +239,12 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'y',
+			'value'  => array(1 => 'y', 0 => 'n')
+		),
+		'greylisting' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
 			'value'  => array(1 => 'y', 0 => 'n')
 		),
 		/*
@@ -305,7 +319,11 @@
 			'autoresponder_start_date' => array (
 				'datatype' => 'DATETIME',
 				'formtype' => 'DATETIME',
-				'validators'=> array ( 0 => array ( 'type' => 'CUSTOM',
+				'validators'=> array ( 
+					0 => array ( 'type' => 'ISDATETIME',
+						'allowempty' => 'y',
+						'errmsg'=> 'autoresponder_start_date_is_no_date'),
+					1 => array ( 'type' => 'CUSTOM',
 						'class' => 'validate_autoresponder',
 						'function' => 'start_date',
 						'errmsg'=> 'autoresponder_start_date_is_required'),
@@ -314,7 +332,11 @@
 			'autoresponder_end_date' => array (
 				'datatype' => 'DATETIME',
 				'formtype' => 'DATETIME',
-				'validators'=> array (  0 => array ( 'type' => 'CUSTOM',
+				'validators'=> array (  
+					0 => array ( 'type' => 'ISDATETIME',
+						'allowempty' => 'y',
+						'errmsg'=> 'autoresponder_end_date_is_no_date'),
+					1 => array ( 'type' => 'CUSTOM',
 						'class' => 'validate_autoresponder',
 						'function' => 'end_date',
 						'errmsg'=> 'autoresponder_end_date_isgreater'),

--
Gitblit v1.9.1