From a768b9f03ef4b58fcd5c75c237d3b6419e2608d8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 29 Jun 2008 10:47:54 +0000
Subject: [PATCH] - Fixes in the installer.
---
install/install.php | 5 ++++-
install/lib/installer_base.lib.php | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/install/install.php b/install/install.php
index 5fc084ceec..2c000e6ab4 100644
--- a/install/install.php
+++ b/install/install.php
@@ -216,6 +216,7 @@ if($install_mode == 'Standard') {
}
//* Insert the Server record into the database
+ swriteln('Adding ISPConfig server record to database.');
$inst->add_database_server_record();
@@ -281,7 +282,8 @@ if($install_mode == 'Standard') {
swriteln('Installing ISPConfig');
//** We want to check if the server is a module or cgi based php enabled server
- //** TODO: Don't always ask for this somehow ?
+ //** TODO: Don't always ask for this somehow ?
+ /*
$fast_cgi = $inst->simple_query('CGI PHP Enabled Server?', array('yes','no'),'no');
if($fast_cgi == 'yes') {
@@ -291,6 +293,7 @@ if($install_mode == 'Standard') {
} else {
$inst->conf['apache']['vhost_cgi_alias'] = "";
}
+ */
//** Customise the port ISPConfig runs on
$inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3b66be5a73..279e444e6e 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -159,13 +159,16 @@ class installer_base {
//* Reload database privelages
$this->db->query('FLUSH PRIVILEGES;');
+ //* Set the database name in the DB library
+ $this->db->dbName = $cf['database'];
$server_ini_content = rf("tpl/server.ini.master");
$server_ini_content = addslashes($server_ini_content);
$sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', 'Server', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
$this->db->query($sql);
- $this->conf['server_id'] = $this->db->insertID();
+ $conf['server_id'] = $this->db->insertID();
+ $this->conf['server_id'] = $conf['server_id'];
}
--
GitLab