added server ini config to $conf and corrected check for apps vhost enabled

Author: A. Täffner

install/update.php

@@ -287,6 +287,11 @@
  */
 updateDbAndIni();
 
+//** read server config from db into $conf['server_config']
+$tmp = $inst->db->queryOneRecord("SELECT config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
+$conf['server_config'] = ini_to_array(stripslashes($tmp['config']));
+unset($tmp);
+
 /*
  * Reconfigure the permisson if needed
  * (if this is done at client side, only this client is updated.
@@ -428,7 +433,7 @@
 				$inst->configure_nginx();
 			}
 
-			if ($conf['web']['apps_vhost_enabled'] == 'y') {
+			if ($conf['server_config']['web']['apps_vhost_enabled'] == 'y') {
 				//** Configure apps vhost
 				swriteln('Configuring Apps vhost');
 				$inst->configure_apps_vhost();