From a8ab61eeb0beac52d5a1e8c41d549df4ed87bf71 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 29 Jan 2016 10:13:44 -0500
Subject: [PATCH] Added allowempty setting to ISEMAIL validator.
---
interface/web/mail/form/mail_user.tform.php | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 34d2693..8b80dea 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -176,6 +176,25 @@
'width' => '30',
'maxlength' => '255'
),
+ 'sender_cc' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex'=>'/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}(,\s*\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,}$/i',
+ 'errmsg'=> 'sender_cc_error_isemail'),
+ ),
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
'maildir' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -214,6 +233,12 @@
'default' => 'y',
'value' => array(1 => 'y', 0 => 'n')
),
+ 'greylisting' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(1 => 'y', 0 => 'n')
+ ),
/*
'access' => array (
'datatype' => 'VARCHAR',
@@ -222,6 +247,12 @@
'value' => array(1 => 'y',0 => 'n')
),
*/
+ 'disablesmtp' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(1 => 'y', 0 => 'n')
+ ),
'disableimap' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
@@ -280,7 +311,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'),
@@ -289,7 +324,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