From 88078fcdc3a897a8ac2783c82c7d7eae3bcfdab2 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 22 Sep 2020 09:33:47 +0200 Subject: [PATCH 1/5] Validate mail forwarding destination --- interface/web/mail/lib/lang/de_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/en_mail_forward.lng | 2 ++ interface/web/mail/mail_forward_edit.php | 11 +++++++++++ 3 files changed, 15 insertions(+) diff --git a/interface/web/mail/lib/lang/de_mail_forward.lng b/interface/web/mail/lib/lang/de_mail_forward.lng index f10d789671..4825ef7811 100644 --- a/interface/web/mail/lib/lang/de_mail_forward.lng +++ b/interface/web/mail/lib/lang/de_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Die maximale Anzahl an E-Mail Weiterleitungen f $wb['duplicate_mailbox_txt'] = 'Es existiert bereits ein E-Mail Konto mit dieser Adresse.'; $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Quell E-Mail Adresse'; +$wb['destination_error_empty'] = 'Das Weiterleitungsziel darf nicht leer sein.'; +$wb['destination_error_isemail'] = 'Das Weiterleitungsziel enthält mindestens eine ungültige E-Mail-Adresse.'; $wb['email_error_isemail'] = 'Bitte geben Sie eine gültige E-Mail Adresse an.'; $wb['send_as_txt'] = 'Senden als'; $wb['send_as_exp'] = 'Ziel erlauben, die Adresse als Absender zu nutzen (Nur, falls das Ziel intern ist)'; diff --git a/interface/web/mail/lib/lang/en_mail_forward.lng b/interface/web/mail/lib/lang/en_mail_forward.lng index afa3363560..c38e2bf4ff 100644 --- a/interface/web/mail/lib/lang/en_mail_forward.lng +++ b/interface/web/mail/lib/lang/en_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'The max. number of email forwarders for your acc $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address'; $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php index e783ad98a9..51ad19e823 100644 --- a/interface/web/mail/mail_forward_edit.php +++ b/interface/web/mail/mail_forward_edit.php @@ -120,6 +120,17 @@ class page_action extends tform_actions { unset($this->dataRecord["email_local_part"]); unset($this->dataRecord["email_domain"]); + if(trim($this->dataRecord['destination']) == '') { + $app->tform->errorMessage .= $app->tform->lng('destination_error_empty') . '
'; + } else { + $targets = preg_split('/\s*[,;]\s*/', trim($this->dataRecord['destination'])); + foreach($targets as $target) { + if(!$target || filter_var($target, FILTER_VALIDATE_EMAIL) === false) { + $app->tform->errorMessage .= $app->tform->lng('destination_error_isemail') . '
' + } + } + } + //* Check if there is no active mailbox with this address $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = ?", $this->dataRecord["source"]); if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_mailbox_txt")."
"; -- GitLab From 542538fc29839c3faa2ec2de18245156d9b6d972 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 22 Sep 2020 09:35:53 +0200 Subject: [PATCH 2/5] Added missing break --- interface/web/mail/mail_forward_edit.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php index 51ad19e823..9c466bcd9d 100644 --- a/interface/web/mail/mail_forward_edit.php +++ b/interface/web/mail/mail_forward_edit.php @@ -126,7 +126,8 @@ class page_action extends tform_actions { $targets = preg_split('/\s*[,;]\s*/', trim($this->dataRecord['destination'])); foreach($targets as $target) { if(!$target || filter_var($target, FILTER_VALIDATE_EMAIL) === false) { - $app->tform->errorMessage .= $app->tform->lng('destination_error_isemail') . '
' + $app->tform->errorMessage .= $app->tform->lng('destination_error_isemail') . '
'; + break; } } } -- GitLab From a708a96591524e7043613f8758b6b1f6d732ca75 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 22 Sep 2020 09:58:18 +0200 Subject: [PATCH 3/5] Improve handling --- interface/web/mail/mail_forward_edit.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php index 9c466bcd9d..3106dc477c 100644 --- a/interface/web/mail/mail_forward_edit.php +++ b/interface/web/mail/mail_forward_edit.php @@ -123,13 +123,14 @@ class page_action extends tform_actions { if(trim($this->dataRecord['destination']) == '') { $app->tform->errorMessage .= $app->tform->lng('destination_error_empty') . '
'; } else { - $targets = preg_split('/\s*[,;]\s*/', trim($this->dataRecord['destination'])); + $targets = preg_split('/[,;\s]+/', trim($this->dataRecord['destination'])); foreach($targets as $target) { if(!$target || filter_var($target, FILTER_VALIDATE_EMAIL) === false) { $app->tform->errorMessage .= $app->tform->lng('destination_error_isemail') . '
'; break; } } + $this->dataRecord['destination'] = implode(', ', $targets); } //* Check if there is no active mailbox with this address -- GitLab From 52c53e28ad2dc64a3ff556c90d0c82b27d5a02f1 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 22 Sep 2020 10:03:00 +0200 Subject: [PATCH 4/5] Mark destination field as mandatory --- interface/web/mail/templates/mail_forward_edit.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm index a5de2a00b7..128ad4cd75 100644 --- a/interface/web/mail/templates/mail_forward_edit.htm +++ b/interface/web/mail/templates/mail_forward_edit.htm @@ -11,7 +11,7 @@
- +
-- GitLab From 474cd031817cb53836c17c1f2ddd0b30de0c1a61 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 22 Sep 2020 10:05:46 +0200 Subject: [PATCH 5/5] - added new entries to language files --- interface/web/mail/lib/lang/ar_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/bg_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/br_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/ca_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/cz_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/dk_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/el_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/es_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/fi_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/fr_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/hr_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/hu_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/id_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/it_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/ja_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/nl_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/pl_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/pt_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/ro_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/ru_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/se_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/sk_mail_forward.lng | 2 ++ interface/web/mail/lib/lang/tr_mail_forward.lng | 2 ++ 23 files changed, 46 insertions(+) diff --git a/interface/web/mail/lib/lang/ar_mail_forward.lng b/interface/web/mail/lib/lang/ar_mail_forward.lng index 95f9a13495..3f9cfa956b 100644 --- a/interface/web/mail/lib/lang/ar_mail_forward.lng +++ b/interface/web/mail/lib/lang/ar_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/bg_mail_forward.lng b/interface/web/mail/lib/lang/bg_mail_forward.lng index 538d65dc2a..b5c80dd89d 100644 --- a/interface/web/mail/lib/lang/bg_mail_forward.lng +++ b/interface/web/mail/lib/lang/bg_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Вече съществува пощенска $wb['domain_txt'] = 'Домейн'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/br_mail_forward.lng b/interface/web/mail/lib/lang/br_mail_forward.lng index 5a2400e49b..1402019fdc 100644 --- a/interface/web/mail/lib/lang/br_mail_forward.lng +++ b/interface/web/mail/lib/lang/br_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'O limite de encaminhamentos de e-mail para esta $wb['duplicate_mailbox_txt'] = 'Já existe um conta de e-mail idêntica.'; $wb['domain_txt'] = 'Domínio'; $wb['source_txt'] = 'Endereço de e-mail de origem'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Por favor informe um endereço de e-mail válido.'; $wb['send_as_txt'] = 'Enviar como'; $wb['send_as_exp'] = 'Permitir o destino enviar e-mails usando este endereço como origem (se o destino for interno)'; diff --git a/interface/web/mail/lib/lang/ca_mail_forward.lng b/interface/web/mail/lib/lang/ca_mail_forward.lng index c4a6c1ea26..7b8feb1e8f 100644 --- a/interface/web/mail/lib/lang/ca_mail_forward.lng +++ b/interface/web/mail/lib/lang/ca_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Le nombre maximal de transferts d\'email pour vo $wb['duplicate_mailbox_txt'] = 'Il y a déja une boite courriel avec cette adresse courriel'; $wb['domain_txt'] = 'Domaine'; $wb['source_txt'] = 'Source courriel'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng index f471ce97f4..0685fbbd49 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Byl dosažen maximální počet e-mail předáv $wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje'; $wb['domain_txt'] = 'Doména'; $wb['source_txt'] = 'Zdrojový e-mail'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.'; $wb['send_as_txt'] = 'Odeslat jako'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/dk_mail_forward.lng b/interface/web/mail/lib/lang/dk_mail_forward.lng index 144435b7be..ba47d8421d 100644 --- a/interface/web/mail/lib/lang/dk_mail_forward.lng +++ b/interface/web/mail/lib/lang/dk_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Max. antal af e-mail forwarders for din konto er $wb['duplicate_mailbox_txt'] = 'Der er allerede en mailboks med denne e-mail adresse'; $wb['domain_txt'] = 'Domæne'; $wb['source_txt'] = 'Kilde E-mail'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng index 9a316c3018..8893b2fa0f 100644 --- a/interface/web/mail/lib/lang/el_mail_forward.lng +++ b/interface/web/mail/lib/lang/el_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/es_mail_forward.lng b/interface/web/mail/lib/lang/es_mail_forward.lng index 2520e06b39..7ea99ea619 100644 --- a/interface/web/mail/lib/lang/es_mail_forward.lng +++ b/interface/web/mail/lib/lang/es_mail_forward.lng @@ -3,6 +3,8 @@ $wb['active_txt'] = 'Habilitado'; $wb['destination_txt'] = 'Destino del correo'; $wb['domain_txt'] = 'Dominio'; $wb['duplicate_mailbox_txt'] = 'Ya existe un buzón con esta cuenta de correo.'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Por favor, introduzca una dirección de correo válida.'; $wb['email_txt'] = 'Correo'; $wb['greylisting_txt'] = 'Habilitar Lista Gris'; diff --git a/interface/web/mail/lib/lang/fi_mail_forward.lng b/interface/web/mail/lib/lang/fi_mail_forward.lng index 8f201579ec..80d34b5004 100644 --- a/interface/web/mail/lib/lang/fi_mail_forward.lng +++ b/interface/web/mail/lib/lang/fi_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Edelleenlähetyssääntö osoitteelle on jo olem $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/fr_mail_forward.lng b/interface/web/mail/lib/lang/fr_mail_forward.lng index 4c40b19419..fd6d13c6bb 100644 --- a/interface/web/mail/lib/lang/fr_mail_forward.lng +++ b/interface/web/mail/lib/lang/fr_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Le nombre maximal de transferts d’e-mail pour $wb['duplicate_mailbox_txt'] = 'Il y a déja une boîte e-mail avec cette adresse e-mail'; $wb['domain_txt'] = 'Domaine'; $wb['source_txt'] = 'Source Email'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/hr_mail_forward.lng b/interface/web/mail/lib/lang/hr_mail_forward.lng index 3d815230ab..10abd5fe92 100644 --- a/interface/web/mail/lib/lang/hr_mail_forward.lng +++ b/interface/web/mail/lib/lang/hr_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Već postoji mailbox sa tom email adresom'; $wb['domain_txt'] = 'Domena'; $wb['source_txt'] = 'Izvorni email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/hu_mail_forward.lng b/interface/web/mail/lib/lang/hu_mail_forward.lng index 7d46b784ab..c58ae29d31 100644 --- a/interface/web/mail/lib/lang/hu_mail_forward.lng +++ b/interface/web/mail/lib/lang/hu_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/id_mail_forward.lng b/interface/web/mail/lib/lang/id_mail_forward.lng index 3db6c759c5..5f0c788878 100644 --- a/interface/web/mail/lib/lang/id_mail_forward.lng +++ b/interface/web/mail/lib/lang/id_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Sudah ada mailbox untuk alamat email ini'; $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/it_mail_forward.lng b/interface/web/mail/lib/lang/it_mail_forward.lng index e71f91b434..3b5210fba1 100644 --- a/interface/web/mail/lib/lang/it_mail_forward.lng +++ b/interface/web/mail/lib/lang/it_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Raggiunto il numero massimo di forwarders per il $wb['duplicate_mailbox_txt'] = 'Esiste già una casella email per questo indirizzo'; $wb['domain_txt'] = 'Dominio'; $wb['source_txt'] = 'Source Email'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/ja_mail_forward.lng b/interface/web/mail/lib/lang/ja_mail_forward.lng index eb742ce426..f849f7bf18 100644 --- a/interface/web/mail/lib/lang/ja_mail_forward.lng +++ b/interface/web/mail/lib/lang/ja_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'このメールアドレス向けのメールボ $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/nl_mail_forward.lng b/interface/web/mail/lib/lang/nl_mail_forward.lng index 4fa4422178..6bf586a0d2 100644 --- a/interface/web/mail/lib/lang/nl_mail_forward.lng +++ b/interface/web/mail/lib/lang/nl_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Er is al een mailbox met dit e-mailadres'; $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng index 42ba61e373..ce79e10938 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa o podanym adresi $wb['domain_txt'] = 'Domena'; $wb['source_txt'] = 'E-mail źródłowy'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/pt_mail_forward.lng b/interface/web/mail/lib/lang/pt_mail_forward.lng index 784acfa1d3..db67461967 100644 --- a/interface/web/mail/lib/lang/pt_mail_forward.lng +++ b/interface/web/mail/lib/lang/pt_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endere $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/ro_mail_forward.lng b/interface/web/mail/lib/lang/ro_mail_forward.lng index 8e2ed55d74..5e00bf0527 100644 --- a/interface/web/mail/lib/lang/ro_mail_forward.lng +++ b/interface/web/mail/lib/lang/ro_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/ru_mail_forward.lng b/interface/web/mail/lib/lang/ru_mail_forward.lng index 94573623af..6eb11f4f91 100644 --- a/interface/web/mail/lib/lang/ru_mail_forward.lng +++ b/interface/web/mail/lib/lang/ru_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Почтовый ящик с таким имен $wb['domain_txt'] = 'Домен'; $wb['source_txt'] = 'Источник Email'; $wb['greylisting_txt'] = 'Включить серый список (Greylisting)'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Некорректный почтовый адрес.'; $wb['send_as_txt'] = 'Отправить как'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/se_mail_forward.lng b/interface/web/mail/lib/lang/se_mail_forward.lng index d49fd63ace..7b0aa2bc16 100644 --- a/interface/web/mail/lib/lang/se_mail_forward.lng +++ b/interface/web/mail/lib/lang/se_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Det finns redan ett epostkonto med denna adress' $wb['domain_txt'] = 'Domän'; $wb['source_txt'] = 'Källadress'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/sk_mail_forward.lng b/interface/web/mail/lib/lang/sk_mail_forward.lng index 8932dc9ac5..399971261a 100644 --- a/interface/web/mail/lib/lang/sk_mail_forward.lng +++ b/interface/web/mail/lib/lang/sk_mail_forward.lng @@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Existuje už schránku s touto e-mailovou adreso $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Source Email'; $wb['greylisting_txt'] = 'Enable greylisting'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; $wb['send_as_txt'] = 'Send as'; $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)'; diff --git a/interface/web/mail/lib/lang/tr_mail_forward.lng b/interface/web/mail/lib/lang/tr_mail_forward.lng index 2352cd945f..bdcd02a862 100644 --- a/interface/web/mail/lib/lang/tr_mail_forward.lng +++ b/interface/web/mail/lib/lang/tr_mail_forward.lng @@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla e-posta $wb['duplicate_mailbox_txt'] = 'Bu e-posta adresini kullanan bir e-posta kutusu zaten var'; $wb['domain_txt'] = 'Etki Alanı'; $wb['source_txt'] = 'Kaynak E-posta'; +$wb['destination_error_empty'] = 'The destination must not be empty.'; +$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.'; $wb['email_error_isemail'] = 'Lütfen geçerli bir e-posta adresi yazın.'; $wb['send_as_txt'] = 'Gönderen'; $wb['send_as_exp'] = 'Hedef bu adresi kaynak olarak göstererek e-posta gönderebilsin (hedef iç kullanıcı ise)'; -- GitLab