From d22277878254cf33fd63ca1bf12b215f4e030a27 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 04 Jan 2016 05:12:49 -0500
Subject: [PATCH] - merged different fixes and updates from foreign branches

---
 interface/web/client/form/reseller.tform.php |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index a858643..1a8b303 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -334,6 +334,10 @@
 				1 => array ( 'type' => 'NOTEMPTY',
 					'errmsg'=> 'email_error_empty'),
 			),
+			'validators' => array (  0 => array ( 'type' => 'REGEX',
+					'regex' => '/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}$/i',
+					'errmsg'=> 'email_error_isemail'),
+			),
 			'default' => '',
 			'value'  => '',
 			'separator' => '',
@@ -384,7 +388,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 +461,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 +479,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 (

--
Gitblit v1.9.1