From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 20 Apr 2016 10:58:46 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- interface/web/client/form/client_template.tform.php | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php index 21f8596..a16d21f 100644 --- a/interface/web/client/form/client_template.tform.php +++ b/interface/web/client/form/client_template.tform.php @@ -522,6 +522,12 @@ 'default' => 'n', 'value' => array(0 => 'n', 1 => 'y') ), + 'limit_ssl_letsencrypt' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n', 1 => 'y') + ), 'limit_web_aliasdomain' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', @@ -610,6 +616,12 @@ 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', '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 ( @@ -717,6 +729,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