Commit 2c0812a6 authored by Falko Timme's avatar Falko Timme
Browse files

- Allow & in SSL certificates (like in "MeineFirma GmbH & Co. KG").

parent dd13201d
...@@ -343,7 +343,7 @@ $form["tabs"]['ssl'] = array ( ...@@ -343,7 +343,7 @@ $form["tabs"]['ssl'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX', 'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/', 'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,& ]{1,255}))$/',
'errmsg'=> 'ssl_state_error_regex'), 'errmsg'=> 'ssl_state_error_regex'),
), ),
'default' => '', 'default' => '',
...@@ -355,7 +355,7 @@ $form["tabs"]['ssl'] = array ( ...@@ -355,7 +355,7 @@ $form["tabs"]['ssl'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX', 'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/', 'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,& ]{1,255}))$/',
'errmsg'=> 'ssl_locality_error_regex'), 'errmsg'=> 'ssl_locality_error_regex'),
), ),
'default' => '', 'default' => '',
...@@ -367,7 +367,7 @@ $form["tabs"]['ssl'] = array ( ...@@ -367,7 +367,7 @@ $form["tabs"]['ssl'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX', 'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/', 'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,& ]{1,255}))$/',
'errmsg'=> 'ssl_organisation_error_regex'), 'errmsg'=> 'ssl_organisation_error_regex'),
), ),
'default' => '', 'default' => '',
...@@ -379,7 +379,7 @@ $form["tabs"]['ssl'] = array ( ...@@ -379,7 +379,7 @@ $form["tabs"]['ssl'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX', 'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/', 'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,& ]{1,255}))$/',
'errmsg'=> 'ssl_organistaion_unit_error_regex'), 'errmsg'=> 'ssl_organistaion_unit_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -52,10 +52,10 @@ $wb['stats_password_txt'] = 'Webstatistik Passwort'; ...@@ -52,10 +52,10 @@ $wb['stats_password_txt'] = 'Webstatistik Passwort';
$wb['ssl_domain_txt'] = 'SSL Domain'; $wb['ssl_domain_txt'] = 'SSL Domain';
$wb['allow_override_txt'] = 'Allow Override'; $wb['allow_override_txt'] = 'Allow Override';
$wb['limit_web_quota_free_txt'] = 'Max. mögliche Speicherplatzbeschränkung'; $wb['limit_web_quota_free_txt'] = 'Max. mögliche Speicherplatzbeschränkung';
$wb['ssl_state_error_regex'] = 'Ungültiges SSL-Bundesland. Gültige Zeichen sind: a-z, 0-9 und .,-_'; $wb['ssl_state_error_regex'] = 'Ungültiges SSL-Bundesland. Gültige Zeichen sind: a-z, 0-9 und .,-_&';
$wb['ssl_locality_error_regex'] = 'Ungültiger SSL-Ort. Gülige Zeichen sind: a-z, 0-9 und .,-_'; $wb['ssl_locality_error_regex'] = 'Ungültiger SSL-Ort. Gülige Zeichen sind: a-z, 0-9 und .,-_&';
$wb['ssl_organisation_error_regex'] = 'Ungültige SSL-Firma. Gültige Zeichen sind: a-z, 0-9 und .,-_'; $wb['ssl_organisation_error_regex'] = 'Ungültige SSL-Firma. Gültige Zeichen sind: a-z, 0-9 und .,-_&';
$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Gültige Zeichen sind: a-z, 0-9 und .,-_'; $wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Gültige Zeichen sind: a-z, 0-9 und .,-_&';
$wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Gültige Zeichen sind: A-Z'; $wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Gültige Zeichen sind: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. mögliche Transfervolumenbeschränkung'; $wb['limit_traffic_quota_free_txt'] = 'Max. mögliche Transfervolumenbeschränkung';
$wb['redirect_error_regex'] = 'Ungültiger Weiterleitungspfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/'; $wb['redirect_error_regex'] = 'Ungültiger Weiterleitungspfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/';
......
...@@ -56,10 +56,10 @@ $wb["client_group_id_txt"] = 'Client'; ...@@ -56,10 +56,10 @@ $wb["client_group_id_txt"] = 'Client';
$wb["stats_password_txt"] = 'Set Webstatistics password'; $wb["stats_password_txt"] = 'Set Webstatistics password';
$wb["allow_override_txt"] = 'Apache AllowOverride'; $wb["allow_override_txt"] = 'Apache AllowOverride';
$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_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_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_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_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'; $wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota'; $wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/'; $wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
......
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