From 89e4329a8068e3631d3f64f6896fa3907c687cf5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 08 Jan 2015 09:08:50 -0500
Subject: [PATCH] Layout fix: tab toggle and monitor tables
---
server/lib/classes/aps_installer.inc.php | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
index 5503464..fbb8079 100644
--- a/server/lib/classes/aps_installer.inc.php
+++ b/server/lib/classes/aps_installer.inc.php
@@ -277,7 +277,8 @@
if(substr($this->document_root, -1) != '/') $this->document_root .= '/';
// Attention: ISPConfig Special: web files are in subfolder 'web' -> append it:
- if($domain_res['type'] == 'vhostsubdomain') $this->document_root .= $domain_res['web_folder'] . '/';
+ if(($domain_res['type'] == 'vhostsubdomain') || ($domain_res['type'] == 'vhostalias'))
+ $this->document_root .= $domain_res['web_folder'] . '/';
else $this->document_root .= 'web/';
// If a subfolder is given, make sure it's path doesn't begin with / i.e. /phpbb
@@ -373,14 +374,16 @@
/* Test if the new mysql connection is laready working to ensure that db servers in multiserver
setups get enough time to create the database */
- for($n = 1; $n < 15; $n++) {
- $mysqli = new mysqli($newdb_host, $newdb_login, $newdb_pw, $newdb_name);
- if ($mysqli->connect_error) {
- unset($mysqli);
- sleep(5);
- } else {
- unset($mysqli);
- break;
+ if($this->handle_type == 'install') {
+ for($n = 1; $n < 15; $n++) {
+ $link = mysqli_connect($newdb_host, $newdb_login, $newdb_pw);
+ if (!$link) {
+ unset($link);
+ sleep(5);
+ } else {
+ unset($link);
+ break;
+ }
}
}
--
Gitblit v1.9.1