Commit e2ce4359 authored by tbrehm's avatar tbrehm
Browse files

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

parent 2f1ecfb5
...@@ -249,6 +249,10 @@ $form["tabs"]['ssl'] = array ( ...@@ -249,6 +249,10 @@ $form["tabs"]['ssl'] = array (
'ssl_state' => array ( 'ssl_state' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-9\ \.\-\_\,]{1,255}$/',
'errmsg'=> 'ssl_state_error_regex'),
),
'default' => '', 'default' => '',
'value' => '', 'value' => '',
'width' => '30', 'width' => '30',
...@@ -257,6 +261,10 @@ $form["tabs"]['ssl'] = array ( ...@@ -257,6 +261,10 @@ $form["tabs"]['ssl'] = array (
'ssl_locality' => array ( 'ssl_locality' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-9\ \.\-\_\,]{1,255}$/',
'errmsg'=> 'ssl_locality_error_regex'),
),
'default' => '', 'default' => '',
'value' => '', 'value' => '',
'width' => '30', 'width' => '30',
...@@ -265,6 +273,10 @@ $form["tabs"]['ssl'] = array ( ...@@ -265,6 +273,10 @@ $form["tabs"]['ssl'] = array (
'ssl_organisation' => array ( 'ssl_organisation' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-9\ \.\-\_\,]{1,255}$/',
'errmsg'=> 'ssl_organisation_error_regex'),
),
'default' => '', 'default' => '',
'value' => '', 'value' => '',
'width' => '30', 'width' => '30',
...@@ -273,6 +285,10 @@ $form["tabs"]['ssl'] = array ( ...@@ -273,6 +285,10 @@ $form["tabs"]['ssl'] = array (
'ssl_organisation_unit' => array ( 'ssl_organisation_unit' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-9\ \.\-\_\,]{1,255}$/',
'errmsg'=> 'ssl_organistaion_unit_error_regex'),
),
'default' => '', 'default' => '',
'value' => '', 'value' => '',
'width' => '30', 'width' => '30',
...@@ -281,6 +297,10 @@ $form["tabs"]['ssl'] = array ( ...@@ -281,6 +297,10 @@ $form["tabs"]['ssl'] = array (
'ssl_country' => array ( 'ssl_country' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[A-Z]{2,2}$/',
'errmsg'=> 'ssl_country_error_regex'),
),
'default' => '', 'default' => '',
'value' => '', 'value' => '',
'width' => '2', 'width' => '2',
......
...@@ -49,4 +49,10 @@ $wb["client_group_id_txt"] = 'Client'; ...@@ -49,4 +49,10 @@ $wb["client_group_id_txt"] = 'Client';
$wb["stats_password_txt"] = 'Webstatistics password'; $wb["stats_password_txt"] = 'Webstatistics password';
$wb["allow_override_txt"] = 'Allow Override'; $wb["allow_override_txt"] = 'Allow Override';
$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota'; $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';
?> ?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment