Switch check_service_config_state part to if constructs

Author: ms217

install/update.php

@@ -366,15 +366,36 @@
 //** Check for current service config state and compare to our results
 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']);
 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']);
-$conf['services']['mail'] = check_service_config_state('mail_server', isset($conf['postfix']['installed']));
-$conf['services']['dns'] = check_service_config_state('dns_server', (isset($conf['powerdns']['installed']) || isset($conf['bind']['installed']) || isset($conf['mydns']['installed'])));
-$conf['services']['web'] = check_service_config_state('web_server', (isset($conf['apache']['installed']) || isset($conf['nginx']['installed'])));
-$conf['services']['xmpp'] = check_service_config_state('xmpp_server', isset($conf['xmpp']['installed']));
-$conf['services']['firewall'] = check_service_config_state('firewall_server', (isset($conf['ufw']['installed']) || isset($conf['firewall']['installed'])));
-$conf['services']['vserver'] = check_service_config_state('vserver_server', isset($conf['services']['vserver']));
+
+
+if(isset($conf['postfix']['installed']) && $conf['postfix']['installed'] == true)
+$conf['services']['mail'] = check_service_config_state('mail_server', true);
+else $conf['services']['mail'] = check_service_config_state('mail_server', false);
+
+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)
+$conf['services']['dns'] = check_service_config_state('dns_server', true);
+else $conf['services']['dns'] = check_service_config_state('dns_server', false);
+
+if(isset($conf['apache']['installed']) && $conf['apache']['installed'] == true || isset($conf['nginx']['installed']) && $conf['nginx']['installed'] == true)
+$conf['services']['web'] = check_service_config_state('web_server', true);
+else $conf['services']['web'] = check_service_config_state('web_server', false);
+
+if(isset($conf['xmpp']['installed']) && $conf['xmpp']['installed'] == true)
+$conf['services']['xmpp'] = check_service_config_state('xmpp_server', true);
+else $conf['services']['xmpp'] = check_service_config_state('xmpp_server', false);
+
+if(isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true || isset($conf['firewall']['installed']) && $conf['firewall']['installed'] == true)
+$conf['services']['firewall'] = check_service_config_state('firewall_server', true);
+else $conf['services']['firewall'] = check_service_config_state('firewall_server', false);
+
+if(isset($conf['vserver']['installed']) && $conf['vserver']['installed'] == true)
+$conf['services']['vserver'] = check_service_config_state('vserver_server', true);
+else $conf['services']['vserver'] = check_service_config_state('vserver_server', false);
+
 $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... */
 unset($current_svc_config);
 
+
 //** Write new decisions into DB
 $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 = ?";
 $inst->db->query($sql, $conf['mysql']['database'].'.server', $conf['server_id']);