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.tform.php | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index eab4e02..34cdd2e 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -329,9 +329,7 @@
'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'),
+ 0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'email_error_isemail'),
1 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'email_error_empty'),
),
@@ -385,7 +383,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 (
@@ -456,7 +456,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 (
@@ -472,7 +474,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 (
@@ -496,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' => '',
@@ -1019,6 +1022,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',
@@ -1104,6 +1113,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 (
@@ -1247,6 +1262,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