From dcff5718f345f55f7ea81f18d1f086facde4eacf Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Mon, 20 Aug 2007 23:14:51 -0400
Subject: [PATCH] * Using new ISPC_*_PATH constants * Adding new data schema (to be moved shortly * no more $conf['classpath']
---
install/install.php | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/install/install.php b/install/install.php
index 2e7ba60..134f62d 100644
--- a/install/install.php
+++ b/install/install.php
@@ -52,18 +52,19 @@
//** Include the library with the basic installer functions
require_once('lib/install.lib.php');
+require_once('options.conf.php');
+
//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');
-
-include_once('options.conf.php');
-$distname = get_distname();
//** Include the distribution specific installer class library and configuration
include_once('dist/lib/'.$conf['distname'].'.lib.php');
include_once('dist/conf/'.$conf['distname'].'.conf.php');
-//TODO: this is not there ????
+
+$distname = get_distname();
+//** Copt the $dist created in dist/conf/foo to global var
$conf['dist'] = $dist;
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
@@ -100,13 +101,14 @@
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host']);
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']);
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
- //TODO: it does not ask for which database ?
+ $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
//* Initialize the MySQL server connection
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
$conf['mysql']['host'] = $tmp_mysql_server_host;
$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
$conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password;
+ $conf['mysql']['database'] = $tmp_mysql_server_database;
$finished = true;
} else {
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
--
Gitblit v1.9.1