From ddb461f596d9f013afe4f215fabc0eabc62b1fb0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 07 Jan 2014 10:28:05 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
interface/web/mail/form/mail_user.tform.php | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 03f458a..ce3c195 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' => '',
@@ -232,6 +232,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