Skip to content

Commit 731a9ec

Browse files
committed
enforce unique mail_access source/type
1 parent 04b43da commit 731a9ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+166
-5
lines changed

interface/web/mail/form/mail_blacklist.tform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
'datatype' => 'VARCHAR',
9999
'formtype' => 'SELECT',
100100
'default' => 'y',
101-
'value' => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client')
101+
'value' => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')
102102
),
103103
'active' => array (
104104
'datatype' => 'VARCHAR',

interface/web/mail/form/mail_whitelist.tform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
'datatype' => 'VARCHAR',
105105
'formtype' => 'SELECT',
106106
'default' => 'y',
107-
'value' => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client')
107+
'value' => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')
108108
),
109109
'active' => array (
110110
'datatype' => 'VARCHAR',

interface/web/mail/lib/lang/ar_mail_blacklist.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
77
$wb['type_txt'] = 'Type';
88
$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
99
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10+
$wb['mail_access_unique'] = 'Blacklist Address already in use.';
11+
$wb['client_txt'] = 'Client';
12+
$wb['sender_txt'] = 'Sender';

interface/web/mail/lib/lang/ar_mail_whitelist.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Address is empty.';
77
$wb['type_txt'] = 'Type';
88
$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
99
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10+
$wb['mail_access_unique'] = 'Whitelist Address already in use.';
11+
$wb['client_txt'] = 'Client';
12+
$wb['sender_txt'] = 'Sender';

interface/web/mail/lib/lang/bg_mail_blacklist.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Полето с адреса е празно.';
77
$wb['type_txt'] = 'Тип';
88
$wb['limit_mailfilter_txt'] = 'Максималният брой за емайл филтри в твоят профил е достигнат.';
99
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10+
$wb['mail_access_unique'] = 'Blacklist Address already in use.';
11+
$wb['client_txt'] = 'Client';
12+
$wb['sender_txt'] = 'Sender';

interface/web/mail/lib/lang/bg_mail_whitelist.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Полето с адреса е празно.';
77
$wb['type_txt'] = 'Тип';
88
$wb['limit_mailfilter_txt'] = 'Максималният брой на емаил филтри за твоя акаунт е достигнат.';
99
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10+
$wb['mail_access_unique'] = 'Whitelist Address already in use.';
11+
$wb['client_txt'] = 'Client';
12+
$wb['sender_txt'] = 'Sender';

interface/web/mail/lib/lang/br_mail_blacklist.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Destinatário está vazio.';
77
$wb['type_txt'] = 'Tipo';
88
$wb['limit_mailfilter_txt'] = 'O limite de filtros de email para esta conta foi alcançado.';
99
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10+
$wb['mail_access_unique'] = 'Blacklist Address already in use.';
11+
$wb['client_txt'] = 'Client';
12+
$wb['sender_txt'] = 'Sender';

interface/web/mail/lib/lang/br_mail_whitelist.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'Endereço de email está vazio.';
77
$wb['type_txt'] = 'Tipo';
88
$wb['limit_mailfilter_txt'] = 'O limite de filtros de email para esta conta foi alcançado.';
99
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10+
$wb['mail_access_unique'] = 'Whitelist Address already in use.';
11+
$wb['client_txt'] = 'Client';
12+
$wb['sender_txt'] = 'Sender';

interface/web/mail/lib/lang/ca_mail_blacklist.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.';
77
$wb['type_txt'] = 'Type';
88
$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d\'email pour votre compte a été atteint.';
99
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10+
$wb['mail_access_unique'] = 'Blacklist Address already in use.';
11+
$wb['client_txt'] = 'Client';
12+
$wb['sender_txt'] = 'Sender';

interface/web/mail/lib/lang/ca_mail_whitelist.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ $wb['source_error_notempty'] = 'L\'adresse est vide.';
77
$wb['type_txt'] = 'Type';
88
$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres à mails pour votre compte a été atteint.';
99
$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
10+
$wb['mail_access_unique'] = 'Whitelist Address already in use.';
11+
$wb['client_txt'] = 'Client';
12+
$wb['sender_txt'] = 'Sender';

0 commit comments

Comments
 (0)