Skip to content

Commit a36506f

Browse files
author
Till Brehm
committed
Merge branch 'php8-misc-fixes' into 'develop'
PHP 8.x Misc fixes See merge request ispconfig/ispconfig3!1726
2 parents 2077c92 + 0693e8b commit a36506f

File tree

3 files changed

+44
-12
lines changed

3 files changed

+44
-12
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,7 +1136,7 @@ public function configure_postfix($options = '') {
11361136

11371137
//* If there are RBL's defined, format the list and add them to smtp_recipient_restrictions to prevent removal after an update
11381138
$rbl_list = '';
1139-
if (@isset($server_ini_array['mail']['realtime_blackhole_list']) && $server_ini_array['mail']['realtime_blackhole_list'] != '') {
1139+
if(@isset($server_ini_array['mail']['realtime_blackhole_list']) && $server_ini_array['mail']['realtime_blackhole_list'] != '') {
11401140
$rbl_hosts = explode(",", str_replace(" ", "", $server_ini_array['mail']['realtime_blackhole_list']));
11411141
foreach ($rbl_hosts as $key => $value) {
11421142
$rbl_list .= ", reject_rbl_client ". $value;
@@ -1146,13 +1146,13 @@ public function configure_postfix($options = '') {
11461146

11471147
//* If Postgrey is installed, configure it
11481148
$greylisting = '';
1149-
if($conf['postgrey']['installed'] == true) {
1149+
if(isset($conf['postgrey']['installed']) && ($conf['postgrey']['installed'] == true)) {
11501150
$greylisting = ', check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
11511151
}
11521152

11531153
$reject_sender_login_mismatch = '';
11541154
$reject_authenticated_sender_login_mismatch = '';
1155-
if (isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
1155+
if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
11561156
$reject_sender_login_mismatch = ',reject_sender_login_mismatch,';
11571157
$reject_authenticated_sender_login_mismatch = 'reject_authenticated_sender_login_mismatch, ';
11581158
}
@@ -1162,11 +1162,11 @@ public function configure_postfix($options = '') {
11621162
$stress_adaptive = (isset($server_ini_array['mail']['stress_adaptive']) && ($server_ini_array['mail']['stress_adaptive'] == 'y')) ? '' : $stress_adaptive_placeholder;
11631163

11641164
$reject_unknown_client_hostname='';
1165-
if (isset($server_ini_array['mail']['reject_unknown']) && ($server_ini_array['mail']['reject_unknown'] == 'client' || $server_ini_array['mail']['reject_unknown'] == 'client_helo')) {
1165+
if(isset($server_ini_array['mail']['reject_unknown']) && ($server_ini_array['mail']['reject_unknown'] == 'client' || $server_ini_array['mail']['reject_unknown'] == 'client_helo')) {
11661166
$reject_unknown_client_hostname=',reject_unknown_client_hostname';
11671167
}
11681168
$reject_unknown_helo_hostname='';
1169-
if ((!isset($server_ini_array['mail']['reject_unknown'])) || $server_ini_array['mail']['reject_unknown'] == 'helo' || $server_ini_array['mail']['reject_unknown'] == 'client_helo') {
1169+
if((!isset($server_ini_array['mail']['reject_unknown'])) || $server_ini_array['mail']['reject_unknown'] == 'helo' || $server_ini_array['mail']['reject_unknown'] == 'client_helo') {
11701170
$reject_unknown_helo_hostname=',reject_unknown_helo_hostname';
11711171
}
11721172

‎install/update.php‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -366,15 +366,47 @@
366366
//** Check for current service config state and compare to our results
367367
if ($conf['mysql']['master_slave_setup'] == 'y') $current_svc_config = $inst->dbmaster->queryOneRecord("SELECT mail_server,web_server,dns_server,xmpp_server,firewall_server,vserver_server,db_server FROM ?? WHERE server_id=?", $conf['mysql']['master_database'] . '.server', $conf['server_id']);
368368
else $current_svc_config = $inst->db->queryOneRecord("SELECT mail_server,web_server,dns_server,xmpp_server,firewall_server,vserver_server,db_server FROM ?? WHERE server_id=?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
369-
$conf['services']['mail'] = check_service_config_state('mail_server', $conf['postfix']['installed']);
370-
$conf['services']['dns'] = check_service_config_state('dns_server', ($conf['powerdns']['installed'] || $conf['bind']['installed'] || $conf['mydns']['installed']));
371-
$conf['services']['web'] = check_service_config_state('web_server', ($conf['apache']['installed'] || $conf['nginx']['installed']));
372-
$conf['services']['xmpp'] = check_service_config_state('xmpp_server', $conf['xmpp']['installed']);
373-
$conf['services']['firewall'] = check_service_config_state('firewall_server', ($conf['ufw']['installed'] || $conf['firewall']['installed']));
374-
$conf['services']['vserver'] = check_service_config_state('vserver_server', $conf['services']['vserver']);
369+
370+
if(isset($conf['postfix']['installed']) && $conf['postfix']['installed'] == true) {
371+
$conf['services']['mail'] = check_service_config_state('mail_server', true);
372+
} else {
373+
$conf['services']['mail'] = check_service_config_state('mail_server', false);
374+
}
375+
376+
if(isset($conf['powerdns']['installed']) && $conf['powerdns']['installed'] == true || isset($conf['bind']['installed']) && $conf['bind']['installed'] == true || isset($conf['mydns']['installed']) && $conf['mydns']['installed'] == true) {
377+
$conf['services']['dns'] = check_service_config_state('dns_server', true);
378+
} else {
379+
$conf['services']['dns'] = check_service_config_state('dns_server', false);
380+
}
381+
382+
if(isset($conf['apache']['installed']) && $conf['apache']['installed'] == true || isset($conf['nginx']['installed']) && $conf['nginx']['installed'] == true) {
383+
$conf['services']['web'] = check_service_config_state('web_server', true);
384+
} else {
385+
$conf['services']['web'] = check_service_config_state('web_server', false);
386+
}
387+
388+
if(isset($conf['xmpp']['installed']) && $conf['xmpp']['installed'] == true) {
389+
$conf['services']['xmpp'] = check_service_config_state('xmpp_server', true);
390+
} else {
391+
$conf['services']['xmpp'] = check_service_config_state('xmpp_server', false);
392+
}
393+
394+
if(isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true || isset($conf['firewall']['installed']) && $conf['firewall']['installed'] == true) {
395+
$conf['services']['firewall'] = check_service_config_state('firewall_server', true);
396+
} else {
397+
$conf['services']['firewall'] = check_service_config_state('firewall_server', false);
398+
}
399+
400+
if(isset($conf['vserver']['installed']) && $conf['vserver']['installed'] == true) {
401+
$conf['services']['vserver'] = check_service_config_state('vserver_server', true);
402+
} else {
403+
$conf['services']['vserver'] = check_service_config_state('vserver_server', false);
404+
}
405+
375406
$conf['services']['db'] = check_service_config_state('db_server', true); /* Will always offer as MySQL is of course installed on this host as it's a requirement for ISPC to work... */
376407
unset($current_svc_config);
377408

409+
378410
//** Write new decisions into DB
379411
$sql = "UPDATE ?? SET mail_server = '{$conf['services']['mail']}', web_server = '{$conf['services']['web']}', dns_server = '{$conf['services']['dns']}', file_server = '{$conf['services']['file']}', db_server = '{$conf['services']['db']}', vserver_server = '{$conf['services']['vserver']}', proxy_server = '{$conf['services']['proxy']}', firewall_server = '{$conf['services']['firewall']}', xmpp_server = '{$conf['services']['xmpp']}' WHERE server_id = ?";
380412
$inst->db->query($sql, $conf['mysql']['database'].'.server', $conf['server_id']);

‎server/plugins-available/firewall_plugin.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class firewall_plugin {
3838
public function onInstall() {
3939
global $conf;
4040

41-
if(($conf['bastille']['installed'] == true || $conf['ufw']['installed'] == true || $conf['firewall']['installed'] == true) && $conf['services']['firewall'] == true) {
41+
if((isset($conf['bastille']['installed']) && $conf['bastille']['installed'] == true) || (isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true) || (isset($conf['firewall']['installed']) && $conf['firewall']['installed'] == true) || (isset($conf['services']['firewall']) && $conf['services']['firewall'] == true)) {
4242
return true;
4343
} else {
4444
return false;

0 commit comments

Comments
 (0)