From 2c0812a625552379b85fefa69dfe2092d3fee06e Mon Sep 17 00:00:00 2001 From: Falko Timme Date: Tue, 29 Oct 2013 18:49:04 +0100 Subject: [PATCH] - Allow & in SSL certificates (like in "MeineFirma GmbH & Co. KG"). --- interface/web/sites/form/web_domain.tform.php | 8 ++++---- interface/web/sites/lib/lang/de_web_domain.lng | 8 ++++---- interface/web/sites/lib/lang/en_web_domain.lng | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index f2c6fa7b5..2175288b4 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -343,7 +343,7 @@ $form["tabs"]['ssl'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', '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'), ), 'default' => '', @@ -355,7 +355,7 @@ $form["tabs"]['ssl'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', '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'), ), 'default' => '', @@ -367,7 +367,7 @@ $form["tabs"]['ssl'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', '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'), ), 'default' => '', @@ -379,7 +379,7 @@ $form["tabs"]['ssl'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', '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'), ), 'default' => '', diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng index 06efb121a..3057c009a 100644 --- a/interface/web/sites/lib/lang/de_web_domain.lng +++ b/interface/web/sites/lib/lang/de_web_domain.lng @@ -52,10 +52,10 @@ $wb['stats_password_txt'] = 'Webstatistik Passwort'; $wb['ssl_domain_txt'] = 'SSL Domain'; $wb['allow_override_txt'] = 'Allow Override'; $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_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_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. 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_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_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['redirect_error_regex'] = 'Ungültiger Weiterleitungspfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/'; diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index 6f5647b34..0704ee264 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -56,10 +56,10 @@ $wb["client_group_id_txt"] = 'Client'; $wb["stats_password_txt"] = 'Set Webstatistics password'; $wb["allow_override_txt"] = 'Apache AllowOverride'; $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_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'; $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/'; -- GitLab