From 52a8e7e2f53b23f41b40aa5bc5b35f338aaec3dd Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 26 May 2016 02:05:33 -0400
Subject: [PATCH] prevent empty support messages in help module (Fixes: #3697)

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

diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 8d5b625..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',
@@ -311,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'),
@@ -320,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