From 731a9ecc30ff125f59d04e44be587dd837fe9bdf Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Mon, 25 Jan 2021 16:10:11 -0700
Subject: [PATCH] enforce unique mail_access source/type

---
 interface/web/mail/form/mail_blacklist.tform.php  |  2 +-
 interface/web/mail/form/mail_whitelist.tform.php  |  2 +-
 interface/web/mail/lib/lang/ar_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/ar_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/bg_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/bg_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/br_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/br_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/ca_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/ca_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/cz_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/cz_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/de_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/de_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/dk_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/dk_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/el_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/el_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/en_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/en_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/es_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/es_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/fi_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/fi_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/fr_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/fr_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/hr_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/hr_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/hu_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/hu_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/id_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/id_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/it_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/it_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/ja_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/ja_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/nl_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/nl_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/pl_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/pl_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/pt_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/pt_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/ro_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/ro_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/ru_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/ru_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/se_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/se_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/sk_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/sk_mail_whitelist.lng |  3 +++
 interface/web/mail/lib/lang/tr_mail_blacklist.lng |  3 +++
 interface/web/mail/lib/lang/tr_mail_whitelist.lng |  3 +++
 interface/web/mail/mail_blacklist_edit.php        | 10 ++++++++--
 interface/web/mail/mail_whitelist_edit.php        |  7 ++++++-
 54 files changed, 166 insertions(+), 5 deletions(-)

