From d7ababc9ebb9bcb03c56e39ba5a4e06c8348d3ff Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 26 May 2015 08:21:27 -0400
Subject: [PATCH] - fixed  FS#3907 - "Reset password" generates too short passwords

---
 interface/web/sites/form/ftp_user.tform.php |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php
index f328f7f..e96e63d 100644
--- a/interface/web/sites/form/ftp_user.tform.php
+++ b/interface/web/sites/form/ftp_user.tform.php
@@ -166,6 +166,13 @@
 				'formtype'  => 'TEXT',
 				'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
 						'errmsg'=> 'uid_error_empty'),
+						1 => array(
+							'type' => 'CUSTOM',
+							'class' => 'validate_systemuser',
+							'function' => 'check_sysuser',
+							'check_names' => true,
+							'errmsg' => 'invalid_system_user_or_group_txt'
+						),
 				),
 				'default'   => '0',
 				'value'     => '',
@@ -177,6 +184,13 @@
 				'formtype'  => 'TEXT',
 				'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
 						'errmsg'=> 'gid_error_empty'),
+						1 => array(
+							'type' => 'CUSTOM',
+							'class' => 'validate_systemuser',
+							'function' => 'check_sysgroup',
+							'check_names' => true,
+							'errmsg' => 'invalid_system_user_or_group_txt'
+						),
 				),
 				'default'   => '0',
 				'value'     => '',
@@ -191,6 +205,10 @@
 											1 => array ( 	'type' => 'REGEX',
 															'regex' => '/^\/[a-zA-Z0-9\ \.\-\_\/]{10,128}$/',
 															'errmsg'=> 'directory_error_regex'),
+											2 => array (    'type'  => 'CUSTOM',
+														'class' => 'validate_ftpuser',
+														'function' => 'ftp_dir',
+														'errmsg' => 'directory_error_notinweb'),
 				),
 				'default'   => '',
 				'value'     => '',

--
Gitblit v1.9.1