Commit a265c649 authored by Till Brehm's avatar Till Brehm

Merge branch '3535-forward-with-empty-email-destination' into 'develop'

Resolve "Forward with Empty email destination"

Closes #3535

See merge request !1201
parents dadfdf6a 474cd031
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -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)';
......
......@@ -120,6 +120,19 @@ 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') . '<br />';
} else {
$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') . '<br />';
break;
}
}
$this->dataRecord['destination'] = implode(', ', $targets);
}
//* 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")."<br>";
......
......@@ -11,7 +11,7 @@
</div>
</div>
<div class="form-group">
<label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
<label for="destination" class="col-sm-3 control-label"><em>*</em> {tmpl_var name='destination_txt'}</label>
<div class="col-sm-9"><textarea rows="10" cols="40" name="destination" id="destination" class="form-control">{tmpl_var name='destination'}</textarea></div>
</div>
<div class="form-group">
......
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