From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/client/form/reseller.tform.php |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 50d5e74..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'),
@@ -1261,6 +1253,20 @@
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_database_user' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'validators' => array (  0 => array ( 'type' => 'ISINT',
+					'errmsg'=> 'limit_database_user_error_notint'),
+			),
+			'default' => '-1',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '10',
+			'rows'  => '',
+			'cols'  => ''
+		),
 		'limit_cron' => array (
 			'datatype'  => 'INTEGER',
 			'formtype'  => 'TEXT',

--
Gitblit v1.9.1