From 934c7d1764ecdd739ed342e14056ad3c91c744ba Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 26 Jul 2010 14:09:30 +0000
Subject: [PATCH] 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.
---
install/autoupdate.php | 2 +-
install/lib/install.lib.php | 20 ++++++++++++++++++++
install/update.php | 3 ++-
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index 2c388c4e0a..116c375e95 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -271,7 +271,7 @@ swriteln('Updating ISPConfig');
//** Customise the port ISPConfig runs on
-$conf['apache']['vhost_port'] = '8080';
+$conf['apache']['vhost_port'] = get_ispconfig_port_number();;
$inst->install_ispconfig();
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index a4e388054b..f964445bf6 100644
--- a/install/lib/install.lib.php
+++ b/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';
+ }
+ }
+}
+
?>
diff --git a/install/update.php b/install/update.php
index a1ec71e843..a0b9514512 100644
--- a/install/update.php
+++ b/install/update.php
@@ -305,7 +305,8 @@ swriteln('Updating ISPConfig');
//** 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();
--
GitLab