From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
interface/web/admin/form/system_config.tform.php | 137 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 6 deletions(-)
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 8d7008f..3810e52 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -62,7 +62,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+ 'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'dbname_prefix_error_regex'),
),
'default' => '',
@@ -74,7 +74,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+ 'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'dbuser_prefix_error_regex'),
),
'default' => '',
@@ -86,7 +86,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+ 'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'ftpuser_prefix_error_regex'),
),
'default' => '',
@@ -98,7 +98,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+ 'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'shelluser_prefix_error_regex'),
),
'default' => '',
@@ -110,7 +110,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+ 'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'webdavuser_prefix_error_regex'),
),
'default' => '',
@@ -154,11 +154,51 @@
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'vhost_aliasdomains' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'client_username_web_check_disabled' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'backups_include_into_web_quota' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'reseller_can_use_options' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'default_webserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => '',
+ 'name' => 'default_webserver'
+ ),
+ 'default_dbserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => '',
+ 'name' => 'default_dbserver'
),
//#################################
// ENDE Datatable fields
@@ -179,6 +219,24 @@
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'mailbox_show_autoresponder_tab' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'mailbox_show_mail_filter_tab' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'mailbox_show_custom_rules_tab' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
),
'mailboxlist_webmail_link' => array (
'datatype' => 'VARCHAR',
@@ -291,6 +349,53 @@
'default' => '',
'value' => array('' => 'No', 'ssl' => 'SSL', 'tls' => 'STARTTLS')
),
+ 'default_mailserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => '',
+ 'name' => 'default_mailserver'
+ ),
+ //#################################
+ // ENDE Datatable fields
+ //#################################
+ )
+);
+
+$form["tabs"]['dns'] = array (
+ 'title' => "DNS",
+ 'width' => 70,
+ 'template' => "templates/system_config_dns_edit.htm",
+ 'fields' => array (
+ //#################################
+ // Begin Datatable fields
+ //#################################
+ 'default_dnsserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => '',
+ 'name' => 'default_dnsserver'
+ ),
+ 'default_slave_dnsserver' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '1',
+ 'datasource' => array ( 'type' => 'CUSTOM',
+ 'class'=> 'custom_datasource',
+ 'function'=> 'client_servers'
+ ),
+ 'value' => '',
+ 'name' => 'default_slave_dnsserver'
+ ),
//#################################
// ENDE Datatable fields
//#################################
@@ -355,6 +460,12 @@
//#################################
// Begin Datatable fields
//#################################
+ 'company_name' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => ''
+ ),
'dashboard_atom_url_admin' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -449,7 +560,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+ 'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
'errmsg'=> 'customer_no_template_error_regex'),
),
'default' => '',
@@ -487,6 +598,20 @@
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'min_password_length' => array(
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'default' => '5',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
+ 'min_password_strength' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => array('' => 'None', '1' => 'strength_1', '2' => 'strength_2', '3' => 'strength_3', '4' => 'strength_4', '5' => 'strength_5')
+ )
//#################################
// ENDE Datatable fields
//#################################
--
Gitblit v1.9.1