Added additional username check in form files.

Author: Till Brehm

interface/web/sites/form/shell_user.tform.php

@@ -93,6 +93,13 @@
 				1 => array ( 'type' => 'REGEX',
 					'regex' => '/^[\w\.\-]{0,32}$/',
 					'errmsg'=> 'username_error_regex'),
+				2 => array(
+							'type' => 'CUSTOM',
+							'class' => 'validate_systemuser',
+							'function' => 'check_sysuser',
+							'check_names' => true,
+							'errmsg' => 'invalid_username_txt'
+						),
 			),
 			'default' => '',
 			'value'  => '',

interface/web/sites/form/web_domain.tform.php

@@ -582,6 +582,13 @@
 				'formtype' => 'TEXT',
 				'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
 						'errmsg'=> 'sysuser_error_empty'),
+						1 => array(
+							'type' => 'CUSTOM',
+							'class' => 'validate_systemuser',
+							'function' => 'check_sysuser',
+							'check_names' => true,
+							'errmsg' => 'invalid_system_user_or_group_txt'
+						),
 				),
 				'default' => '',
 				'value'  => '',
@@ -593,6 +600,13 @@
 				'formtype' => 'TEXT',
 				'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
 						'errmsg'=> 'sysgroup_error_empty'),
+						1 => array(
+							'type' => 'CUSTOM',
+							'class' => 'validate_systemuser',
+							'function' => 'check_sysuser',
+							'check_names' => true,
+							'errmsg' => 'invalid_system_user_or_group_txt'
+						),
 				),
 				'default' => '',
 				'value'  => '',

interface/web/sites/lib/lang/en_shell_user.lng

@@ -31,4 +31,5 @@ $wb['username_not_allowed_txt'] = 'The username is not allowed.';
 $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
 $wb['directory_error_regex'] = 'Invalid directory';
 $wb['shell_error_regex'] = 'Invalid shell';
+$wb['invalid_username_txt'] = 'Invalid Username';
 ?>

interface/web/sites/lib/lang/en_web_domain.lng

@@ -127,4 +127,5 @@ $wb['backup_excludes_txt'] = 'Excluded Directories';
 $wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
 $wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
 $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings';
+$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
 ?>