From 75722e70aeefebb0b884e026d49861f2bd014534 Mon Sep 17 00:00:00 2001 From: Dominik Date: Fri, 30 Jan 2015 12:16:44 +0100 Subject: [PATCH] Postgrey Filter configurable --- install/dist/lib/fedora.lib.php | 15 +++++++++++++-- install/dist/lib/opensuse.lib.php | 13 ++++++++++++- install/lib/installer_base.lib.php | 18 +++++++++++++++++- install/sql/incremental/upd_dev_collection.sql | 3 +++ install/tpl/debian_postfix.conf.master | 4 +++- install/tpl/fedora_postfix.conf.master | 4 +++- install/tpl/gentoo_postfix.conf.master | 4 +++- .../mysql-virtual_policy_greylist.cf.master | 5 +++++ install/tpl/opensuse_postfix.conf.master | 4 +++- interface/web/mail/form/mail_alias.tform.php | 6 ++++++ interface/web/mail/form/mail_forward.tform.php | 6 ++++++ interface/web/mail/form/mail_user.tform.php | 6 ++++++ interface/web/mail/lib/lang/ar_mail_user.lng | 1 + interface/web/mail/lib/lang/bg_mail_user.lng | 1 + interface/web/mail/lib/lang/br_mail_user.lng | 1 + interface/web/mail/lib/lang/cz_mail_user.lng | 1 + interface/web/mail/lib/lang/de_mail_user.lng | 1 + interface/web/mail/lib/lang/el_mail_user.lng | 1 + interface/web/mail/lib/lang/en_mail_user.lng | 1 + interface/web/mail/lib/lang/es_mail_user.lng | 1 + interface/web/mail/lib/lang/fi_mail_user.lng | 1 + interface/web/mail/lib/lang/fr_mail_user.lng | 1 + interface/web/mail/lib/lang/hr_mail_user.lng | 1 + interface/web/mail/lib/lang/hu_mail_user.lng | 1 + interface/web/mail/lib/lang/id_mail_user.lng | 1 + interface/web/mail/lib/lang/it_mail_user.lng | 1 + 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/pl_mail_user.lng | 1 + interface/web/mail/lib/lang/pt_mail_user.lng | 1 + interface/web/mail/lib/lang/ro_mail_user.lng | 1 + interface/web/mail/lib/lang/ru_mail_user.lng | 1 + interface/web/mail/lib/lang/se_mail_user.lng | 1 + interface/web/mail/lib/lang/sk_mail_user.lng | 1 + interface/web/mail/lib/lang/tr_mail_user.lng | 1 + .../web/mail/templates/mail_alias_edit.htm | 9 +++++++-- .../web/mail/templates/mail_forward_edit.htm | 9 +++++++-- .../mail/templates/mail_user_mailbox_edit.htm | 8 +++++++- 38 files changed, 124 insertions(+), 13 deletions(-) create mode 100644 install/tpl/mysql-virtual_policy_greylist.cf.master diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 01fd96073b..0355a6aa85 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -152,6 +152,9 @@ class installer_dist extends installer_base { //* 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 @@ class installer_dist extends installer_base { } 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 a278c90ccd..1af8cd8993 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -168,6 +168,9 @@ class installer_dist extends installer_base { //* 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 @@ class installer_dist extends installer_base { 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 9137a41d1c..f58cf01834 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -135,6 +135,7 @@ class installer_base { 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 @@ class installer_base { //* 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 @@ class installer_base { 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,6 +853,10 @@ class installer_base { caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } + + public function configure_postgrey() { + + } 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 aa23b17c64..a7424a61fc 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -34,3 +34,6 @@ TXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600' WHERE `dns_template`.`template_id` = 1; 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 708de6668c..36fd9c7bee 100644 --- a/install/tpl/debian_postfix.conf.master +++ b/install/tpl/debian_postfix.conf.master @@ -12,7 +12,9 @@ inet_protocols=all 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 6a2c97ea9a..0d4f3a558f 100644 --- a/install/tpl/fedora_postfix.conf.master +++ b/install/tpl/fedora_postfix.conf.master @@ -9,7 +9,9 @@ sender_bcc_maps = proxy:mysql:{config_dir}/mysql-virtual_outgoing_bcc.cf 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 8db67c4d9d..c7d8e10c9a 100644 --- a/install/tpl/gentoo_postfix.conf.master +++ b/install/tpl/gentoo_postfix.conf.master @@ -8,7 +8,9 @@ virtual_gid_maps = mysql:/etc/postfix/mysql-virtual_gids.cf 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 0000000000..9f5546fae4 --- /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 mail_user WHERE email='%s' AND greylisting='y' and server_id = {server_id} +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 5afd78ef06..9ee3358c35 100644 --- a/install/tpl/opensuse_postfix.conf.master +++ b/install/tpl/opensuse_postfix.conf.master @@ -11,7 +11,9 @@ sender_bcc_maps = proxy:mysql:{config_dir}/mysql-virtual_outgoing_bcc.cf 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 e20ac765c8..d85989517d 100644 --- a/interface/web/mail/form/mail_alias.tform.php +++ b/interface/web/mail/form/mail_alias.tform.php @@ -124,6 +124,12 @@ $form["tabs"]['alias'] = array ( '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 dcd5e5478e..520f18d54b 100644 --- a/interface/web/mail/form/mail_forward.tform.php +++ b/interface/web/mail/form/mail_forward.tform.php @@ -118,6 +118,12 @@ $form["tabs"]['forward'] = array ( '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 f8f9f44a45..8d5b6257f4 100644 --- a/interface/web/mail/form/mail_user.tform.php +++ b/interface/web/mail/form/mail_user.tform.php @@ -233,6 +233,12 @@ $form["tabs"]['mailuser'] = array( '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_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng index 9574cd334b..fd7281c9ea 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['server_id_txt'] = 'Aerver_id'; $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_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng index 383dcb6afb..3a74332ded 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['server_id_txt'] = 'server_id'; $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_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng index 5ddf6e782e..90fcc72acc 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['server_id_txt'] = 'Server_id'; $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_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng index 555d5d2ce8..5ad87f4db3 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['server_id_txt'] = 'Server_id'; $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_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng index 27ef433686..dca372d08b 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['server_id_txt'] = 'Server ID'; $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_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng index 147874c53f..fa3083dfa9 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['server_id_txt'] = 'Aerver_id'; $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_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng index 65fdf4e9d7..3fed11ea2a 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["server_id_txt"] = 'Aerver_id'; $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_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng index 9f83daecb9..34273c12f1 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['server_id_txt'] = 'Servidor'; $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_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng index e92b7c16f9..1840a30e7a 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['server_id_txt'] = 'Palvelimen tunnus'; $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_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng index 8ed01af532..dc36325a08 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['server_id_txt'] = 'ID Serveur'; $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_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng index 8b3f3d7f79..07d2f7f670 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['server_id_txt'] = 'Aerver_id'; $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_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng index b6da1eff73..66d644a473 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['server_id_txt'] = 'szerver_azonosító'; $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_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng index 4192ec1d76..aa24d4c1f9 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['server_id_txt'] = 'id_server'; $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_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng index dd4bd0abf4..f534282d2a 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['server_id_txt'] = 'server_id'; $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_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng index 8e07a7b844..3ac408090c 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['server_id_txt'] = 'Aerver_id'; $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_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng index 83e15b3299..ce7bc3c6b5 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['server_id_txt'] = 'Server_id'; $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_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng index fab590338f..047ebf685d 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['server_id_txt'] = 'Serwer_id'; $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_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng index 56059a5ec4..518bee4117 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['server_id_txt'] = 'Aerver_id'; $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_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng index a713ea9bcf..1b6d570dcd 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['server_id_txt'] = 'Server_id'; $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_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng index 4ec7718aaa..e8b101eaee 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['server_id_txt'] = 'server_id'; $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_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng index d7d86b7ae6..55a3bfcf35 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['server_id_txt'] = 'server-id'; $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_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng index 3e8d794aaf..6aa241539b 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['server_id_txt'] = 'Server_id'; $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_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng index 067c2c41d6..e7a929c059 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['server_id_txt'] = 'Server_id'; $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 70466528b8..352210b4c1 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'} - +
+ +
+ {tmpl_var name='greylisting'} +
+
@@ -33,4 +38,4 @@
-
\ No newline at end of file + diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm index f0b395414b..4a5a784604 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'} - +
+ +
+ {tmpl_var name='greylisting'} +
+
@@ -31,4 +36,4 @@
-
\ No newline at end of file + diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index b1fd434a42..c8f1883b7a 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -65,6 +65,12 @@ {tmpl_var name='disablesmtp'} +
+ +
+ {tmpl_var name='greylisting'} +
+
@@ -84,4 +90,4 @@
-
\ No newline at end of file +
-- GitLab