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.tform.php | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index ef8ce33..3a8d4f2 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -328,9 +328,10 @@
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'),
+ 'validators' => array (
+ 0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'email_error_isemail'),
+ 1 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'email_error_empty'),
),
'default' => '',
'value' => '',
@@ -378,7 +379,14 @@
'class' => 'validate_client',
'function' => 'check_vat_id',
'errmsg'=> 'invalid_vat_id'),
- ),
+ ),
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'TRIM'),
+ 1 => array( 'event' => 'SAVE',
+ 'type' => 'TOUPPER'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'NOWHITESPACE')
+ ),
),
'company_id' => array (
'datatype' => 'VARCHAR',
@@ -444,7 +452,14 @@
'width' => '30',
'maxlength' => '255',
'rows' => '',
- 'cols' => ''
+ 'cols' => '',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'TRIM'),
+ 1 => array( 'event' => 'SAVE',
+ 'type' => 'TOUPPER'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'NOWHITESPACE')
+ ),
),
'bank_account_swift' => array (
'datatype' => 'VARCHAR',
@@ -455,7 +470,14 @@
'width' => '30',
'maxlength' => '255',
'rows' => '',
- 'cols' => ''
+ 'cols' => '',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'TRIM'),
+ 1 => array( 'event' => 'SAVE',
+ 'type' => 'TOUPPER'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'NOWHITESPACE')
+ ),
),
'notes' => array (
'datatype' => 'TEXT',
@@ -478,9 +500,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'=> 'email_error_isemail'),
),
'default' => '',
'value' => '',
@@ -573,9 +594,7 @@
'class'=> 'custom_datasource',
'function'=> 'client_servers'
),
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'no_mail_server_error'),
- 1 => array ( 'type' => 'CUSTOM',
+ 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
'class' => 'validate_client',
'function' => 'check_used_servers',
'errmsg'=> 'mail_servers_used'),
@@ -898,9 +917,7 @@
'class'=> 'custom_datasource',
'function'=> 'client_servers'
),
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'no_web_server_error'),
- 1 => array ( 'type' => 'CUSTOM',
+ 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
'class' => 'validate_client',
'function' => 'check_used_servers',
'errmsg'=> 'web_servers_used'),
@@ -1001,6 +1018,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',
@@ -1088,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',
@@ -1108,9 +1137,7 @@
'class'=> 'custom_datasource',
'function'=> 'client_servers'
),
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'no_dns_server_error'),
- 1 => array ( 'type' => 'CUSTOM',
+ 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
'class' => 'validate_client',
'function' => 'check_used_servers',
'errmsg'=> 'dns_servers_used'),
@@ -1205,9 +1232,7 @@
'class'=> 'custom_datasource',
'function'=> 'client_servers'
),
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'no_db_server_error'),
- 1 => array ( 'type' => 'CUSTOM',
+ 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
'class' => 'validate_client',
'function' => 'check_used_servers',
'errmsg'=> 'db_servers_used'),
@@ -1229,6 +1254,20 @@
'rows' => '',
'cols' => ''
),
+ 'limit_database_user' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_database_user_notint'),
+ ),
+ 'default' => '-1',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'limit_database_quota' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
--
Gitblit v1.9.1