Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
2c2fa72c
Commit
2c2fa72c
authored
Sep 21, 2021
by
Jesse Norell
Browse files
installer: missing variable assigments
parent
fa56dcdc
Changes
1
Hide whitespace changes
Inline
Side-by-side
install/lib/installer_base.lib.php
View file @
2c2fa72c
...
...
@@ -1666,6 +1666,9 @@ class installer_base {
wf
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/conf.d/50-user'
,
$content
);
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/conf.d/50-user'
,
0640
);
$config_dir
=
$conf
[
'postfix'
][
'config_dir'
];
$quoted_config_dir
=
preg_quote
(
$config_dir
,
'|'
);
$mail_config
=
$server_ini_array
[
'mail'
];
//* only change postfix config if amavisd is active filter
if
(
$mail_server
&&
$mail_config
[
'content_filter'
]
===
'amavisd'
)
{
...
...
@@ -1717,8 +1720,6 @@ class installer_base {
caselog
(
$command
.
" &> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
}
$config_dir
=
$conf
[
'postfix'
][
'config_dir'
];
// Adding amavis-services to the master.cf file if the service does not already exists
// (just remove the old service definitions and add them again)
$add_amavis
=
$this
->
remove_postfix_service
(
'amavis'
,
'unix'
);
...
...
@@ -1779,6 +1780,9 @@ class installer_base {
$mail_server
=
(
$server_ini_rec
[
'mail_server'
])
?
true
:
false
;
unset
(
$server_ini_rec
);
$config_dir
=
$conf
[
'postfix'
][
'config_dir'
];
$quoted_config_dir
=
preg_quote
(
$config_dir
,
'|'
);
$mail_config
=
$server_ini_array
[
'mail'
];
//* only change postfix config if rspamd is active filter
if
(
$mail_server
&&
$mail_config
[
'content_filter'
]
===
'rspamd'
)
{
...
...
Write
Preview
Supports
Markdown
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