james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplified install logic

Browse Source
This commit is contained in:
Christian Walde 2010-07-30 22:28:54 +02:00
parent cd6015203e
commit e9cabb30b3
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
install.php
View File

@ -224,19 +224,7 @@ function install_process($database_dsn) { // {{{
header("Location: index.php"); header("Location: index.php");
} // }}} } // }}}
function create_tables($dsn) { // {{{ function create_tables($dsn) { // {{{
if(substr($dsn, 0, 5) == "mysql") { $engine = select_db_engine($dsn);
$engine = new MySQL();
}
else if(substr($dsn, 0, 5) == "pgsql") {
$engine = new PostgreSQL();
}
else if(substr($dsn, 0, 6) == "sqlite") {
$engine = new SQLite();
}
else {
die("Unknown database engine; Shimmie currently officially supports MySQL
(mysql://), with hacks for Postgres (pgsql://) and SQLite (sqlite://)");
}
$db = NewADOConnection($dsn); $db = NewADOConnection($dsn);
if(!$db) { if(!$db) {
@ -304,19 +292,7 @@ function insert_defaults($dsn) { // {{{
die("Couldn't connect to \"$dsn\""); die("Couldn't connect to \"$dsn\"");
} }
else { else {
if(substr($dsn, 0, 5) == "mysql") { $engine = select_db_engine($dsn);
$engine = new MySQL();
}
else if(substr($dsn, 0, 5) == "pgsql") {
$engine = new PostgreSQL();
}
else if(substr($dsn, 0, 6) == "sqlite") {
$engine = new SQLite();
}
else {
die("Unknown database engine; Shimmie currently officially supports MySQL
(mysql://), with hacks for Postgres (pgsql://) and SQLite (sqlite://)");
}
$engine->init($db); $engine->init($db);
$config_insert = $db->Prepare("INSERT INTO config(name, value) VALUES(?, ?)"); $config_insert = $db->Prepare("INSERT INTO config(name, value) VALUES(?, ?)");
@ -332,6 +308,13 @@ function insert_defaults($dsn) { // {{{
$db->Close(); $db->Close();
} }
} // }}} } // }}}
function select_db_engine($dsn) { // {{{
if(substr($dsn, 0, 5) == "mysql") return new MySQL();
if(substr($dsn, 0, 5) == "pgsql") return new PostgreSQL();
if(substr($dsn, 0, 6) == "sqlite") return new SQLite();
die("Unknown database engine; Shimmie currently officially supports MySQL
(mysql://), with hacks for Postgres (pgsql://) and SQLite (sqlite://)");
} // }}}
function build_dirs() { // {{{ function build_dirs() { // {{{
// *try* and make default dirs. Ignore any errors -- // *try* and make default dirs. Ignore any errors --
// if something is amiss, we'll tell the user later // if something is amiss, we'll tell the user later