Merge branch 'stable-3.1'

Author: Marius Burkard

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'),
 			),
@@ -502,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', 'errmsg'=> 'email_error_isemail'),
 			),
 			'default' => '',
 			'value'  => '',

interface/web/client/form/reseller.tform.php

@@ -328,15 +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'),
-			),
-			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-zA-Z0-9\-]{2,30}$/i',
-					'errmsg'=> 'email_error_isemail'),
+				0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'email_error_isemail'),
+				1 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'email_error_empty'),
 			),
 			'default' => '',
 			'value'  => '',
@@ -505,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', 'errmsg'=> 'paypal_email_error_isemail'),
 			),
 			'default' => '',
 			'value'  => '',

interface/web/mailuser/form/mail_user_cc.tform.php

@@ -68,10 +68,8 @@
 				2 => array( 'event' => 'SAVE',
 					'type' => 'TOLOWER')
 			),
-			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					//'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z\-]{2,10}){0,1}$/i',
-					'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}(,\s*\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,}$/i',
-					'errmsg'=> 'cc_error_isemail'),
+			'validators' => array (
+				0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'cc_error_isemail'),
 			),
 			'default' => '',
 			'value'  => '',

server/plugins-available/mail_plugin.inc.php

@@ -206,7 +206,10 @@ function user_insert($event_name, $data) {
 		}
 
 		//* Send the welcome email message
-		if(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt')) {
+		$domain = explode('@', $data["new"]["email"])[1];
+		if(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt')) {
+			$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt');
+		} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt')) {
 			$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt');
 		} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_en.txt')) {
 			$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_en.txt');