From 7f81430745795fa166327c5da7543f335b2f5231 Mon Sep 17 00:00:00 2001 From: Falko Timme <ft@falkotimme.com> Date: Thu, 08 May 2014 12:41:51 -0400 Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 --- interface/web/client/form/client.tform.php | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 5869776..623f92e 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -166,6 +166,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' => '', @@ -250,7 +258,7 @@ 'formtype' => 'SELECT', 'default' => (isset($conf['language']) ? strtoupper($conf['language']) : ''), 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY iso ASC', + 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name ASC', 'keyfield' => 'iso', 'valuefield' => 'printable_name' ), -- Gitblit v1.9.1