Texts for greylisting

Author: Dominik

install/tpl/mysql-virtual_policy_greylist.cf.master

@@ -1,5 +1,5 @@
 user = {mysql_server_ispconfig_user}
 password = {mysql_server_ispconfig_password}
 dbname = {mysql_server_database}
-query = SELECT 'greylisting' FROM mail_user WHERE email='%s' AND greylisting='y' and server_id = {server_id}
+query = SELECT DISTINCT('greylisting') FROM mail_forwarding mf, mail_user mu where (mf.source='%s' and mf.greylisting='y' and mf.server_id = {server_id}) or (mu.email='%s' and mu.greylisting='y' and mu.server_id = {server_id})
 hosts = {mysql_server_ip}

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

@@ -11,4 +11,5 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre
 $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
 ?>

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

@@ -6,4 +6,5 @@ $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['greylisting_txt'] = 'Enable greylisting';
 ?>

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

@@ -20,7 +20,7 @@ $wb['server_id_txt'] = 'Aerver_id';
 $wb['password_txt'] = 'Password';
 $wb['maildir_txt'] = 'Maildir';
 $wb['postfix_txt'] = 'Enable Receiving';
-$wb["greylisting_txt"] = 'Enable greylisting';
+$wb['greylisting_txt'] = 'Enable greylisting';
 $wb['access_txt'] = 'Enable Access';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- not enabled -';

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

@@ -11,4 +11,5 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre
 $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
 ?>

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

@@ -6,4 +6,5 @@ $wb['limit_mailforward_txt'] = 'Максималният брой за имей
 $wb['duplicate_mailbox_txt'] = 'Вече съществува пощенска кутия с такъв адрес.';
 $wb['domain_txt'] = 'Домейн';
 $wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
 ?>

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

@@ -16,7 +16,7 @@ $wb['server_id_txt'] = 'server_id';
 $wb['password_txt'] = 'парола';
 $wb['maildir_txt'] = 'maildir';
 $wb['postfix_txt'] = 'Разреши получаване';
-$wb["greylisting_txt"] = 'Enable greylisting';
+$wb['greylisting_txt'] = 'Enable greylisting';
 $wb['access_txt'] = 'Разреши достъп';
 $wb['policy_txt'] = 'Спам филтър';
 $wb['no_policy'] = '- забранен -';

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

@@ -11,4 +11,5 @@ $wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endere
 $wb['domain_txt'] = 'Domínio';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
 ?>

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

@@ -6,4 +6,5 @@ $wb['limit_mailforward_txt'] = 'O número máximo de encaminhamentos para sua co
 $wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endereço.';
 $wb['domain_txt'] = 'Domínio';
 $wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
 ?>

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

@@ -16,7 +16,7 @@ $wb['server_id_txt'] = 'Server_id';
 $wb['password_txt'] = 'Senha';
 $wb['maildir_txt'] = 'Maildir';
 $wb['postfix_txt'] = 'Habilitar Recebimento';
-$wb["greylisting_txt"] = 'Enable greylisting';
+$wb['greylisting_txt'] = 'Enable greylisting';
 $wb['access_txt'] = 'Habilitar Acesso';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- desativado -';