From 99bda9cc12cd39907adc6b76dc3bee4e9241b52b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 30 Nov 2017 10:47:42 +0300
Subject: add some starting pdo glue

---
 classes/db.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'classes/db.php')

diff --git a/classes/db.php b/classes/db.php
index 3b71f3c8f..224492502 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -3,15 +3,13 @@ class Db implements IDb {
 	private static $instance;
 	private $adapter;
 	private $link;
+	private $pdo;
 
 	private function __construct() {
 
 		$er = error_reporting(E_ALL);
 
-		if (defined('_ENABLE_PDO') && _ENABLE_PDO && class_exists("PDO")) {
-			$this->adapter = new Db_PDO();
-		} else {
-			switch (DB_TYPE) {
+		switch (DB_TYPE) {
 			case "mysql":
 				$this->adapter = new Db_Mysqli();
 				break;
@@ -20,7 +18,6 @@ class Db implements IDb {
 				break;
 			default:
 				die("Unknown DB_TYPE: " . DB_TYPE);
-			}
 		}
 
 		if (!$this->adapter) {
@@ -28,6 +25,17 @@ class Db implements IDb {
 			exit(100);
 		}
 
+		$db_port = defined(DB_PORT) ? ';port='.DB_PORT : '';
+
+		$this->pdo = new PDO(DB_TYPE . ':dbname='.DB_NAME.';host='.DB_HOST.$db_port,
+			DB_USER,
+			DB_PASS);
+
+		if (!$this->pdo) {
+			print("Error connecting via PDO.");
+			exit(101);
+		}
+
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
 		if (!$this->link) {
-- 
cgit v1.2.3