Implemented: FS#1260 - Do not ask for port number during updates

- The updater still asks for the port number, but with this update the default number that is shown is read from the vhost file as xaver suggested.

Author: tbrehm

install/autoupdate.php

@@ -271,7 +271,7 @@
 
 
 //** Customise the port ISPConfig runs on
-$conf['apache']['vhost_port'] = '8080';
+$conf['apache']['vhost_port'] = get_ispconfig_port_number();;
 
 $inst->install_ispconfig();
 

install/lib/install.lib.php

@@ -677,6 +677,26 @@ function compare_ispconfig_version($current,$new) {
 
 }
 
+/*
+* Get the port number of the ISPConfig controlpanel vhost
+*/
+
+function get_ispconfig_port_number() {
+	global $conf;
+	$ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
+
+	if(is_file($ispconfig_vhost_file)) {
+		$tmp = file_get_contents($ispconfig_vhost_file);
+		preg_match('/\<VirtualHost.*\:(\d{1,})\>/',$tmp,$matches);
+		$port_number = intval($matches[1]);
+		if($port_number > 0) {
+			return $port_number;
+		} else {
+			return '8080';
+		}
+	}
+}
+
 
 
 ?>

install/update.php

@@ -305,7 +305,8 @@
 
 
 //** Customise the port ISPConfig runs on
-$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+$ispconfig_port_number = get_ispconfig_port_number();
+$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
 
 $inst->install_ispconfig();