Fixed: FS#3169 - Defaults "apps" Port 8081 overwrites custom port

Author: Till Brehm

install/lib/install.lib.php

@@ -718,6 +718,32 @@ function get_ispconfig_port_number() {
 	}
 }
 
+/*
+* Get the port number of the ISPConfig apps vhost
+*/
+
+function get_apps_vhost_port_number() {
+	global $conf;
+	if($conf['nginx']['installed'] == true){
+		$ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/apps.vhost';
+		$regex = '/listen (\d+)/';
+	} else {
+		$ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/apps.vhost';
+		$regex = '/\<VirtualHost.*\:(\d{1,})\>/';
+	}
+
+	if(is_file($ispconfig_vhost_file)) {
+		$tmp = file_get_contents($ispconfig_vhost_file);
+		preg_match($regex, $tmp, $matches);
+		$port_number = @intval($matches[1]);
+		if($port_number > 0) {
+			return $port_number;
+		} else {
+			return '8081';
+		}
+	}
+}
+
 /*
 * Get the port number of the ISPConfig controlpanel vhost
 */

install/lib/installer_base.lib.php

@@ -1511,6 +1511,11 @@ public function configure_apps_vhost() {
 			$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
 			$vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
 			$apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername'];
+			
+			//* Get the apps vhost port
+			if($this->is_update == true) {
+				$conf['web']['apps_vhost_port'] = get_apps_vhost_port_number();
+			}
 
 			// Dont just copy over the virtualhost template but add some custom settings
 			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_apps.vhost.master', 'tpl/apache_apps.vhost.master');