From 49441bdd0f3ff75d5092d5b832b97ea722a66363 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Fri, 01 Jul 2016 03:53:30 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- interface/web/client/form/client_template.tform.php | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php index a16d21f..0fccee9 100644 --- a/interface/web/client/form/client_template.tform.php +++ b/interface/web/client/form/client_template.tform.php @@ -114,7 +114,7 @@ 'maxlength' => '10', 'rows' => '', 'cols' => '' - ), + ),/* 'default_mailserver' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', @@ -125,7 +125,7 @@ ), 'value' => array(''), 'name' => 'default_mailserver' - ), + ),*/ 'limit_maildomain' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', @@ -321,7 +321,7 @@ 'maxlength' => '10', 'rows' => '', 'cols' => '' - ), + ),/* 'default_xmppserver' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', @@ -332,7 +332,7 @@ ), 'value' => '', 'name' => 'default_xmppserver' - ), + ),*/ 'xmpp_servers' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'MULTIPLE', @@ -420,7 +420,7 @@ 'formtype' => 'CHECKBOX', 'default' => 'n', 'value' => array(0 => 'n', 1 => 'y') - ), + ),/* 'default_webserver' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', @@ -431,7 +431,7 @@ ), 'value' => array(''), 'name' => 'default_webserver' - ), + ),*/ 'limit_web_domain' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', @@ -623,7 +623,7 @@ 'formtype' => 'CHECKBOX', 'default' => 'n', 'value' => array(0 => 'n', 1 => 'y') - ), + ),/* 'default_dnsserver' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', @@ -634,7 +634,7 @@ ), 'value' => array(''), 'name' => 'default_dnsserver' - ), + ),*/ 'limit_dns_zone' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', @@ -704,6 +704,7 @@ 'cols' => '' ), */ + /* 'default_dbserver' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', @@ -714,7 +715,7 @@ ), 'value' => array(''), 'name' => 'default_dbserver' - ), + ),*/ 'limit_database' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', -- Gitblit v1.9.1