From cc65688b3da3e16729a1f73dd50fd975bd1ff741 Mon Sep 17 00:00:00 2001 From: hellkat <hellkat@ispconfig3> Date: Tue, 26 Mar 2013 00:43:51 -0400 Subject: [PATCH] Merged revisions 3845-3876 and 3879-3918 from stable branch. --- interface/web/admin/form/server_config.tform.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 7f7e2b3..0f0c38b 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -317,6 +317,10 @@ 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'default' => '', + 'validators' => array ( 0 => array ( 'type' => 'REGEX', + 'regex' => '/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])(,\s*(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))*$/', + 'errmsg'=> 'rbl_error_regex'), + ), 'value' => '', 'width' => '40', 'maxlength' => '255' @@ -431,8 +435,6 @@ 'default' => 'n', 'value' => array(0 => 'n',1 => 'y') ), - - */ 'vhost_conf_dir' => array( 'datatype' => 'VARCHAR', -- Gitblit v1.9.1