diff --git a/interface/web/mail/form/mail_blacklist.tform.php b/interface/web/mail/form/mail_blacklist.tform.php
index df29fbd6d9..35272e4cd4 100644
--- a/interface/web/mail/form/mail_blacklist.tform.php
+++ b/interface/web/mail/form/mail_blacklist.tform.php
@@ -98,7 +98,7 @@ $form["tabs"]['blacklist'] = array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => 'y',
-			'value'  => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client')
+			'value'  => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')
 		),
 		'active' => array (
 			'datatype' => 'VARCHAR',
diff --git a/interface/web/mail/form/mail_whitelist.tform.php b/interface/web/mail/form/mail_whitelist.tform.php
index 8b570e449d..01f3d5dab7 100644
--- a/interface/web/mail/form/mail_whitelist.tform.php
+++ b/interface/web/mail/form/mail_whitelist.tform.php
@@ -104,7 +104,7 @@ $form["tabs"]['whitelist'] = array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => 'y',
-			'value'  => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client')
+			'value'  => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')
 		),
 		'active' => array (
 			'datatype' => 'VARCHAR',
diff --git a/interface/web/mail/lib/lang/ar_mail_blacklist.lng b/interface/web/mail/lib/lang/ar_mail_blacklist.lng
index 6173df6a07..81a1b6d279 100644
--- a/interface/web/mail/lib/lang/ar_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ar_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ar_mail_whitelist.lng b/interface/web/mail/lib/lang/ar_mail_whitelist.lng
index 1cdc15564d..f6fda2d6d4 100644
--- a/interface/web/mail/lib/lang/ar_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ar_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/bg_mail_blacklist.lng b/interface/web/mail/lib/lang/bg_mail_blacklist.lng
index 9b04dc85ba..7886cb6fa6 100644
--- a/interface/web/mail/lib/lang/bg_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/bg_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Полето с адреса е празно.';
 $wb['type_txt'] = 'Тип';
 $wb['limit_mailfilter_txt'] = 'Максималният брой за емайл филтри в твоят профил е достигнат.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/bg_mail_whitelist.lng b/interface/web/mail/lib/lang/bg_mail_whitelist.lng
index b17ee61002..deef7ae356 100644
--- a/interface/web/mail/lib/lang/bg_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/bg_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Полето с адреса е празно.';
 $wb['type_txt'] = 'Тип';
 $wb['limit_mailfilter_txt'] = 'Максималният брой на емаил филтри за твоя акаунт е достигнат.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/br_mail_blacklist.lng b/interface/web/mail/lib/lang/br_mail_blacklist.lng
index b72ea94ff3..d33aa6c138 100644
--- a/interface/web/mail/lib/lang/br_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/br_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Destinatário está vazio.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O limite de filtros de email para esta conta foi alcançado.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/br_mail_whitelist.lng b/interface/web/mail/lib/lang/br_mail_whitelist.lng
index 4af2d198b0..f458dbbfb2 100644
--- a/interface/web/mail/lib/lang/br_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/br_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Endereço de email está vazio.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O limite de filtros de email para esta conta foi alcançado.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ca_mail_blacklist.lng b/interface/web/mail/lib/lang/ca_mail_blacklist.lng
index 20d7f65ad2..b423203321 100644
--- a/interface/web/mail/lib/lang/ca_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ca_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d\'email pour votre compte a été atteint.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ca_mail_whitelist.lng b/interface/web/mail/lib/lang/ca_mail_whitelist.lng
index b78c665a10..a85c7939c3 100644
--- a/interface/web/mail/lib/lang/ca_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ca_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres à mails pour votre compte a été atteint.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
index 7348b738af..e95a23a3de 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Byl dosažen maximální počet e-mail filtrů pro Váš účet.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
index 3db1076231..e775902fa8 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Byl dosažen maximální počet e-mail filtrů pro Váš účet.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/de_mail_blacklist.lng b/interface/web/mail/lib/lang/de_mail_blacklist.lng
index 42f1da41d7..7cb69f74bc 100644
--- a/interface/web/mail/lib/lang/de_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse ist leer.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filter für Ihr Konto wurde erreicht.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/de_mail_whitelist.lng b/interface/web/mail/lib/lang/de_mail_whitelist.lng
index fac0efcb8e..04719f2479 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'E-Mail Adresse ist leer.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/dk_mail_blacklist.lng b/interface/web/mail/lib/lang/dk_mail_blacklist.lng
index 79ff300aed..708b10fcb4 100644
--- a/interface/web/mail/lib/lang/dk_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/dk_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse er tom.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Max. antal af e-mail filtere for din konto er nået.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/dk_mail_whitelist.lng b/interface/web/mail/lib/lang/dk_mail_whitelist.lng
index bb671d84f0..2efac1cfa4 100644
--- a/interface/web/mail/lib/lang/dk_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/dk_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse er tom.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Max. antal af email filtere for din konto er nået.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/el_mail_blacklist.lng b/interface/web/mail/lib/lang/el_mail_blacklist.lng
index 003f7462c7..d7b27ff7d7 100644
--- a/interface/web/mail/lib/lang/el_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/el_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή.';
 $wb['type_txt'] = 'Τύπος';
 $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/el_mail_whitelist.lng b/interface/web/mail/lib/lang/el_mail_whitelist.lng
index 5c3a095a24..601a53434f 100644
--- a/interface/web/mail/lib/lang/el_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/el_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή';
 $wb['type_txt'] = 'Τύπος';
 $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/en_mail_blacklist.lng b/interface/web/mail/lib/lang/en_mail_blacklist.lng
index 6173df6a07..81a1b6d279 100644
--- a/interface/web/mail/lib/lang/en_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/en_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/en_mail_whitelist.lng b/interface/web/mail/lib/lang/en_mail_whitelist.lng
index d765aad6a1..351a0574d3 100644
--- a/interface/web/mail/lib/lang/en_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/en_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/es_mail_blacklist.lng b/interface/web/mail/lib/lang/es_mail_blacklist.lng
index 29353365d6..0956e6f5e4 100644
--- a/interface/web/mail/lib/lang/es_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/es_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'La dirección está vacía.';
 $wb['source_txt'] = 'Dirección en la lista negra';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/es_mail_whitelist.lng b/interface/web/mail/lib/lang/es_mail_whitelist.lng
index 8cf5323098..af5362d2e0 100644
--- a/interface/web/mail/lib/lang/es_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/es_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'La dirección está vacía.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'Ha alcanzado en su cuenta el número máx. de filtros de correo.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/fi_mail_blacklist.lng b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
index 59aa88bb7e..f24d79d80f 100644
--- a/interface/web/mail/lib/lang/fi_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Estetty osoite on tyhjä';
 $wb['type_txt'] = 'Tyyppi';
 $wb['limit_mailfilter_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä suodattimia.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/fi_mail_whitelist.lng b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
index b0d7cfe270..c5d317a42c 100644
--- a/interface/web/mail/lib/lang/fi_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Osoite on tyhjä';
 $wb['type_txt'] = 'Tyyppi';
 $wb['limit_mailfilter_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä suodattimia.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/fr_mail_blacklist.lng b/interface/web/mail/lib/lang/fr_mail_blacklist.lng
index 035c228bc6..649d94c1dc 100644
--- a/interface/web/mail/lib/lang/fr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L’adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d’e-mail pour votre compte a été atteint.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/fr_mail_whitelist.lng b/interface/web/mail/lib/lang/fr_mail_whitelist.lng
index ec11e6c674..bc768e77a1 100644
--- a/interface/web/mail/lib/lang/fr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L’adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres à mails pour votre compte a été atteint.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/hr_mail_blacklist.lng b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
index 6842348ef7..3a542e2a82 100644
--- a/interface/web/mail/lib/lang/hr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prazna';
 $wb['type_txt'] = 'Vrsta';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/hr_mail_whitelist.lng b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
index 54879fc79c..4d4643e6da 100644
--- a/interface/web/mail/lib/lang/hr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prazna';
 $wb['type_txt'] = 'Vrsta';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/hu_mail_blacklist.lng b/interface/web/mail/lib/lang/hu_mail_blacklist.lng
index e183910f78..8b97aa868d 100644
--- a/interface/web/mail/lib/lang/hu_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hu_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Cím üres.';
 $wb['type_txt'] = 'Típus';
 $wb['limit_mailfilter_txt'] = 'Nincs több szűrő lehetőség.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/hu_mail_whitelist.lng b/interface/web/mail/lib/lang/hu_mail_whitelist.lng
index 7cda150e54..9db70ac0eb 100644
--- a/interface/web/mail/lib/lang/hu_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hu_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Cím mező üres.';
 $wb['type_txt'] = 'Típus';
 $wb['limit_mailfilter_txt'] = 'Nincs több szűrő lehetőség.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/id_mail_blacklist.lng b/interface/web/mail/lib/lang/id_mail_blacklist.lng
index 2271836a3f..4416ce17e4 100644
--- a/interface/web/mail/lib/lang/id_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/id_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Alamat kosong.';
 $wb['type_txt'] = 'Tipe';
 $wb['limit_mailfilter_txt'] = 'Jumlah maks penyaringan email untuk akun Anda telah tercapai.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/id_mail_whitelist.lng b/interface/web/mail/lib/lang/id_mail_whitelist.lng
index d73c11c39c..7eff21f47c 100644
--- a/interface/web/mail/lib/lang/id_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/id_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Alamat kosong.';
 $wb['type_txt'] = 'Tipe';
 $wb['limit_mailfilter_txt'] = 'Jumlah maks filter email untuk akun Anda telah tercapai.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/it_mail_blacklist.lng b/interface/web/mail/lib/lang/it_mail_blacklist.lng
index bb0c21459b..0b4f16a7c4 100644
--- a/interface/web/mail/lib/lang/it_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/it_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address  vuoto.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters raggiunto per il tuo account.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/it_mail_whitelist.lng b/interface/web/mail/lib/lang/it_mail_whitelist.lng
index e4b151310b..fbc9980fed 100644
--- a/interface/web/mail/lib/lang/it_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/it_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address  vuoto.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters raggiunto per il tuo account.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ja_mail_blacklist.lng b/interface/web/mail/lib/lang/ja_mail_blacklist.lng
index a012e29b16..f20f0377a7 100644
--- a/interface/web/mail/lib/lang/ja_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ja_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'アドレスを指定してください';
 $wb['type_txt'] = '種別';
 $wb['limit_mailfilter_txt'] = 'メールフィルターが最大数に達したため、これ以上追加できません。';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ja_mail_whitelist.lng b/interface/web/mail/lib/lang/ja_mail_whitelist.lng
index 6e903201df..40d9ac32a3 100644
--- a/interface/web/mail/lib/lang/ja_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ja_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'アドレスを指定してください';
 $wb['type_txt'] = '種別';
 $wb['limit_mailfilter_txt'] = 'メールフィルターが最大数に達したため、これ以上追加できません。';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist.lng b/interface/web/mail/lib/lang/nl_mail_blacklist.lng
index 1e4f986b60..e5a16aa6e0 100644
--- a/interface/web/mail/lib/lang/nl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/nl_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adres is niet ingvuld.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Het max. aantal e-mail filters voor uw account is bereikt.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist.lng b/interface/web/mail/lib/lang/nl_mail_whitelist.lng
index 25b594dba3..c91e095768 100644
--- a/interface/web/mail/lib/lang/nl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/nl_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adres is niet ingvuld.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Het max. aantal e-mail filters voor uw account is bereikt.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
index 5558e5f78f..28eba8e32a 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów dla Twojego konta została przekroczona.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
index 9e4f6f686c..f18521fe7f 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta zosała przekroczona.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/pt_mail_blacklist.lng b/interface/web/mail/lib/lang/pt_mail_blacklist.lng
index b51b784e0a..40fc089e0d 100644
--- a/interface/web/mail/lib/lang/pt_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pt_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Endereço em branco.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O número máximo de filtros de correio para a conta foi atingido..';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/pt_mail_whitelist.lng b/interface/web/mail/lib/lang/pt_mail_whitelist.lng
index f82845095f..678fb82570 100644
--- a/interface/web/mail/lib/lang/pt_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pt_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Endereço em Branco.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O número máximo de filtros para a conta foi atingido.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ro_mail_blacklist.lng b/interface/web/mail/lib/lang/ro_mail_blacklist.lng
index cd76a87313..6416e190fe 100644
--- a/interface/web/mail/lib/lang/ro_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ro_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address este goala';
 $wb['type_txt'] = 'Tip';
 $wb['limit_mailfilter_txt'] = 'Numarul maxim de filtre pentru contul dumneavoastra';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ro_mail_whitelist.lng b/interface/web/mail/lib/lang/ro_mail_whitelist.lng
index 8eab139b00..b5ec3d1e92 100644
--- a/interface/web/mail/lib/lang/ro_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ro_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Addresa e necompletata';
 $wb['type_txt'] = 'Tip';
 $wb['limit_mailfilter_txt'] = 'numarul maxim de filtre pe contul dumneavoastra a fost atins';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ru_mail_blacklist.lng b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
index 8c022b693e..33ef780ebd 100644
--- a/interface/web/mail/lib/lang/ru_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Адрес пустой!';
 $wb['type_txt'] = 'Тип';
 $wb['limit_mailfilter_txt'] = 'Максимальное число почтовых фильтров достигнуто.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ru_mail_whitelist.lng b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
index 5a32140a83..0e7a8f95b3 100644
--- a/interface/web/mail/lib/lang/ru_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Адрес пустой!';
 $wb['type_txt'] = 'Тип';
 $wb['limit_mailfilter_txt'] = 'Максимальное число почтовых фильтров достигнуто.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/se_mail_blacklist.lng b/interface/web/mail/lib/lang/se_mail_blacklist.lng
index 08b62e1e7c..82dc7e3fdc 100644
--- a/interface/web/mail/lib/lang/se_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/se_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adressfältet är tomt.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Det maximala antalet epostfilter för ditt konto är uppnått.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/se_mail_whitelist.lng b/interface/web/mail/lib/lang/se_mail_whitelist.lng
index 3f78c08817..d312ec9470 100644
--- a/interface/web/mail/lib/lang/se_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/se_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adressen är tom.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maximala antalet epostfilter för ditt konto är uppnått.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/sk_mail_blacklist.lng b/interface/web/mail/lib/lang/sk_mail_blacklist.lng
index d3b5c0cfe5..277a7bf1ec 100644
--- a/interface/web/mail/lib/lang/sk_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/sk_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdna.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Max. počet e-mailových filtrov pre váš účet je dosiahnutý.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/sk_mail_whitelist.lng b/interface/web/mail/lib/lang/sk_mail_whitelist.lng
index 43ce09e77e..77e44841fd 100644
--- a/interface/web/mail/lib/lang/sk_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/sk_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdna.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Max. počet e-mailových filtrov pre váš účet je dosiahnutý.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/tr_mail_blacklist.lng b/interface/web/mail/lib/lang/tr_mail_blacklist.lng
index b59a9b8b42..7712ca086d 100644
--- a/interface/web/mail/lib/lang/tr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/tr_mail_blacklist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adres boÅŸ olamaz.';
 $wb['type_txt'] = 'Tür';
 $wb['limit_mailfilter_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla e-posta süzgeci sayısına ulaştınız.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/tr_mail_whitelist.lng b/interface/web/mail/lib/lang/tr_mail_whitelist.lng
index 1667809c3e..8159b11edd 100644
--- a/interface/web/mail/lib/lang/tr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/tr_mail_whitelist.lng
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adres boÅŸ olamaz.';
 $wb['type_txt'] = 'Tür';
 $wb['limit_mailfilter_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla e-posta süzgeci sayısına ulaştınız.';
 $wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/mail_blacklist_edit.php b/interface/web/mail/mail_blacklist_edit.php
index 3c8acb505d..e1cb2de66b 100644
--- a/interface/web/mail/mail_blacklist_edit.php
+++ b/interface/web/mail/mail_blacklist_edit.php
@@ -117,9 +117,15 @@ class page_action extends tform_actions {
 				unset($tmp);
 			}
 		}
-		
+
 		if(substr($this->dataRecord['source'], 0, 1) === '@') $this->dataRecord['source'] = substr($this->dataRecord['source'], 1);
-		
+
+		$rec = $app->db->queryOneRecord("SELECT access_id from mail_access WHERE server_id = ? AND source = ? and type = ?", $this->dataRecord["server_id"], $this->dataRecord["source"], $this->dataRecord["type"]);
+		if(is_array($rec) && isset($rec['access_id'])) {
+			$app->tform->errorMessage .= $app->tform->wordbook["mail_access_unique"]."<br>";
+		}
+		unset($rec);
+
 		parent::onSubmit();
 	}
 
diff --git a/interface/web/mail/mail_whitelist_edit.php b/interface/web/mail/mail_whitelist_edit.php
index bfabbe64d2..81a5d15274 100644
--- a/interface/web/mail/mail_whitelist_edit.php
+++ b/interface/web/mail/mail_whitelist_edit.php
@@ -118,9 +118,14 @@ class page_action extends tform_actions {
 			}
 		}
 
-
 		if(substr($this->dataRecord['source'], 0, 1) === '@') $this->dataRecord['source'] = substr($this->dataRecord['source'], 1);
 
+		$rec = $app->db->queryOneRecord("SELECT access_id from mail_access WHERE server_id = ? AND source = ? and type = ?", $this->dataRecord["server_id"], $this->dataRecord["source"], $this->dataRecord["type"]);
+		if(is_array($rec) && isset($rec['access_id'])) {
+			$app->tform->errorMessage .= $app->tform->wordbook["mail_access_unique"]."<br>";
+		}
+		unset($rec);
+
 		parent::onSubmit();
 	}
 
-- 
GitLab