Skip to content

Commit b0a1cc4

Browse files
author
pedro_morgan
committed
Added the mysql database to use
1 parent 5133cc8 commit b0a1cc4

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

install/install.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,14 @@
100100
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host']);
101101
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']);
102102
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
103-
//TODO: it does not ask for which database ?
103+
$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
104104

105105
//* Initialize the MySQL server connection
106106
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
107107
$conf['mysql']['host'] = $tmp_mysql_server_host;
108108
$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
109109
$conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password;
110+
$conf['mysql']['database'] = $tmp_mysql_server_database;
110111
$finished = true;
111112
} else {
112113
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());

install/lib/installer_base.lib.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ class installer_base {
3333
var $wb = array();
3434
var $language = 'en';
3535
var $db;
36-
36+
private $conf;
3737
/*
3838
3939
*/
40-
function contstruct()
40+
function __construct()
4141
{
42-
die('ere');
42+
global $conf; //TODO: maybe $conf should be passed to constructor
43+
$this->conf = $conf;
4344
}
4445

4546

0 commit comments

Comments
 (0)