Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
75722e70
Commit
75722e70
authored
Jan 30, 2015
by
Dominik
Committed by
Dominik
Jan 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Postgrey Filter configurable
parent
4452e73b
Changes
38
Hide whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
124 additions
and
13 deletions
+124
-13
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+13
-2
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+12
-1
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+17
-1
install/sql/incremental/upd_dev_collection.sql
install/sql/incremental/upd_dev_collection.sql
+3
-0
install/tpl/debian_postfix.conf.master
install/tpl/debian_postfix.conf.master
+3
-1
install/tpl/fedora_postfix.conf.master
install/tpl/fedora_postfix.conf.master
+3
-1
install/tpl/gentoo_postfix.conf.master
install/tpl/gentoo_postfix.conf.master
+3
-1
install/tpl/mysql-virtual_policy_greylist.cf.master
install/tpl/mysql-virtual_policy_greylist.cf.master
+5
-0
install/tpl/opensuse_postfix.conf.master
install/tpl/opensuse_postfix.conf.master
+3
-1
interface/web/mail/form/mail_alias.tform.php
interface/web/mail/form/mail_alias.tform.php
+6
-0
interface/web/mail/form/mail_forward.tform.php
interface/web/mail/form/mail_forward.tform.php
+6
-0
interface/web/mail/form/mail_user.tform.php
interface/web/mail/form/mail_user.tform.php
+6
-0
interface/web/mail/lib/lang/ar_mail_user.lng
interface/web/mail/lib/lang/ar_mail_user.lng
+1
-0
interface/web/mail/lib/lang/bg_mail_user.lng
interface/web/mail/lib/lang/bg_mail_user.lng
+1
-0
interface/web/mail/lib/lang/br_mail_user.lng
interface/web/mail/lib/lang/br_mail_user.lng
+1
-0
interface/web/mail/lib/lang/cz_mail_user.lng
interface/web/mail/lib/lang/cz_mail_user.lng
+1
-0
interface/web/mail/lib/lang/de_mail_user.lng
interface/web/mail/lib/lang/de_mail_user.lng
+1
-0
interface/web/mail/lib/lang/el_mail_user.lng
interface/web/mail/lib/lang/el_mail_user.lng
+1
-0
interface/web/mail/lib/lang/en_mail_user.lng
interface/web/mail/lib/lang/en_mail_user.lng
+1
-0
interface/web/mail/lib/lang/es_mail_user.lng
interface/web/mail/lib/lang/es_mail_user.lng
+1
-0
interface/web/mail/lib/lang/fi_mail_user.lng
interface/web/mail/lib/lang/fi_mail_user.lng
+1
-0
interface/web/mail/lib/lang/fr_mail_user.lng
interface/web/mail/lib/lang/fr_mail_user.lng
+1
-0
interface/web/mail/lib/lang/hr_mail_user.lng
interface/web/mail/lib/lang/hr_mail_user.lng
+1
-0
interface/web/mail/lib/lang/hu_mail_user.lng
interface/web/mail/lib/lang/hu_mail_user.lng
+1
-0
interface/web/mail/lib/lang/id_mail_user.lng
interface/web/mail/lib/lang/id_mail_user.lng
+1
-0
interface/web/mail/lib/lang/it_mail_user.lng
interface/web/mail/lib/lang/it_mail_user.lng
+1
-0
interface/web/mail/lib/lang/ja_mail_user.lng
interface/web/mail/lib/lang/ja_mail_user.lng
+1
-0
interface/web/mail/lib/lang/nl_mail_user.lng
interface/web/mail/lib/lang/nl_mail_user.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_user.lng
interface/web/mail/lib/lang/pl_mail_user.lng
+1
-0
interface/web/mail/lib/lang/pt_mail_user.lng
interface/web/mail/lib/lang/pt_mail_user.lng
+1
-0
interface/web/mail/lib/lang/ro_mail_user.lng
interface/web/mail/lib/lang/ro_mail_user.lng
+1
-0
interface/web/mail/lib/lang/ru_mail_user.lng
interface/web/mail/lib/lang/ru_mail_user.lng
+1
-0
interface/web/mail/lib/lang/se_mail_user.lng
interface/web/mail/lib/lang/se_mail_user.lng
+1
-0
interface/web/mail/lib/lang/sk_mail_user.lng
interface/web/mail/lib/lang/sk_mail_user.lng
+1
-0
interface/web/mail/lib/lang/tr_mail_user.lng
interface/web/mail/lib/lang/tr_mail_user.lng
+1
-0
interface/web/mail/templates/mail_alias_edit.htm
interface/web/mail/templates/mail_alias_edit.htm
+7
-2
interface/web/mail/templates/mail_forward_edit.htm
interface/web/mail/templates/mail_forward_edit.htm
+7
-2
interface/web/mail/templates/mail_user_mailbox_edit.htm
interface/web/mail/templates/mail_user_mailbox_edit.htm
+7
-1
No files found.
install/dist/lib/fedora.lib.php
View file @
75722e70
...
...
@@ -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
);
...
...
install/dist/lib/opensuse.lib.php
View file @
75722e70
...
...
@@ -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
);
...
...
install/lib/installer_base.lib.php
View file @
75722e70
...
...
@@ -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
;
...
...
install/sql/incremental/upd_dev_collection.sql
View file @
75722e70
...
...
@@ -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`
;
install/tpl/debian_postfix.conf.master
View file @
75722e70
...
...
@@ -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
...
...
install/tpl/fedora_postfix.conf.master
View file @
75722e70
...
...
@@ -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
...
...
install/tpl/gentoo_postfix.conf.master
View file @
75722e70
...
...
@@ -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
...
...
install/tpl/mysql-virtual_policy_greylist.cf.master
0 → 100644
View file @
75722e70
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
install/tpl/opensuse_postfix.conf.master
View file @
75722e70
...
...
@@ -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
...
...
interface/web/mail/form/mail_alias.tform.php
View file @
75722e70
...
...
@@ -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
//#################################
...
...
interface/web/mail/form/mail_forward.tform.php
View file @
75722e70
...
...
@@ -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
//#################################
...
...
interface/web/mail/form/mail_user.tform.php
View file @
75722e70
...
...
@@ -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',
...
...
interface/web/mail/lib/lang/ar_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/bg_mail_user.lng
View file @
75722e70
...
...
@@ -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'
]
=
'- забранен -'
;
...
...
interface/web/mail/lib/lang/br_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/cz_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/de_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/el_mail_user.lng
View file @
75722e70
...
...
@@ -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'
]
=
'- ανενεργή -'
;
...
...
interface/web/mail/lib/lang/en_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/es_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/fi_mail_user.lng
View file @
75722e70
...
...
@@ -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ä -'
;
...
...
interface/web/mail/lib/lang/fr_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/hr_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/hu_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/id_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/it_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/ja_mail_user.lng
View file @
75722e70
...
...
@@ -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'
]
=
'- 利用しない -'
;
...
...
interface/web/mail/lib/lang/nl_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/pl_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/pt_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/ro_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/ru_mail_user.lng
View file @
75722e70
...
...
@@ -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'
]
=
'- не включено -'
;
...
...
interface/web/mail/lib/lang/se_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/lib/lang/sk_mail_user.lng
View file @
75722e70
...
...
@@ -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á -'
;
...
...
interface/web/mail/lib/lang/tr_mail_user.lng
View file @
75722e70
...
...
@@ -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 -'
;
...
...
interface/web/mail/templates/mail_alias_edit.htm
View file @
75722e70
...
...
@@ -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>
interface/web/mail/templates/mail_forward_edit.htm
View file @
75722e70
...
...
@@ -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>
interface/web/mail/templates/mail_user_mailbox_edit.htm
View file @
75722e70
...
...
@@ -65,6 +65,12 @@
{tmpl_var name='disablesmtp'}
</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"
>
...
...
@@ -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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment