From 668c8e0e58d966943620b870453a2ae2e236b922 Mon Sep 17 00:00:00 2001 From: ftimme Date: Tue, 10 Apr 2012 09:58:48 +0000 Subject: [PATCH] - Fixed FS#2129. --- interface/web/mail/lib/lang/de_mail_alias.lng | 3 ++- interface/web/mail/lib/lang/en_mail_alias.lng | 3 ++- interface/web/mail/mail_alias_edit.php | 9 +++++++++ interface/web/sites/lib/lang/de_web_domain.lng | 2 ++ interface/web/sites/lib/lang/en_web_domain.lng | 2 ++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng index acb036626..519044656 100644 --- a/interface/web/mail/lib/lang/de_mail_alias.lng +++ b/interface/web/mail/lib/lang/de_mail_alias.lng @@ -7,6 +7,7 @@ $wb['email_error_unique'] = 'Doppelte E-Mail-Adresse.'; $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.'; $wb['destination_error_isemail'] = 'Zieladresse ist ungültig.'; $wb['limit_mailalias_txt'] = 'Die maximale Anzahl an E-Mail-Aliassen für ihr Konto wurde erreicht.'; -$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine Mailbox mit dieser E-Mail-Adresse'; +$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine Mailbox mit dieser E-Mail-Adresse.'; $wb['domain_txt'] = 'Domain'; +$wb["duplicate_email_alias_txt"] = 'Dieser E-Mail-Alias existiert bereits.'; ?> diff --git a/interface/web/mail/lib/lang/en_mail_alias.lng b/interface/web/mail/lib/lang/en_mail_alias.lng index f1c715a05..02f753c49 100644 --- a/interface/web/mail/lib/lang/en_mail_alias.lng +++ b/interface/web/mail/lib/lang/en_mail_alias.lng @@ -7,6 +7,7 @@ $wb["email_error_unique"] = 'Duplicate Emailaddress.'; $wb["no_domain_perm"] = "You have no permission for this domain."; $wb["destination_error_isemail"] = 'Destination Emailaddress is invalid.'; $wb["limit_mailalias_txt"] = 'The max. number of email aliases for your account is reached.'; -$wb["duplicate_mailbox_txt"] = 'There is already a mailbox with this email address'; +$wb["duplicate_mailbox_txt"] = 'There is already a mailbox with this email address.'; $wb['domain_txt'] = 'Domain'; +$wb["duplicate_email_alias_txt"] = 'This email alias does already exist.'; ?> diff --git a/interface/web/mail/mail_alias_edit.php b/interface/web/mail/mail_alias_edit.php index b7140b03d..ebc3a8762 100644 --- a/interface/web/mail/mail_alias_edit.php +++ b/interface/web/mail/mail_alias_edit.php @@ -126,6 +126,15 @@ class page_action extends tform_actions { if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_mailbox_txt")."
"; unset($tmp); + //* Check if email alias exists + if($this->id > 0) { + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE source = '".$app->db->quote($this->dataRecord["source"])."' AND destination = '".$app->db->quote($this->dataRecord["destination"])."' AND forwarding_id != ".$this->id); + } else { + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE source = '".$app->db->quote($this->dataRecord["source"])."' AND destination = '".$app->db->quote($this->dataRecord["destination"])."'"); + } + if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_email_alias_txt")."
"; + unset($tmp); + parent::onSubmit(); } diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng index 2cfebf216..a2b31c7a4 100644 --- a/interface/web/sites/lib/lang/de_web_domain.lng +++ b/interface/web/sites/lib/lang/de_web_domain.lng @@ -89,4 +89,6 @@ $wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine pos $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.'; $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.'; $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.'; +$wb["hd_quota_error_regex"] = 'Harddisk Quota ist ungültig.'; +$wb["traffic_quota_error_regex"] = 'Traffic Quota ist ungültig.'; ?> diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index b7fcc679f..3556cd30d 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -89,4 +89,6 @@ $wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive $wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.'; $wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; $wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.'; +$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.'; ?> \ No newline at end of file -- GitLab