From cc08f2c13f7155d6f3fb11afa7661aaec676858a Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Wed, 04 May 2016 03:13:02 -0400
Subject: [PATCH] allow empty servers (Fixes: #3874)
---
interface/web/client/form/client.tform.php | 16 ++++------------
interface/web/client/form/reseller.tform.php | 16 ++++------------
interface/web/client/templates/client_template_edit_limits.htm | 2 +-
3 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 34cdd2e..3a8d4f2 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -594,9 +594,7 @@
'class'=> 'custom_datasource',
'function'=> 'client_servers'
),
- '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'),
@@ -919,9 +917,7 @@
'class'=> 'custom_datasource',
'function'=> 'client_servers'
),
- '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'),
@@ -1141,9 +1137,7 @@
'class'=> 'custom_datasource',
'function'=> 'client_servers'
),
- '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 @@
'class'=> 'custom_datasource',
'function'=> 'client_servers'
),
- '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'),
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'),
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 5e0abb9..6a09bb6 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -138,7 +138,7 @@
</a>
</h4>
</div>
- <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
+ <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail">
<div class="panel-body">
<div class="form-group">
<label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>
--
Gitblit v1.9.1