From 015dffdc589b396d72092583cc526674f0a9a8d5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 18 Nov 2013 07:36:00 -0500
Subject: [PATCH] Merge remote-tracking branch 'sebj/master' and tidied up merged code
---
interface/web/client/form/reseller.tform.php | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index fad0cd7..4c871dd 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -508,6 +508,24 @@
),
'value' => ''
),
+ 'mail_servers' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'MULTIPLE',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND {AUTHSQL} ORDER BY server_name',
+ 'keyfield'=> 'server_id',
+ 'valuefield'=> 'server_name'
+ ),
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'no_mail_server_error'),
+ 1 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_client',
+ 'function' => 'check_used_servers',
+ 'errmsg'=> 'mail_servers_used'),
+ ),
+ 'value' => ''
+ ),
'limit_maildomain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -715,6 +733,25 @@
),
'value' => ''
),
+ 'web_servers' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'MULTIPLE',
+ 'separator' => ',',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT server_id,server_name FROM server WHERE web_server = 1 AND {AUTHSQL} ORDER BY server_name',
+ 'keyfield'=> 'server_id',
+ 'valuefield'=> 'server_name'
+ ),
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'no_web_server_error'),
+ 1 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_client',
+ 'function' => 'check_used_servers',
+ 'errmsg'=> 'web_servers_used'),
+ ),
+ 'value' => ''
+ ),
'limit_web_domain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -898,6 +935,24 @@
),
'value' => ''
),
+ 'dns_servers' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'MULTIPLE',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
+ 'keyfield'=> 'server_id',
+ 'valuefield'=> 'server_name'
+ ),
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'no_dns_server_error'),
+ 1 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_client',
+ 'function' => 'check_used_servers',
+ 'errmsg'=> 'dns_servers_used'),
+ ),
+ 'value' => ''
+ ),
'limit_dns_zone' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -979,6 +1034,24 @@
),
'value' => ''
),
+ 'db_servers' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'MULTIPLE',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT server_id,server_name FROM server WHERE db_server = 1 AND {AUTHSQL} ORDER BY server_name',
+ 'keyfield'=> 'server_id',
+ 'valuefield'=> 'server_name'
+ ),
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'no_db_server_error'),
+ 1 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_client',
+ 'function' => 'check_used_servers',
+ 'errmsg'=> 'db_servers_used'),
+ ),
+ 'value' => ''
+ ),
'limit_database' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
--
Gitblit v1.9.1