From 2e1d4af13f48e0db06c93eff7d9d6f2ff7e17939 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 16 Dec 2008 11:49:46 -0500
Subject: [PATCH] Added a newline at the end of the master_cf_amavis.master file to prevent debian update problems.

---
 interface/web/admin/form/users.tform.php |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/interface/web/admin/form/users.tform.php b/interface/web/admin/form/users.tform.php
index 576c551..06be9db 100644
--- a/interface/web/admin/form/users.tform.php
+++ b/interface/web/admin/form/users.tform.php
@@ -66,6 +66,7 @@
 $form['action']			= 'users_edit.php';
 $form['db_table']		= 'sys_user';
 $form['db_table_idx']	= 'userid';
+$form["db_history"]		= "no";
 $form['tab_default']	= 'users';
 $form['list_default']	= 'users_list.php';
 $form['auth']			= 'yes';
@@ -136,8 +137,16 @@
 		'username' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
-			'regex'		=> '/^.{1,30}$/',
-			'errmsg'	=> 'username_err',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'username_empty'),
+										1 => array (	'type'	=> 'UNIQUE',
+														'errmsg'=> 'username_unique'),
+										2 => array (	'type'	=> 'REGEX',
+														'regex' => '/^[\w\.\-\_]{0,50}$/',
+														'errmsg'=> 'username_err'),
+									),
+			'regex'		=> '',
+			'errmsg'	=> '',
 			'default'	=> '',
 			'value'		=> '',
 			'separator'	=> '',

--
Gitblit v1.9.1