Skip to content
Snippets Groups Projects
Commit 731a9ecc authored by Jesse Norell's avatar Jesse Norell
Browse files

enforce unique mail_access source/type

parent 04b43daf
No related branches found
No related tags found
No related merge requests found
Showing
with 56 additions and 2 deletions
...@@ -98,7 +98,7 @@ $form["tabs"]['blacklist'] = array ( ...@@ -98,7 +98,7 @@ $form["tabs"]['blacklist'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'SELECT', 'formtype' => 'SELECT',
'default' => 'y', 'default' => 'y',
'value' => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client') 'value' => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')
), ),
'active' => array ( 'active' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
......
...@@ -104,7 +104,7 @@ $form["tabs"]['whitelist'] = array ( ...@@ -104,7 +104,7 @@ $form["tabs"]['whitelist'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'SELECT', 'formtype' => 'SELECT',
'default' => 'y', 'default' => 'y',
'value' => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client') 'value' => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')
), ),
'active' => array ( 'active' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
......
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
$wb['type_txt'] = 'Type'; $wb['type_txt'] = 'Type';
$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
$wb['type_txt'] = 'Type'; $wb['type_txt'] = 'Type';
$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Полето с адреса е празно.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Полето с адреса е празно.';
$wb['type_txt'] = 'Тип'; $wb['type_txt'] = 'Тип';
$wb['limit_mailfilter_txt'] = 'Максималният брой за емайл филтри в твоят профил е достигнат.'; $wb['limit_mailfilter_txt'] = 'Максималният брой за емайл филтри в твоят профил е достигнат.';
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist 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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Полето с адреса е празно.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Полето с адреса е празно.';
$wb['type_txt'] = 'Тип'; $wb['type_txt'] = 'Тип';
$wb['limit_mailfilter_txt'] = 'Максималният брой на емаил филтри за твоя акаунт е достигнат.'; $wb['limit_mailfilter_txt'] = 'Максималният брой на емаил филтри за твоя акаунт е достигнат.';
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist 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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Destinatário está vazio.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Destinatário está vazio.';
$wb['type_txt'] = 'Tipo'; $wb['type_txt'] = 'Tipo';
$wb['limit_mailfilter_txt'] = 'O limite de filtros de email para esta conta foi alcançado.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Endereço de email está vazio.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Endereço de email está vazio.';
$wb['type_txt'] = 'Tipo'; $wb['type_txt'] = 'Tipo';
$wb['limit_mailfilter_txt'] = 'O limite de filtros de email para esta conta foi alcançado.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.';
$wb['type_txt'] = 'Type'; $wb['type_txt'] = 'Type';
$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d\'email pour votre compte a été atteint.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.';
$wb['type_txt'] = 'Type'; $wb['type_txt'] = 'Type';
$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres à mails pour votre compte a été atteint.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ'; $wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Byl dosažen maximální počet e-mail filtrů pro Váš účet.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ'; $wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Byl dosažen maximální počet e-mail filtrů pro Váš účet.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse ist leer.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse ist leer.';
$wb['type_txt'] = 'Typ'; $wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filter für Ihr Konto wurde erreicht.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'E-Mail Adresse ist leer.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'E-Mail Adresse ist leer.';
$wb['type_txt'] = 'Typ'; $wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse er tom.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse er tom.';
$wb['type_txt'] = 'Type'; $wb['type_txt'] = 'Type';
$wb['limit_mailfilter_txt'] = 'Max. antal af e-mail filtere for din konto er nået.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse er tom.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Adresse er tom.';
$wb['type_txt'] = 'Type'; $wb['type_txt'] = 'Type';
$wb['limit_mailfilter_txt'] = 'Max. antal af email filtere for din konto er nået.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή.';
$wb['type_txt'] = 'Τύπος'; $wb['type_txt'] = 'Τύπος';
$wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.'; $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.';
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist 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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή';
$wb['type_txt'] = 'Τύπος'; $wb['type_txt'] = 'Τύπος';
$wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.'; $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.';
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist 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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
$wb['type_txt'] = 'Type'; $wb['type_txt'] = 'Type';
$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.'; $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['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';
...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.'; ...@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
$wb['type_txt'] = 'Type'; $wb['type_txt'] = 'Type';
$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.'; $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['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';
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment