From 7bcf62fc4e4b119c68998e2570005695eb5778f8 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 29 Jun 2015 04:00:49 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/client/form/reseller.tform.php |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 822e96a..1b18f3d 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -322,12 +322,17 @@
 		'email' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
-			'filters'   => array( 0 => array( 'event' => 'SAVE',
-					'type' => 'IDNTOASCII'),
-				1 => array( 'event' => 'SHOW',
-					'type' => 'IDNTOUTF8'),
-				2 => array( 'event' => 'SAVE',
-					'type' => 'TOLOWER')
+			'filters'   => array(
+				0 => array( 'event' => 'SAVE','type' => 'IDNTOASCII'),
+				1 => array( 'event' => 'SHOW','type' => 'IDNTOUTF8'),
+				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'),
 			),
 			'default' => '',
 			'value'  => '',

--
Gitblit v1.9.1