Fixed: FS#1004 - an umlaut in ssl_organisation kills vhost processing

Author: tbrehm

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

@@ -249,6 +249,10 @@
 		'ssl_state' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
+														'regex' => '/^[a-zA-Z0-9\ \.\-\_\,]{1,255}$/',
+														'errmsg'=> 'ssl_state_error_regex'),
+									),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -257,6 +261,10 @@
 		'ssl_locality' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
+														'regex' => '/^[a-zA-Z0-9\ \.\-\_\,]{1,255}$/',
+														'errmsg'=> 'ssl_locality_error_regex'),
+									),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -265,6 +273,10 @@
 		'ssl_organisation' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
+														'regex' => '/^[a-zA-Z0-9\ \.\-\_\,]{1,255}$/',
+														'errmsg'=> 'ssl_organisation_error_regex'),
+									),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -273,6 +285,10 @@
 		'ssl_organisation_unit' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
+														'regex' => '/^[a-zA-Z0-9\ \.\-\_\,]{1,255}$/',
+														'errmsg'=> 'ssl_organistaion_unit_error_regex'),
+									),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
@@ -281,6 +297,10 @@
 		'ssl_country' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
+														'regex' => '/^[A-Z]{2,2}$/',
+														'errmsg'=> 'ssl_country_error_regex'),
+									),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '2',

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

@@ -49,4 +49,10 @@ $wb["client_group_id_txt"] = 'Client';
 $wb["stats_password_txt"] = 'Webstatistics password';
 $wb["allow_override_txt"] = 'Allow Override';
 $wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+
 ?>