From c7397a27fa9fde20a82ad98efd721308a0c968d1 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 03 Feb 2015 02:22:11 -0500
Subject: [PATCH] Merge branch 'greylist_filter' into 'master'
---
interface/web/mail/lib/lang/pt_mail_user.lng | 1
interface/web/mail/lib/lang/ru_mail_user.lng | 1
install/tpl/mysql-virtual_policy_greylist.cf.master | 5 +
install/dist/lib/fedora.lib.php | 15 +++
interface/web/mail/lib/lang/pt_mail_forward.lng | 1
interface/web/mail/lib/lang/hu_mail_user.lng | 1
interface/web/mail/lib/lang/br_mail_user.lng | 1
interface/web/mail/lib/lang/ja_mail_forward.lng | 1
interface/web/mail/lib/lang/fr_mail_forward.lng | 1
interface/web/mail/lib/lang/cz_mail_user.lng | 1
interface/web/mail/lib/lang/es_mail_forward.lng | 1
interface/web/mail/lib/lang/pt_mail_alias.lng | 1
interface/web/mail/lib/lang/fr_mail_alias.lng | 1
interface/web/mail/lib/lang/ro_mail_forward.lng | 1
install/lib/installer_base.lib.php | 16 +++
interface/web/mail/lib/lang/br_mail_alias.lng | 1
install/sql/incremental/upd_dev_collection.sql | 3
interface/web/mail/lib/lang/ru_mail_alias.lng | 1
interface/web/mail/lib/lang/se_mail_user.lng | 1
interface/web/mail/lib/lang/pl_mail_alias.lng | 1
interface/web/mail/lib/lang/es_mail_alias.lng | 1
interface/web/mail/lib/lang/bg_mail_forward.lng | 1
interface/web/mail/form/mail_alias.tform.php | 6 +
interface/web/mail/lib/lang/id_mail_user.lng | 1
interface/web/mail/lib/lang/nl_mail_forward.lng | 1
interface/web/mail/lib/lang/se_mail_forward.lng | 1
interface/web/mail/lib/lang/bg_mail_user.lng | 1
interface/web/mail/lib/lang/it_mail_user.lng | 1
interface/web/mail/lib/lang/ro_mail_alias.lng | 1
interface/web/mail/lib/lang/el_mail_forward.lng | 1
interface/web/mail/lib/lang/en_mail_alias.lng | 1
interface/web/mail/lib/lang/nl_mail_alias.lng | 1
interface/web/mail/lib/lang/tr_mail_user.lng | 1
interface/web/mail/lib/lang/cz_mail_forward.lng | 1
interface/web/mail/lib/lang/hu_mail_forward.lng | 1
interface/web/mail/lib/lang/ar_mail_forward.lng | 1
interface/web/mail/lib/lang/fi_mail_forward.lng | 1
interface/web/mail/lib/lang/de_mail_user.lng | 1
interface/web/mail/lib/lang/en_mail_user.lng | 1
interface/web/mail/form/mail_user.tform.php | 6 +
interface/web/mail/lib/lang/br_mail_forward.lng | 1
interface/web/mail/lib/lang/es_mail_user.lng | 1
interface/web/mail/form/mail_forward.tform.php | 6 +
interface/web/mail/lib/lang/el_mail_alias.lng | 1
interface/web/mail/lib/lang/hr_mail_forward.lng | 1
interface/web/mail/lib/lang/ja_mail_alias.lng | 1
interface/web/mail/lib/lang/hu_mail_alias.lng | 1
interface/web/mail/lib/lang/ar_mail_alias.lng | 1
interface/web/mail/lib/lang/sk_mail_alias.lng | 1
install/tpl/debian_postfix.conf.master | 4
interface/web/mail/lib/lang/ru_mail_forward.lng | 1
interface/web/mail/lib/lang/en_mail_forward.lng | 1
interface/web/mail/lib/lang/id_mail_alias.lng | 1
interface/web/mail/lib/lang/tr_mail_forward.lng | 1
install/tpl/opensuse_postfix.conf.master | 4
interface/web/mail/lib/lang/tr_mail_alias.lng | 1
interface/web/mail/lib/lang/bg_mail_alias.lng | 1
interface/web/mail/lib/lang/ar_mail_user.lng | 1
interface/web/mail/lib/lang/de_mail_forward.lng | 1
interface/web/mail/lib/lang/fr_mail_user.lng | 1
interface/web/mail/lib/lang/cz_mail_alias.lng | 1
interface/web/mail/lib/lang/pl_mail_user.lng | 1
interface/web/mail/templates/mail_forward_edit.htm | 9 +
interface/web/mail/lib/lang/fi_mail_alias.lng | 1
interface/web/mail/lib/lang/fi_mail_user.lng | 1
interface/web/mail/lib/lang/ro_mail_user.lng | 1
interface/web/mail/lib/lang/hr_mail_alias.lng | 1
install/dist/lib/opensuse.lib.php | 13 +++
interface/web/mail/lib/lang/pl_mail_forward.lng | 1
interface/web/mail/lib/lang/it_mail_forward.lng | 1
install/tpl/gentoo_postfix.conf.master | 4
interface/web/mail/lib/lang/sk_mail_user.lng | 1
interface/web/mail/lib/lang/sk_mail_forward.lng | 1
interface/web/mail/templates/mail_alias_edit.htm | 9 +
interface/web/mail/lib/lang/it_mail_alias.lng | 1
interface/web/mail/lib/lang/se_mail_alias.lng | 1
install/tpl/fedora_postfix.conf.master | 4
interface/web/mail/lib/lang/ja_mail_user.lng | 1
interface/web/mail/lib/lang/nl_mail_user.lng | 1
interface/web/mail/lib/lang/de_mail_alias.lng | 1
interface/web/mail/templates/mail_user_mailbox_edit.htm | 8 +
interface/web/mail/lib/lang/hr_mail_user.lng | 1
interface/web/mail/lib/lang/el_mail_user.lng | 1
interface/web/mail/lib/lang/id_mail_forward.lng | 1
84 files changed, 167 insertions(+), 14 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 01fd960..0355a6a 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -152,6 +152,9 @@
//* mysql-virtual_relayrecipientmaps.cf
$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
+ //* mysql-virtual_policy_greylist.cf
+ $this->process_postfix_config('mysql-virtual_policy_greylist.cf');
+
//* postfix-dkim
$full_file_name=$config_dir.'/tag_as_originating.re';
if(is_file($full_file_name)) {
@@ -193,13 +196,21 @@
}
unset($rbl_hosts);
unset($server_ini_array);
-
+
+ //* If Postgrey is installed, configure it
+ $greylisting = '';
+ if($conf['postgrey']['installed'] == true) {
+ $greylisting = 'check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
+ }
+
//* These postconf commands will be executed on installation and update
$postconf_placeholders = array('{config_dir}' => $config_dir,
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
'{vmail_userid}' => $cf['vmail_userid'],
'{vmail_groupid}' => $cf['vmail_groupid'],
- '{rbl_list}' => $rbl_list);
+ '{rbl_list}' => $rbl_list,
+ '{greylisting}' => $greylisting,
+ );
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_postfix.conf.master', 'tpl/fedora_postfix.conf.master');
$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index a278c90..1af8cd8 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -168,6 +168,9 @@
//* mysql-virtual_relayrecipientmaps.cf
$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
+ //* mysql-virtual_policy_greylist.cf
+ $this->process_postfix_config('mysql-virtual_policy_greylist.cf');
+
//* postfix-dkim
$full_file_name=$config_dir.'/tag_as_originating.re';
if(is_file($full_file_name)) {
@@ -224,12 +227,20 @@
unset($rbl_hosts);
unset($server_ini_array);
+ //* If Postgrey is installed, configure it
+ $greylisting = '';
+ if($conf['postgrey']['installed'] == true) {
+ $greylisting = 'check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
+ }
+
//* These postconf commands will be executed on installation and update
$postconf_placeholders = array('{config_dir}' => $config_dir,
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
'{vmail_userid}' => $cf['vmail_userid'],
'{vmail_groupid}' => $cf['vmail_groupid'],
- '{rbl_list}' => $rbl_list);
+ '{rbl_list}' => $rbl_list,
+ '{greylisting}' => $greylisting,
+ );
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_postfix.conf.master', 'tpl/opensuse_postfix.conf.master');
$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 9137a41..ae64463 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -135,6 +135,7 @@
if(is_installed('mysql') || is_installed('mysqld')) $conf['mysql']['installed'] = true;
if(is_installed('postfix')) $conf['postfix']['installed'] = true;
+ if(is_installed('postgrey')) $conf['postgrey']['installed'] = true;
if(is_installed('mailman')) $conf['mailman']['installed'] = true;
if(is_installed('apache') || is_installed('apache2') || is_installed('httpd') || is_installed('httpd2')) $conf['apache']['installed'] = true;
if(is_installed('getmail')) $conf['getmail']['installed'] = true;
@@ -704,6 +705,9 @@
//* mysql-virtual_outgoing_bcc.cf
$this->process_postfix_config('mysql-virtual_outgoing_bcc.cf');
+ //* mysql-virtual_policy_greylist.cf
+ $this->process_postfix_config('mysql-virtual_policy_greylist.cf');
+
//* postfix-dkim
$full_file_name=$config_dir.'/tag_as_originating.re';
if(is_file($full_file_name)) copy($full_file_name, $full_file_name.'~');
@@ -742,11 +746,19 @@
unset($rbl_hosts);
unset($server_ini_array);
+ //* If Postgrey is installed, configure it
+ $greylisting = '';
+ if($conf['postgrey']['installed'] == true) {
+ $greylisting = 'check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
+ }
+
$postconf_placeholders = array('{config_dir}' => $config_dir,
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
'{vmail_userid}' => $cf['vmail_userid'],
'{vmail_groupid}' => $cf['vmail_groupid'],
- '{rbl_list}' => $rbl_list);
+ '{rbl_list}' => $rbl_list,
+ '{greylisting}' => $greylisting,
+ );
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_postfix.conf.master', 'tpl/debian_postfix.conf.master');
$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
@@ -841,7 +853,7 @@
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
+
public function configure_saslauthd() {
global $conf;
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index aa23b17..a7424a6 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -34,3 +34,6 @@
ALTER TABLE `mail_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAULT '';
ALTER TABLE `web_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAULT '';
+
+ALTER TABLE `mail_user` ADD `greylisting` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `postfix`;
+ALTER TABLE `mail_forwarding` ADD `greylisting` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `active`;
diff --git a/install/tpl/debian_postfix.conf.master b/install/tpl/debian_postfix.conf.master
index 708de66..36fd9c7 100644
--- a/install/tpl/debian_postfix.conf.master
+++ b/install/tpl/debian_postfix.conf.master
@@ -12,7 +12,9 @@
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}
+smtpd_restriction_classes = greylisting
+greylisting = check_policy_service inet:127.0.0.1:10023
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}
smtpd_use_tls = yes
smtpd_tls_security_level = may
smtpd_tls_cert_file = {config_dir}/smtpd.cert
diff --git a/install/tpl/fedora_postfix.conf.master b/install/tpl/fedora_postfix.conf.master
index 6a2c97e..0d4f3a5 100644
--- a/install/tpl/fedora_postfix.conf.master
+++ b/install/tpl/fedora_postfix.conf.master
@@ -9,7 +9,9 @@
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}
+smtpd_restriction_classes = greylisting
+greylisting = check_policy_service inet:127.0.0.1:10023
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}
smtpd_use_tls = yes
smtpd_tls_security_level = may
smtpd_tls_cert_file = {config_dir}/smtpd.cert
diff --git a/install/tpl/gentoo_postfix.conf.master b/install/tpl/gentoo_postfix.conf.master
index 8db67c4..c7d8e10 100644
--- a/install/tpl/gentoo_postfix.conf.master
+++ b/install/tpl/gentoo_postfix.conf.master
@@ -8,7 +8,9 @@
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}
+smtpd_restriction_classes = greylisting
+greylisting = check_policy_service inet:127.0.0.1:10023
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}
smtpd_use_tls = yes
smtpd_tls_security_level = may
smtpd_tls_cert_file = {config_dir}/smtpd.cert
diff --git a/install/tpl/mysql-virtual_policy_greylist.cf.master b/install/tpl/mysql-virtual_policy_greylist.cf.master
new file mode 100644
index 0000000..8beb7c4
--- /dev/null
+++ b/install/tpl/mysql-virtual_policy_greylist.cf.master
@@ -0,0 +1,5 @@
+user = {mysql_server_ispconfig_user}
+password = {mysql_server_ispconfig_password}
+dbname = {mysql_server_database}
+query = SELECT 'greylisting' FROM (SELECT greylisting, source AS email FROM mail_forwarding WHERE server_id = {server_id} UNION SELECT greylisting, email FROM mail_user WHERE server_id = {server_id}) addresses WHERE addresses.email='%s' AND addresses.greylisting='y'
+hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/opensuse_postfix.conf.master b/install/tpl/opensuse_postfix.conf.master
index 5afd78e..9ee3358 100644
--- a/install/tpl/opensuse_postfix.conf.master
+++ b/install/tpl/opensuse_postfix.conf.master
@@ -11,7 +11,9 @@
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}
+smtpd_restriction_classes = greylisting
+greylisting = check_policy_service inet:127.0.0.1:10023
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}
smtpd_use_tls = yes
smtpd_tls_security_level = may
smtpd_tls_cert_file = {config_dir}/smtpd.cert
diff --git a/interface/web/mail/form/mail_alias.tform.php b/interface/web/mail/form/mail_alias.tform.php
index e20ac76..d859895 100644
--- a/interface/web/mail/form/mail_alias.tform.php
+++ b/interface/web/mail/form/mail_alias.tform.php
@@ -124,6 +124,12 @@
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'greylisting' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(1 => 'y', 0 => 'n')
+ ),
//#################################
// ENDE Datatable fields
//#################################
diff --git a/interface/web/mail/form/mail_forward.tform.php b/interface/web/mail/form/mail_forward.tform.php
index dcd5e54..520f18d 100644
--- a/interface/web/mail/form/mail_forward.tform.php
+++ b/interface/web/mail/form/mail_forward.tform.php
@@ -118,6 +118,12 @@
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'greylisting' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(1 => 'y', 0 => 'n')
+ ),
//#################################
// ENDE Datatable fields
//#################################
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index f8f9f44..8d5b625 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -233,6 +233,12 @@
'default' => 'y',
'value' => array(1 => 'y', 0 => 'n')
),
+ 'greylisting' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(1 => 'y', 0 => 'n')
+ ),
/*
'access' => array (
'datatype' => 'VARCHAR',
diff --git a/interface/web/mail/lib/lang/ar_mail_alias.lng b/interface/web/mail/lib/lang/ar_mail_alias.lng
index 6736396..a0fa3b4 100644
--- a/interface/web/mail/lib/lang/ar_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ar_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/ar_mail_forward.lng b/interface/web/mail/lib/lang/ar_mail_forward.lng
index 3baa601..120ec98 100644
--- a/interface/web/mail/lib/lang/ar_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ar_mail_forward.lng
@@ -6,4 +6,5 @@
$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';
?>
diff --git a/interface/web/mail/lib/lang/ar_mail_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng
index 9574cd3..eae105f 100644
--- a/interface/web/mail/lib/lang/ar_mail_user.lng
+++ b/interface/web/mail/lib/lang/ar_mail_user.lng
@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Password';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Enable Receiving';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Enable Access';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';
diff --git a/interface/web/mail/lib/lang/bg_mail_alias.lng b/interface/web/mail/lib/lang/bg_mail_alias.lng
index 6736396..a0fa3b4 100644
--- a/interface/web/mail/lib/lang/bg_mail_alias.lng
+++ b/interface/web/mail/lib/lang/bg_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/bg_mail_forward.lng b/interface/web/mail/lib/lang/bg_mail_forward.lng
index 2b9b4d4..a104032 100644
--- a/interface/web/mail/lib/lang/bg_mail_forward.lng
+++ b/interface/web/mail/lib/lang/bg_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Вече съществува пощенска кутия с такъв адрес.';
$wb['domain_txt'] = 'Домейн';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng
index 383dcb6..9d6cdbb 100644
--- a/interface/web/mail/lib/lang/bg_mail_user.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'парола';
$wb['maildir_txt'] = 'maildir';
$wb['postfix_txt'] = 'Разреши получаване';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Разреши достъп';
$wb['policy_txt'] = 'Спам филтър';
$wb['no_policy'] = '- забранен -';
diff --git a/interface/web/mail/lib/lang/br_mail_alias.lng b/interface/web/mail/lib/lang/br_mail_alias.lng
index 836885d..fbb4def 100644
--- a/interface/web/mail/lib/lang/br_mail_alias.lng
+++ b/interface/web/mail/lib/lang/br_mail_alias.lng
@@ -11,4 +11,5 @@
$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';
?>
diff --git a/interface/web/mail/lib/lang/br_mail_forward.lng b/interface/web/mail/lib/lang/br_mail_forward.lng
index 4f56fdd..9c1c3cd 100644
--- a/interface/web/mail/lib/lang/br_mail_forward.lng
+++ b/interface/web/mail/lib/lang/br_mail_forward.lng
@@ -6,4 +6,5 @@
$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';
?>
diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng
index 5ddf6e7..2e88eba 100644
--- a/interface/web/mail/lib/lang/br_mail_user.lng
+++ b/interface/web/mail/lib/lang/br_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Senha';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Habilitar Recebimento';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Habilitar Acesso';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- desativado -';
diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng
index 119b849..60eb787 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -11,5 +11,6 @@
$wb['domain_txt'] = 'Doména';
$wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng
index 054650a..a7e0d6c 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward.lng
@@ -6,5 +6,6 @@
$wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
$wb['domain_txt'] = 'Doména';
$wb['source_txt'] = 'Zdrojový e-mail';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index 555d5d2..3f9a590 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Heslo';
$wb['maildir_txt'] = 'E-mailový adresář';
$wb['postfix_txt'] = 'Povolit příjem';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Povolit přístup';
$wb['policy_txt'] = 'Spamový filtr';
$wb['no_policy'] = '- nepovoleno -';
diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng
index c11499e..4115780 100644
--- a/interface/web/mail/lib/lang/de_mail_alias.lng
+++ b/interface/web/mail/lib/lang/de_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'Dieser E-Mail Alias existiert bereits.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Aktiviere Greylisting';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_forward.lng b/interface/web/mail/lib/lang/de_mail_forward.lng
index e0ef8c7..15d0845 100644
--- a/interface/web/mail/lib/lang/de_mail_forward.lng
+++ b/interface/web/mail/lib/lang/de_mail_forward.lng
@@ -7,4 +7,5 @@
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Quell E-Mail Adresse';
$wb['email_error_isemail'] = 'Bitte geben Sie eine gültige E-Mail Adresse an.';
+$wb['greylisting_txt'] = 'Aktiviere greylisting';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 27ef433..33c08b0 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -17,6 +17,7 @@
$wb['password_txt'] = 'Passwort';
$wb['maildir_txt'] = 'E-Mail Verzeichnis';
$wb['postfix_txt'] = 'Aktiviere Empfang';
+$wb['greylisting_txt'] = 'Aktiviere Greylisting';
$wb['access_txt'] = 'Aktiviere Zugriff';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nicht aktiviert -';
diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng
index 7915af4..6902b50 100644
--- a/interface/web/mail/lib/lang/el_mail_alias.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng
index ba16617..e4f2f64 100644
--- a/interface/web/mail/lib/lang/el_mail_forward.lng
+++ b/interface/web/mail/lib/lang/el_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng
index 147874c..0e9db8c 100644
--- a/interface/web/mail/lib/lang/el_mail_user.lng
+++ b/interface/web/mail/lib/lang/el_mail_user.lng
@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Συνθηματικό';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Ενεργοποίηση Λήψης';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Ενεργοποίηση Πρόσβασης';
$wb['policy_txt'] = 'Φίλτρο Spam';
$wb['no_policy'] = '- ανενεργή -';
diff --git a/interface/web/mail/lib/lang/en_mail_alias.lng b/interface/web/mail/lib/lang/en_mail_alias.lng
index bcdafb3..6e9d828 100644
--- a/interface/web/mail/lib/lang/en_mail_alias.lng
+++ b/interface/web/mail/lib/lang/en_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb["duplicate_email_alias_txt"] = 'This email alias does already exist.';
$wb["source_txt"] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/en_mail_forward.lng b/interface/web/mail/lib/lang/en_mail_forward.lng
index 5d371ee..0704650 100644
--- a/interface/web/mail/lib/lang/en_mail_forward.lng
+++ b/interface/web/mail/lib/lang/en_mail_forward.lng
@@ -7,4 +7,5 @@
$wb['domain_txt'] = 'Domain';
$wb["source_txt"] = 'Source Email';
$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index 65fdf4e..86c5b12 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -22,6 +22,7 @@
$wb["password_txt"] = 'Password';
$wb["maildir_txt"] = 'Maildir';
$wb["postfix_txt"] = 'Enable receiving';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb["access_txt"] = 'Enable access';
$wb["policy_txt"] = 'Spamfilter';
$wb["no_policy"] = '- not enabled -';
diff --git a/interface/web/mail/lib/lang/es_mail_alias.lng b/interface/web/mail/lib/lang/es_mail_alias.lng
index 53c5be3..3dd122b 100644
--- a/interface/web/mail/lib/lang/es_mail_alias.lng
+++ b/interface/web/mail/lib/lang/es_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Dominio';
$wb['duplicate_email_alias_txt'] = 'Este alias de correo ya existe.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/es_mail_forward.lng b/interface/web/mail/lib/lang/es_mail_forward.lng
index d27d03e..5c63022 100644
--- a/interface/web/mail/lib/lang/es_mail_forward.lng
+++ b/interface/web/mail/lib/lang/es_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Ya existe un buzón de correo con esta dirección';
$wb['domain_txt'] = 'Dominio';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng
index 9f83dae..21e34c9 100644
--- a/interface/web/mail/lib/lang/es_mail_user.lng
+++ b/interface/web/mail/lib/lang/es_mail_user.lng
@@ -19,6 +19,7 @@
$wb['password_txt'] = 'Contraseña';
$wb['maildir_txt'] = 'Directorio del buzón';
$wb['postfix_txt'] = 'Habilitar la recepción';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Habilitar el acceso';
$wb['policy_txt'] = 'Filtro de spam';
$wb['no_policy'] = '- no habilitado -';
diff --git a/interface/web/mail/lib/lang/fi_mail_alias.lng b/interface/web/mail/lib/lang/fi_mail_alias.lng
index 032bd52..d403806 100755
--- a/interface/web/mail/lib/lang/fi_mail_alias.lng
+++ b/interface/web/mail/lib/lang/fi_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_forward.lng b/interface/web/mail/lib/lang/fi_mail_forward.lng
index acdf7c1..d314bee 100755
--- a/interface/web/mail/lib/lang/fi_mail_forward.lng
+++ b/interface/web/mail/lib/lang/fi_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Edelleenlähetyssääntö osoitteelle on jo olemassa.';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng
index e92b7c1..68ca4d8 100755
--- a/interface/web/mail/lib/lang/fi_mail_user.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user.lng
@@ -15,6 +15,7 @@
$wb['password_txt'] = 'Salasana';
$wb['maildir_txt'] = 'Postikansio';
$wb['postfix_txt'] = 'Salli vastaanotto';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Salli yhteys';
$wb['policy_txt'] = 'Roskapostisuodatin';
$wb['no_policy'] = '- ei käytössä -';
diff --git a/interface/web/mail/lib/lang/fr_mail_alias.lng b/interface/web/mail/lib/lang/fr_mail_alias.lng
index 2b42733..22e7e51 100644
--- a/interface/web/mail/lib/lang/fr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/fr_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domaine';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_forward.lng b/interface/web/mail/lib/lang/fr_mail_forward.lng
index e574dc5..e484cb3 100644
--- a/interface/web/mail/lib/lang/fr_mail_forward.lng
+++ b/interface/web/mail/lib/lang/fr_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Il y a déja une boite email avec cette adresse email';
$wb['domain_txt'] = 'Domaine';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index 8ed01af..1f60f96 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Mot de passe';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Activer la réception';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Activer l\'accès';
$wb['policy_txt'] = 'Filtre antispam';
$wb['no_policy'] = '- inactif -';
diff --git a/interface/web/mail/lib/lang/hr_mail_alias.lng b/interface/web/mail/lib/lang/hr_mail_alias.lng
index 85cfcbd..06dc4cd 100644
--- a/interface/web/mail/lib/lang/hr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/hr_mail_alias.lng
@@ -11,6 +11,7 @@
$wb['domain_txt'] = 'Domena';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_forward.lng b/interface/web/mail/lib/lang/hr_mail_forward.lng
index b43a307..a4026e1 100644
--- a/interface/web/mail/lib/lang/hr_mail_forward.lng
+++ b/interface/web/mail/lib/lang/hr_mail_forward.lng
@@ -6,6 +6,7 @@
$wb['duplicate_mailbox_txt'] = 'Već postoji mailbox sa tom email adresom';
$wb['domain_txt'] = 'Domena';
$wb['source_txt'] = 'Izvorni email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng
index 8b3f3d7..83464c3 100644
--- a/interface/web/mail/lib/lang/hr_mail_user.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user.lng
@@ -19,6 +19,7 @@
$wb['password_txt'] = 'Šifra';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Enable Receiving';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Enable Access';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';
diff --git a/interface/web/mail/lib/lang/hu_mail_alias.lng b/interface/web/mail/lib/lang/hu_mail_alias.lng
index e5c49a1..8eb1ab2 100644
--- a/interface/web/mail/lib/lang/hu_mail_alias.lng
+++ b/interface/web/mail/lib/lang/hu_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/hu_mail_forward.lng b/interface/web/mail/lib/lang/hu_mail_forward.lng
index 679937d..85db8a8 100644
--- a/interface/web/mail/lib/lang/hu_mail_forward.lng
+++ b/interface/web/mail/lib/lang/hu_mail_forward.lng
@@ -6,4 +6,5 @@
$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';
?>
diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng
index b6da1ef..0d1a5a7 100644
--- a/interface/web/mail/lib/lang/hu_mail_user.lng
+++ b/interface/web/mail/lib/lang/hu_mail_user.lng
@@ -15,6 +15,7 @@
$wb['password_txt'] = 'Jelszó';
$wb['maildir_txt'] = 'levelezőláda';
$wb['postfix_txt'] = 'Bejövő engedélyezés';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Hozzáférés engelyezés';
$wb['policy_txt'] = 'Spam szűrő';
$wb['no_policy'] = '- nem engelyézett -';
diff --git a/interface/web/mail/lib/lang/id_mail_alias.lng b/interface/web/mail/lib/lang/id_mail_alias.lng
index f92afe9..8a59091 100644
--- a/interface/web/mail/lib/lang/id_mail_alias.lng
+++ b/interface/web/mail/lib/lang/id_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_forward.lng b/interface/web/mail/lib/lang/id_mail_forward.lng
index 7677e56..f1c1a7d 100644
--- a/interface/web/mail/lib/lang/id_mail_forward.lng
+++ b/interface/web/mail/lib/lang/id_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Sudah ada mailbox untuk alamat email ini';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng
index 4192ec1..896c3c4 100644
--- a/interface/web/mail/lib/lang/id_mail_user.lng
+++ b/interface/web/mail/lib/lang/id_mail_user.lng
@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Kata Sandi';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Dapat Menerima';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Dapat Mengakses';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- tidak diaktifkan -';
diff --git a/interface/web/mail/lib/lang/it_mail_alias.lng b/interface/web/mail/lib/lang/it_mail_alias.lng
index 0bf86d3..60efa1c 100644
--- a/interface/web/mail/lib/lang/it_mail_alias.lng
+++ b/interface/web/mail/lib/lang/it_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_forward.lng b/interface/web/mail/lib/lang/it_mail_forward.lng
index 3baa601..120ec98 100644
--- a/interface/web/mail/lib/lang/it_mail_forward.lng
+++ b/interface/web/mail/lib/lang/it_mail_forward.lng
@@ -6,4 +6,5 @@
$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';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng
index dd4bd0a..3ca8b77 100644
--- a/interface/web/mail/lib/lang/it_mail_user.lng
+++ b/interface/web/mail/lib/lang/it_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'password';
$wb['maildir_txt'] = 'maildir';
$wb['postfix_txt'] = 'Enable Receiving';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Enable Access';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';
diff --git a/interface/web/mail/lib/lang/ja_mail_alias.lng b/interface/web/mail/lib/lang/ja_mail_alias.lng
index d5b9cae..a2adf95 100644
--- a/interface/web/mail/lib/lang/ja_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ja_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/ja_mail_forward.lng b/interface/web/mail/lib/lang/ja_mail_forward.lng
index 53adf76..0575498 100644
--- a/interface/web/mail/lib/lang/ja_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ja_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'このメールアドレス向けのメールボックスが既に存在します。';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/ja_mail_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng
index 8e07a7b..48399ce 100644
--- a/interface/web/mail/lib/lang/ja_mail_user.lng
+++ b/interface/web/mail/lib/lang/ja_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'パスワード';
$wb['maildir_txt'] = 'メールディレクトリ';
$wb['postfix_txt'] = 'メールを受信する';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'アクセスを許可する';
$wb['policy_txt'] = 'スパムフィルター';
$wb['no_policy'] = '- 利用しない -';
diff --git a/interface/web/mail/lib/lang/nl_mail_alias.lng b/interface/web/mail/lib/lang/nl_mail_alias.lng
index 5da82fa..fd1d2de 100644
--- a/interface/web/mail/lib/lang/nl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/nl_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_forward.lng b/interface/web/mail/lib/lang/nl_mail_forward.lng
index b8ec9c4..8b34daa 100644
--- a/interface/web/mail/lib/lang/nl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/nl_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Er is al een mailbox met dit e-mailadres';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index 83e15b3..4a814b0 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Wachtwoord';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Ontvangen inschakelen';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Toegang inschakelen';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- niet ingeschakeld -';
diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng
index ee50d0f..87c2e09 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domena';
$wb['duplicate_email_alias_txt'] = 'Istnieje już taki alias email.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng
index d975d5e..d0d57f2 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa o podanym adresie e-mail';
$wb['domain_txt'] = 'Domena';
$wb['source_txt'] = 'E-mail źródłowy';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
index fab5903..7eb7b6d 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Hasło';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Zezwól na odbiór poczty';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Możliwy dostęp';
$wb['policy_txt'] = 'Filtr spamu';
$wb['no_policy'] = '- brak polityki -';
diff --git a/interface/web/mail/lib/lang/pt_mail_alias.lng b/interface/web/mail/lib/lang/pt_mail_alias.lng
index 6e97678..f869413 100644
--- a/interface/web/mail/lib/lang/pt_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pt_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/pt_mail_forward.lng b/interface/web/mail/lib/lang/pt_mail_forward.lng
index 05a609d..38569af 100644
--- a/interface/web/mail/lib/lang/pt_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pt_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endereço.';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/pt_mail_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng
index 56059a5..7a385d1 100644
--- a/interface/web/mail/lib/lang/pt_mail_user.lng
+++ b/interface/web/mail/lib/lang/pt_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Senha';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Permitir Recepção';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Permitir Acesso';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- desactivado -';
diff --git a/interface/web/mail/lib/lang/ro_mail_alias.lng b/interface/web/mail/lib/lang/ro_mail_alias.lng
index 5e551d0..c67dd5b 100644
--- a/interface/web/mail/lib/lang/ro_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ro_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_forward.lng b/interface/web/mail/lib/lang/ro_mail_forward.lng
index 5a744e1..5bea201 100644
--- a/interface/web/mail/lib/lang/ro_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ro_mail_forward.lng
@@ -6,4 +6,5 @@
$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';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng
index a713ea9..7797195 100644
--- a/interface/web/mail/lib/lang/ro_mail_user.lng
+++ b/interface/web/mail/lib/lang/ro_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Password';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Enable Receiving';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Enable Access';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';
diff --git a/interface/web/mail/lib/lang/ru_mail_alias.lng b/interface/web/mail/lib/lang/ru_mail_alias.lng
index c7fe52d..f5f8c7d 100644
--- a/interface/web/mail/lib/lang/ru_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ru_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/ru_mail_forward.lng b/interface/web/mail/lib/lang/ru_mail_forward.lng
index 360e6a6..fcfbec1 100644
--- a/interface/web/mail/lib/lang/ru_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ru_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Ящик с таким именем уже существует';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index 4ec7718..1032b30 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -15,6 +15,7 @@
$wb['password_txt'] = 'пароль';
$wb['maildir_txt'] = 'maildir';
$wb['postfix_txt'] = 'Разрешить получение';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Включить доступ';
$wb['policy_txt'] = 'Спам-фильтр';
$wb['no_policy'] = '- не включено -';
diff --git a/interface/web/mail/lib/lang/se_mail_alias.lng b/interface/web/mail/lib/lang/se_mail_alias.lng
index e0f6135..bc30c0a 100644
--- a/interface/web/mail/lib/lang/se_mail_alias.lng
+++ b/interface/web/mail/lib/lang/se_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domän';
$wb['duplicate_email_alias_txt'] = 'Detta epostalias finns redan';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_forward.lng b/interface/web/mail/lib/lang/se_mail_forward.lng
index af583f0..627d6eb 100644
--- a/interface/web/mail/lib/lang/se_mail_forward.lng
+++ b/interface/web/mail/lib/lang/se_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Det finns redan ett epostkonto med denna adress';
$wb['domain_txt'] = 'Domän';
$wb['source_txt'] = 'Källadress';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index d7d86b7..119a3df 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'lösenord';
$wb['maildir_txt'] = 'maildir';
$wb['postfix_txt'] = 'Aktivera mottagning';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Aktivera åtkomst';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- ej aktiverat -';
diff --git a/interface/web/mail/lib/lang/sk_mail_alias.lng b/interface/web/mail/lib/lang/sk_mail_alias.lng
index f5f8ace..bfd67e5 100644
--- a/interface/web/mail/lib/lang/sk_mail_alias.lng
+++ b/interface/web/mail/lib/lang/sk_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/sk_mail_forward.lng b/interface/web/mail/lib/lang/sk_mail_forward.lng
index 9ab8070..41444a6 100644
--- a/interface/web/mail/lib/lang/sk_mail_forward.lng
+++ b/interface/web/mail/lib/lang/sk_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Existuje už schránku s touto e-mailovou adresou';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/sk_mail_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng
index 3e8d794..07a90c5 100644
--- a/interface/web/mail/lib/lang/sk_mail_user.lng
+++ b/interface/web/mail/lib/lang/sk_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Heslo';
$wb['maildir_txt'] = 'Mailová záložka';
$wb['postfix_txt'] = 'Povoliť príjem';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Povoliť Prístup';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nepovolená -';
diff --git a/interface/web/mail/lib/lang/tr_mail_alias.lng b/interface/web/mail/lib/lang/tr_mail_alias.lng
index 263ab15..75bac3e 100644
--- a/interface/web/mail/lib/lang/tr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/tr_mail_alias.lng
@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_forward.lng b/interface/web/mail/lib/lang/tr_mail_forward.lng
index de13882..4da6d2f 100644
--- a/interface/web/mail/lib/lang/tr_mail_forward.lng
+++ b/interface/web/mail/lib/lang/tr_mail_forward.lng
@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Bu email adresiyle bir mail kutusu zaten bulunmakta';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
+$wb['greylisting_txt'] = 'Enable greylisting';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng
index 067c2c4..22566b7 100644
--- a/interface/web/mail/lib/lang/tr_mail_user.lng
+++ b/interface/web/mail/lib/lang/tr_mail_user.lng
@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Şifre';
$wb['maildir_txt'] = 'Mail dizini';
$wb['postfix_txt'] = 'Alış Aktif';
+$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Erişim Aktif';
$wb['policy_txt'] = 'Spam filtresi';
$wb['no_policy'] = '- aktif değil -';
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
index 7046652..352210b 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -25,7 +25,12 @@
{tmpl_var name='active'}
</div>
</div>
-
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='greylisting'}
+ </div>
+ </div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="alias">
@@ -33,4 +38,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_alias_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_alias_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
\ No newline at end of file
+ </div></div>
diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm
index f0b3954..4a5a784 100644
--- a/interface/web/mail/templates/mail_forward_edit.htm
+++ b/interface/web/mail/templates/mail_forward_edit.htm
@@ -23,7 +23,12 @@
{tmpl_var name='active'}
</div>
</div>
-
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='greylisting'}
+ </div>
+ </div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="forward">
@@ -31,4 +36,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_forward_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_forward_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
\ No newline at end of file
+ </div></div>
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index b1fd434..c8f1883 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -66,6 +66,12 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='greylisting'}
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='disableimap_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='disableimap'}
@@ -84,4 +90,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_user_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
\ No newline at end of file
+ </div></div>
--
Gitblit v1.9.1