From adb0e74cf23b4d766f29ef3662751cc59046a4cc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 10:09:23 -0400
Subject: [PATCH] Merge branch 'favourite_servers' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-favourite_servers
---
interface/web/client/form/client_template.tform.php | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index dff2dcf..b1fd7d3 100644
--- a/interface/web/client/form/client_template.tform.php
+++ b/interface/web/client/form/client_template.tform.php
@@ -115,6 +115,17 @@
'rows' => '',
'cols' => ''
),
+ 'default_mailserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '0',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => array(''),
+ 'name' => 'default_mailserver'
+ ),
'limit_maildomain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -311,6 +322,17 @@
'rows' => '',
'cols' => ''
),
+ 'default_webserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '0',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => array(''),
+ 'name' => 'default_webserver'
+ ),
'limit_web_domain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -491,6 +513,17 @@
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'default_dnsserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '0',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => array(''),
+ 'name' => 'default_dnsserver'
+ ),
'limit_dns_zone' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -504,6 +537,17 @@
'maxlength' => '10',
'rows' => '',
'cols' => ''
+ ),
+ 'default_slave_dnsserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '0',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => array(''),
+ 'name' => 'default_slave_dnsserver'
),
'limit_dns_slave_zone' => array (
'datatype' => 'INTEGER',
@@ -549,6 +593,17 @@
'cols' => ''
),
*/
+ 'default_dbserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '0',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => array(''),
+ 'name' => 'default_dbserver'
+ ),
'limit_database' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
--
Gitblit v1.9.1