From 0cd87e682012f224e2b74531190bb983fdcbb430 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 10 Jan 2016 03:31:27 -0500
Subject: [PATCH] Revert "allow 0 for ISINT"
---
interface/web/mail/form/mail_user.tform.php | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 03f458a..8d5b625 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -58,7 +58,7 @@
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-$form["tabs"]['mailuser'] = array (
+$form["tabs"]['mailuser'] = array(
'title' => "Mailbox",
'width' => 100,
'template' => "templates/mail_user_mailbox_edit.htm",
@@ -109,7 +109,7 @@
0 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'login_error_unique'),
1 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-z0-9][\w\.\-_\+@]{1,63}$/',
+ 'regex' => '/^[_a-z0-9][\w\.\-_\+@]{1,63}$/',
'errmsg'=> 'login_error_regex'),
),
'default' => '',
@@ -120,6 +120,14 @@
'password' => array (
'datatype' => 'VARCHAR',
'formtype' => 'PASSWORD',
+ 'validators' => array(
+ 0 => array(
+ 'type' => 'CUSTOM',
+ 'class' => 'validate_password',
+ 'function' => 'password_check',
+ 'errmsg' => 'weak_password_txt'
+ )
+ ),
'encryption'=> 'CRYPT',
'default' => '',
'value' => '',
@@ -160,8 +168,27 @@
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
+ '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'=> 'cc_error_isemail'),
+ ),
+ 'default' => '',
+ 'value' => '',
+ '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' => '',
@@ -206,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',
@@ -214,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',
@@ -232,6 +271,12 @@
)
);
+if($global_config['mail']['mail_password_onlyascii'] == 'y') {
+ $form['tabs']['mailuser']['fields']['password']['validators'] = array( 0 => array( 'type' => 'ISASCII',
+ 'errmsg' => 'email_error_isascii')
+ );
+}
+
if ($global_config['mail']['mailbox_show_autoresponder_tab'] === 'y') {
$form["tabs"]['autoresponder'] = array (
'title' => "Autoresponder",
--
Gitblit v1.9.1