Skip to content

Commit 2c2fa72

Browse files
committed
installer: missing variable assigments
1 parent fa56dcd commit 2c2fa72

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

install/lib/installer_base.lib.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,6 +1666,9 @@ public function configure_amavis() {
16661666
wf($conf['amavis']['config_dir'].'/conf.d/50-user', $content);
16671667
chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
16681668

1669+
$config_dir = $conf['postfix']['config_dir'];
1670+
$quoted_config_dir = preg_quote($config_dir, '|');
1671+
16691672
$mail_config = $server_ini_array['mail'];
16701673
//* only change postfix config if amavisd is active filter
16711674
if($mail_server && $mail_config['content_filter'] === 'amavisd') {
@@ -1717,8 +1720,6 @@ public function configure_amavis() {
17171720
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
17181721
}
17191722

1720-
$config_dir = $conf['postfix']['config_dir'];
1721-
17221723
// Adding amavis-services to the master.cf file if the service does not already exists
17231724
// (just remove the old service definitions and add them again)
17241725
$add_amavis = $this->remove_postfix_service('amavis','unix');
@@ -1779,6 +1780,9 @@ public function configure_rspamd() {
17791780
$mail_server = ($server_ini_rec['mail_server']) ? true : false;
17801781
unset($server_ini_rec);
17811782

1783+
$config_dir = $conf['postfix']['config_dir'];
1784+
$quoted_config_dir = preg_quote($config_dir, '|');
1785+
17821786
$mail_config = $server_ini_array['mail'];
17831787
//* only change postfix config if rspamd is active filter
17841788
if($mail_server && $mail_config['content_filter'] === 'rspamd') {

0 commit comments

Comments
 (0)