Merge branch 'master' into 'master'

made email mandatory for client and reseller

See merge request !205

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

@@ -328,9 +328,12 @@ $form["tabs"]['address'] = array (
 				2 => array( 'event' => 'SAVE',
 					'type' => 'TOLOWER')
 			),
-			'validators' => array (  0 => array ( 'type' => 'REGEX',
+			'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'  => '',

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

@@ -322,12 +322,17 @@ $form["tabs"]['address'] = array (
 		'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'  => '',

interface/web/client/lib/lang/ar_client.lng

@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/ar_reseller.lng

@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/bg_client.lng

@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/bg_reseller.lng

@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/br_client.lng

@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/br_reseller.lng

@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/cz_client.lng

@@ -155,5 +155,6 @@ $wb['added_by_txt'] = 'Kdo vytvořil účet';
 $wb['added_date_txt'] = 'Datum vytvoření účtu';
 $wb['parent_client_id_txt'] = 'Přiřazení klienta k distributorovi (prodejci)';
 $wb['none_txt'] = 'Žádný';
+$wb["email_error_empty"] = "Email is empty";
 ?>
 

interface/web/client/lib/lang/cz_reseller.lng

@@ -160,5 +160,8 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Klientské limity';
 $wb['err_msg_master_tpl_set'] = 'Nelze nastavit vlastní limity, pokud chtete nastavit vlatní limity musí být \\"hlavní šablona\\" nastavena na volbu \\"Custom\\".';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
 

interface/web/client/lib/lang/de_client.lng

@@ -177,4 +177,5 @@ $wb['reseller_txt'] = 'Reseller';
 $wb['btn_save_txt'] = 'Speichern';
 $wb['btn_cancel_txt'] = 'Abbrechen';
 $wb['invalid_vat_id'] = 'Die USt.-ID ist ungültig.';
+$wb["email_error_empty"] = "Email ist leer";
 ?>

interface/web/client/lib/lang/de_reseller.lng

@@ -161,4 +161,7 @@ $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
 $wb['invalid_vat_id'] = 'Die USt.-ID ist ungültig.';
+$wb["btn_save_txt"] = "Speichern";
+$wb["btn_cancel_txt"] = "Abbrechen";
+$wb["email_error_empty"] = "Email ist leer";
 ?>

interface/web/client/lib/lang/el_client.lng

@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/el_reseller.lng

@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/en_client.lng

@@ -199,4 +199,5 @@ $wb['reseller_txt'] = 'Reseller';
 $wb['btn_save_txt'] = "Save";
 $wb['btn_cancel_txt'] = "Cancel";
 $wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/en_reseller.lng

@@ -197,4 +197,7 @@ $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than "custom" is selected.';
 $wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/es_client.lng

@@ -158,4 +158,5 @@ $wb['none_txt'] = 'ninguno';
 $wb['limit_database_quota_txt'] = 'Cuota de base de datos';
 $wb['limit_database_quota_error_notint'] = 'Cuota de base de datos debe ser un número.';
 $wb['reseller_txt'] = 'Revendedor';
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/es_reseller.lng

@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'El límite de dominios debe ser un nú
 $wb['limit_domainmodule_txt'] = 'Número máximo de dominios';
 $wb['client_limits_txt'] = 'Límites de Clientes';
 $wb['err_msg_master_tpl_set'] = 'Todas los límites personalizados se ignoran si se selecciona una plantilla principal distinta de \"custom\".';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/fi_client.lng

@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>

interface/web/client/lib/lang/fi_reseller.lng

@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>