From e2ce43593cf01691ab52d6616b607781234b42fa Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 28 Jan 2010 06:24:06 -0500 Subject: [PATCH] Fixed: FS#1004 - an umlaut in ssl_organisation kills vhost processing --- interface/web/sites/form/web_domain.tform.php | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index 182ce12..d0a31d8 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/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', -- Gitblit v1.9.1