Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
f0720ef4
Commit
f0720ef4
authored
Mar 07, 2014
by
Florian Schaal
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
corrected do not change the order in smtpd_recipient_restrictions when updating RBLs
parent
1838fd1c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
server/plugins-available/postfix_server_plugin.inc.php
server/plugins-available/postfix_server_plugin.inc.php
+11
-1
No files found.
server/plugins-available/postfix_server_plugin.inc.php
View file @
f0720ef4
...
...
@@ -109,6 +109,7 @@ class postfix_server_plugin {
}
if
(
$mail_config
[
'realtime_blackhole_list'
]
!=
$old_ini_data
[
'mail'
][
'realtime_blackhole_list'
])
{
$rbl_updated
=
false
;
$rbl_hosts
=
trim
(
preg_replace
(
'/\s+/'
,
''
,
$mail_config
[
'realtime_blackhole_list'
]));
if
(
$rbl_hosts
!=
''
){
$rbl_hosts
=
explode
(
","
,
$rbl_hosts
);
...
...
@@ -117,9 +118,18 @@ class postfix_server_plugin {
foreach
(
$options
as
$key
=>
$value
)
{
if
(
!
preg_match
(
'/reject_rbl_client/'
,
$value
))
{
$new_options
[]
=
$value
;
}
else
{
if
(
is_array
(
$rbl_hosts
)
&&
!
empty
(
$rbl_hosts
)
&&
!
$rbl_updated
){
$rbl_updated
=
true
;
foreach
(
$rbl_hosts
as
$key
=>
$value
)
{
$value
=
trim
(
$value
);
if
(
$value
!=
''
)
$new_options
[]
=
"reject_rbl_client "
.
$value
;
}
}
}
}
if
(
is_array
(
$rbl_hosts
)
&&
!
empty
(
$rbl_hosts
)){
//* first time add rbl-list
if
(
!
$rbl_updated
&&
is_array
(
$rbl_hosts
)
&&
!
empty
(
$rbl_hosts
))
{
foreach
(
$rbl_hosts
as
$key
=>
$value
)
{
$value
=
trim
(
$value
);
if
(
$value
!=
''
)
$new_options
[]
=
"reject_rbl_client "
.
$value
;
...
...
Florian Schaal
@florian030
mentioned in issue
#3054 (closed)
·
Feb 04, 2016
mentioned in issue
#3054 (closed)
mentioned in issue #3054
Toggle commit list
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