From e9cabb30b3e4b1b07bdfd0a27271ef077c37dbf3 Mon Sep 17 00:00:00 2001
From: Christian Walde <walde.christian@googlemail.com>
Date: Fri, 30 Jul 2010 22:28:54 +0200
Subject: [PATCH] simplified install logic

---
 install.php | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/install.php b/install.php
index 938d8493..e084cf59 100644
--- a/install.php
+++ b/install.php
@@ -224,19 +224,7 @@ function install_process($database_dsn) { // {{{
 	header("Location: index.php");
 } // }}}
 function create_tables($dsn) { // {{{
-	if(substr($dsn, 0, 5) == "mysql") {
-		$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 = select_db_engine($dsn);
 
 	$db = NewADOConnection($dsn);
 	if(!$db) {
@@ -304,19 +292,7 @@ function insert_defaults($dsn) { // {{{
 		die("Couldn't connect to \"$dsn\"");
 	}
 	else {
-		if(substr($dsn, 0, 5) == "mysql") {
-			$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 = select_db_engine($dsn);
 		$engine->init($db);
 
 		$config_insert = $db->Prepare("INSERT INTO config(name, value) VALUES(?, ?)");
@@ -332,6 +308,13 @@ function insert_defaults($dsn) { // {{{
 		$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() { // {{{
 	// *try* and make default dirs. Ignore any errors --
 	// if something is amiss, we'll tell the user later