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/client_template.tform.php | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index 21f8596..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',
@@ -517,6 +517,12 @@
'value' => array(0 => 'n', 1 => 'y')
),
'limit_ssl' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'limit_ssl_letsencrypt' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
@@ -612,6 +618,12 @@
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'limit_directive_snippets' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),/*
'default_dnsserver' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
@@ -622,7 +634,7 @@
),
'value' => array(''),
'name' => 'default_dnsserver'
- ),
+ ),*/
'limit_dns_zone' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -692,6 +704,7 @@
'cols' => ''
),
*/
+ /*
'default_dbserver' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
@@ -702,7 +715,7 @@
),
'value' => array(''),
'name' => 'default_dbserver'
- ),
+ ),*/
'limit_database' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -717,6 +730,20 @@
'rows' => '',
'cols' => ''
),
+ 'limit_database_user' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_database_user_error_notint'),
+ ),
+ 'default' => '0',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'limit_database_quota' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
--
Gitblit v1.9.1