Skip to content

Commit a2f2eb3

Browse files
author
Till Brehm
committed
Merge branch '6444-php82' into 'develop'
Fix php 8.2 deprecation warnings, #6444 Closes #6444 See merge request ispconfig/ispconfig3!1684
2 parents 7009315 + 2e8f525 commit a2f2eb3

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -838,9 +838,9 @@ public function process_postfix_config($configfile) {
838838
$addr_cleanup = "'%u'";
839839
foreach (str_split($out[0]) as $delim) {
840840
$recipient_delimiter = $this->db->escape( str_replace('%', '%%', $delim) );
841-
$addr_cleanup = "SUBSTRING_INDEX(${addr_cleanup}, '${recipient_delimiter}', 1)";
841+
$addr_cleanup = "SUBSTRING_INDEX({$addr_cleanup}, '{$recipient_delimiter}', 1)";
842842
}
843-
$no_addr_extension = "CONCAT(${addr_cleanup}, '@%d')";
843+
$no_addr_extension = "CONCAT({$addr_cleanup}, '@%d')";
844844
} else {
845845
$no_addr_extension = "''";
846846
}
@@ -1525,15 +1525,15 @@ public function configure_dovecot() {
15251525
foreach ($options as $value) {
15261526
$value = trim($value);
15271527
if ($value == '') continue;
1528-
if (preg_match("|check_recipient_access\s+proxy:mysql:${quoted_config_dir}/mysql-verify_recipients.cf|", $value)) {
1528+
if (preg_match("|check_recipient_access\s+proxy:mysql:{$quoted_config_dir}/mysql-verify_recipients.cf|", $value)) {
15291529
continue;
15301530
}
15311531
$new_options[] = $value;
15321532
}
15331533
if ($configure_lmtp && (!isset($conf['mail']['content_filter']) || $conf['mail']['content_filter'] === 'amavisd')) {
15341534
for ($i = 0; isset($new_options[$i]); $i++) {
15351535
if ($new_options[$i] == 'reject_unlisted_recipient') {
1536-
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${config_dir}/mysql-verify_recipients.cf"));
1536+
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:{$config_dir}/mysql-verify_recipients.cf"));
15371537
break;
15381538
}
15391539
}
@@ -1712,7 +1712,7 @@ public function configure_amavis() {
17121712
// Check for amavisd -> pure webserver with postfix for mailing without antispam
17131713
if ($conf['amavis']['installed']) {
17141714
$content_filter_service = ($configure_lmtp) ? 'lmtp' : 'amavis';
1715-
$postconf_commands[] = "content_filter = ${content_filter_service}:[127.0.0.1]:10024";
1715+
$postconf_commands[] = "content_filter = {$content_filter_service}:[127.0.0.1]:10024";
17161716
$postconf_commands[] = 'receive_override_options = no_address_mappings';
17171717
$postconf_commands[] = 'address_verify_virtual_transport = smtp:[127.0.0.1]:10025';
17181718
$postconf_commands[] = 'address_verify_transport_maps = static:smtp:[127.0.0.1]:10025';
@@ -1723,15 +1723,15 @@ public function configure_amavis() {
17231723
foreach ($options as $value) {
17241724
$value = trim($value);
17251725
if ($value == '') continue;
1726-
if (preg_match("|check_recipient_access\s+proxy:mysql:${quoted_config_dir}/mysql-verify_recipients.cf|", $value)) {
1726+
if (preg_match("|check_recipient_access\s+proxy:mysql:{$quoted_config_dir}/mysql-verify_recipients.cf|", $value)) {
17271727
continue;
17281728
}
17291729
$new_options[] = $value;
17301730
}
17311731
if ($configure_lmtp) {
17321732
for ($i = 0; isset($new_options[$i]); $i++) {
17331733
if ($new_options[$i] == 'reject_unlisted_recipient') {
1734-
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${config_dir}/mysql-verify_recipients.cf"));
1734+
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:{$config_dir}/mysql-verify_recipients.cf"));
17351735
break;
17361736
}
17371737
}
@@ -1868,7 +1868,7 @@ public function configure_rspamd() {
18681868
if (preg_match('/check_policy_service\s+inet:127.0.0.1:10023/', $value)) {
18691869
continue;
18701870
}
1871-
if (preg_match("|check_recipient_access\s+proxy:mysql:${quoted_config_dir}/mysql-verify_recipients.cf|", $value)) {
1871+
if (preg_match("|check_recipient_access\s+proxy:mysql:{$quoted_config_dir}/mysql-verify_recipients.cf|", $value)) {
18721872
continue;
18731873
}
18741874
$new_options[] = $value;
@@ -1935,10 +1935,10 @@ public function configure_rspamd() {
19351935
);
19361936
foreach ($local_d as $f) {
19371937
$tpl = new tpl();
1938-
if (file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master")) {
1939-
$tpl->newTemplate($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master");
1938+
if (file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_{$f}.master")) {
1939+
$tpl->newTemplate($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_{$f}.master");
19401940
} else {
1941-
$tpl->newTemplate("rspamd_${f}.master");
1941+
$tpl->newTemplate("rspamd_{$f}.master");
19421942
}
19431943

19441944
$tpl->setVar('dkim_path', $mail_config['dkim_path']);
@@ -1950,7 +1950,7 @@ public function configure_rspamd() {
19501950
$tpl->setLoop('local_addrs', $local_addrs);
19511951
}
19521952

1953-
wf("/etc/rspamd/local.d/${f}", $tpl->grab());
1953+
wf("/etc/rspamd/local.d/{$f}", $tpl->grab());
19541954
}
19551955

19561956

@@ -1967,10 +1967,10 @@ public function configure_rspamd() {
19671967
'arc.conf',
19681968
);
19691969
foreach ($local_d as $f) {
1970-
if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master")) {
1971-
exec('cp '.$conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master /etc/rspamd/local.d/${f}");
1970+
if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_{$f}.master")) {
1971+
exec('cp '.$conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_{$f}.master /etc/rspamd/local.d/{$f}");
19721972
} else {
1973-
exec("cp tpl/rspamd_${f}.master /etc/rspamd/local.d/${f}");
1973+
exec("cp tpl/rspamd_{$f}.master /etc/rspamd/local.d/{$f}");
19741974
}
19751975
}
19761976

@@ -1980,10 +1980,10 @@ public function configure_rspamd() {
19801980
'surbl_group.conf',
19811981
);
19821982
foreach ($override_d as $f) {
1983-
if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master")) {
1984-
exec('cp '.$conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master /etc/rspamd/override.d/${f}");
1983+
if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_{$f}.master")) {
1984+
exec('cp '.$conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_{$f}.master /etc/rspamd/override.d/{$f}");
19851985
} else {
1986-
exec("cp tpl/rspamd_${f}.master /etc/rspamd/override.d/${f}");
1986+
exec("cp tpl/rspamd_{$f}.master /etc/rspamd/override.d/{$f}");
19871987
}
19881988
}
19891989

@@ -1995,10 +1995,10 @@ public function configure_rspamd() {
19951995
'spf_whitelist.inc.ispc',
19961996
);
19971997
foreach ($maps_d as $f) {
1998-
if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master")) {
1999-
exec('cp '.$conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master /etc/rspamd/local.d/maps.d/${f}");
1998+
if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_{$f}.master")) {
1999+
exec('cp '.$conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_{$f}.master /etc/rspamd/local.d/maps.d/{$f}");
20002000
} else {
2001-
exec("cp tpl/rspamd_${f}.master /etc/rspamd/local.d/maps.d/${f}");
2001+
exec("cp tpl/rspamd_{$f}.master /etc/rspamd/local.d/maps.d/{$f}");
20022002
}
20032003
}
20042004

0 commit comments

Comments
 (0)