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/reseller.tform.php | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index daba140..b41cd53 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -328,11 +328,8 @@
2 => array( 'event' => 'SAVE','type' => 'TOLOWER')
),
'validators' => array (
- 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
- 'errmsg'=> 'email_error_isemail'),
- 1 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'email_error_empty'),
+ 0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'email_error_isemail'),
+ 1 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'email_error_empty'),
),
'default' => '',
'value' => '',
@@ -384,7 +381,9 @@
'filters' => array( 0 => array( 'event' => 'SAVE',
'type' => 'TRIM'),
1 => array( 'event' => 'SAVE',
- 'type' => 'TOUPPER')
+ 'type' => 'TOUPPER'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'NOWHITESPACE')
),
),
'company_id' => array (
@@ -455,7 +454,9 @@
'filters' => array( 0 => array( 'event' => 'SAVE',
'type' => 'TRIM'),
1 => array( 'event' => 'SAVE',
- 'type' => 'TOUPPER')
+ 'type' => 'TOUPPER'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'NOWHITESPACE')
),
),
'bank_account_swift' => array (
@@ -471,7 +472,9 @@
'filters' => array( 0 => array( 'event' => 'SAVE',
'type' => 'TRIM'),
1 => array( 'event' => 'SAVE',
- 'type' => 'TOUPPER')
+ 'type' => 'TOUPPER'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'NOWHITESPACE')
),
),
'notes' => array (
@@ -495,9 +498,8 @@
2 => array( 'event' => 'SAVE',
'type' => 'TOLOWER')
),
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
- 'errmsg'=> 'paypal_email_error_isemail'),
+ 'validators' => array (
+ 0 => array ( 'type' => 'ISEMAIL', 'allowempty' => 'y', 'errmsg'=> 'paypal_email_error_isemail'),
),
'default' => '',
'value' => '',
@@ -584,6 +586,7 @@
'mail_servers' => array (
'datatype' => 'INTEGER',
'formtype' => 'MULTIPLE',
+ 'separator' => ',',
'default' => '1',
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND {AUTHSQL} ORDER BY server_name',
@@ -1016,6 +1019,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',
@@ -1102,6 +1111,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',
@@ -1116,6 +1131,7 @@
'dns_servers' => array (
'datatype' => 'INTEGER',
'formtype' => 'MULTIPLE',
+ 'separator' => ',',
'default' => '1',
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
@@ -1215,6 +1231,7 @@
'db_servers' => array (
'datatype' => 'INTEGER',
'formtype' => 'MULTIPLE',
+ 'separator' => ',',
'default' => '1',
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT server_id,server_name FROM server WHERE db_server = 1 AND {AUTHSQL} ORDER BY server_name',
@@ -1244,6 +1261,20 @@
'rows' => '',
'cols' => ''
),
+ 'limit_database_user' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_database_user_error_notint'),
+ ),
+ 'default' => '-1',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'limit_cron' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
--
Gitblit v1.9.1