Merge branch 'master' into maint

1 files changed, 17 insertions, 7 deletions

diff --git a/web/lib/DB.class.php b/web/lib/DB.class.php
index b538e0d3..dfdbbf96 100644
--- a/web/lib/DB.class.php
+++ b/web/lib/DB.class.php
@@ -17,20 +17,30 @@ class DB {
 	public static function connect() {
 		if (self::$dbh === null) {
 			try {
-				$dsn_prefix = config_get('database', 'dsn_prefix');
+				$backend = config_get('database', 'backend');
 				$host = config_get('database', 'host');
 				$socket = config_get('database', 'socket');
 				$name = config_get('database', 'name');
 				$user = config_get('database', 'user');
 				$password = config_get('database', 'password');
 
-				$dsn = $dsn_prefix .
-				       ':host=' . $host .
-				       ';unix_socket=' . $socket .
-				       ';dbname=' . $name;
+				if ($backend == "mysql") {
+					$dsn = $backend .
+						':host=' . $host .
+						';unix_socket=' . $socket .
+						';dbname=' . $name;
+
+					self::$dbh = new PDO($dsn, $user, $password);
+					self::$dbh->exec("SET NAMES 'utf8' COLLATE 'utf8_general_ci';");
+				} else if ($backend == "sqlite") {
+					$dsn = $backend .
+						":" . $name;
+
+					self::$dbh = new PDO($dsn, null, null);
+				} else {
+					die("Error - " . $backend . " is not supported by aurweb");
+				}
 
-				self::$dbh = new PDO($dsn, $user, $password);
-				self::$dbh->exec("SET NAMES 'utf8' COLLATE 'utf8_general_ci';");
 			} catch (PDOException $e) {
 				die('Error - Could not connect to AUR database');
 			}