Commit 4039c82a authored by Florian Schaal's avatar Florian Schaal

made email mandatory for client and reseller

parent 3ba59d59
......@@ -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' => '',
......
......@@ -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' => '',
......
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -171,4 +171,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";
?>
......@@ -175,4 +175,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";
?>
......@@ -155,6 +155,7 @@ $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";
?>
......@@ -160,6 +160,9 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
$wb['limit_domainmodule_txt'] = 'Domain module Limit';
$wb['client_limits_txt'] = 'Limiti klijenata';
$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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Tillagd av';
$wb['added_date_txt'] = 'Tillagd datum';
$wb['parent_client_id_txt'] = 'Kund till återförsäljare';
$wb['none_txt'] = 'ingen';
$wb["email_error_empty"] = "Email is empty";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -81,7 +81,7 @@
<label for="fax" class="col-sm-3 control-label">{tmpl_var name='fax_txt'}</label>
<div class="col-sm-9"><input type="text" name="fax" id="fax" value="{tmpl_var name='fax'}" class="form-control" /></div></div>
<div class="form-group">
<label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
<label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}*</label>
<div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
<div class="form-group">
<label for="internet" class="col-sm-3 control-label">{tmpl_var name='internet_txt'}</label>
......@@ -146,4 +146,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/client_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
</div></div>
......@@ -81,7 +81,7 @@
<label for="fax" class="col-sm-3 control-label">{tmpl_var name='fax_txt'}</label>
<div class="col-sm-9"><input type="text" name="fax" id="fax" value="{tmpl_var name='fax'}" class="form-control" /></div></div>
<div class="form-group">
<label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
<label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}*</label>
<div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
<div class="form-group">
<label for="internet" class="col-sm-3 control-label">{tmpl_var name='internet_txt'}</label>
......@@ -146,4 +146,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/reseller_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/reseller_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
</div></div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment