From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 04 May 2016 07:27:53 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- interface/web/client/form/reseller.tform.php | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index b41cd53..1c60597 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -593,9 +593,7 @@ 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), - 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', - 'errmsg'=> 'no_mail_server_error'), - 1 => array ( 'type' => 'CUSTOM', + 'validators' => array ( 0 => array ( 'type' => 'CUSTOM', 'class' => 'validate_client', 'function' => 'check_used_servers', 'errmsg'=> 'mail_servers_used'), @@ -918,9 +916,7 @@ 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), - 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', - 'errmsg'=> 'no_web_server_error'), - 1 => array ( 'type' => 'CUSTOM', + 'validators' => array ( 0 => array ( 'type' => 'CUSTOM', 'class' => 'validate_client', 'function' => 'check_used_servers', 'errmsg'=> 'web_servers_used'), @@ -1138,9 +1134,7 @@ 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), - 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', - 'errmsg'=> 'no_dns_server_error'), - 1 => array ( 'type' => 'CUSTOM', + 'validators' => array ( 0 => array ( 'type' => 'CUSTOM', 'class' => 'validate_client', 'function' => 'check_used_servers', 'errmsg'=> 'dns_servers_used'), @@ -1238,9 +1232,7 @@ 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), - 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', - 'errmsg'=> 'no_db_server_error'), - 1 => array ( 'type' => 'CUSTOM', + 'validators' => array ( 0 => array ( 'type' => 'CUSTOM', 'class' => 'validate_client', 'function' => 'check_used_servers', 'errmsg'=> 'db_servers_used'), -- Gitblit v1.9.1