fetch_file_contents: support retarded schema-less urls

[tt-rss.git] / classes / db.php

diff --git a/classes/db.php b/classes/db.php
index 403cbc93aba3ca452d103a8c5f9eb91a01fa8199..695ca6ea2e47bcd2e523474bf5acafd769a05049 100644 (file)
--- a/classes/db.php
+++ b/classes/db.php
@@ -2,20 +2,40 @@
 class Db implements IDb {
        private static $instance;
        private $adapter;
+       private $link;
 
        private function __construct() {
-               switch (DB_TYPE) {
-               case "mysql":
-                       $this->adapter = new Db_Mysql();
-                       break;
-               case "pgsql":
-                       $this->adapter = new Db_Pgsql();
-                       break;
-               default:
-                       die("Unknown DB_TYPE: " . DB_TYPE);
+
+               $er = error_reporting(E_ALL);
+
+               if (defined('_ENABLE_PDO') && _ENABLE_PDO && class_exists("PDO")) {
+                       $this->adapter = new Db_PDO();
+               } else {
+                       switch (DB_TYPE) {
+                       case "mysql":
+                               if (function_exists("mysqli_connect")) {
+                                       $this->adapter = new Db_Mysqli();
+                               } else {
+                                       $this->adapter = new Db_Mysql();
+                               }
+                               break;
+                       case "pgsql":
+                               $this->adapter = new Db_Pgsql();
+                               break;
+                       default:
+                               die("Unknown DB_TYPE: " . DB_TYPE);
+                       }
                }
 
-               $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
+               if (!$this->adapter) die("Error initializing database adapter for " . DB_TYPE);
+
+               $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
+
+               if (!$this->link) {
+                       die("Error connecting through adapter: " . $this->adapter->last_error());
+               }
+
+               error_reporting($er);
        }
 
        private function __clone() {
@@ -33,8 +53,13 @@ class Db implements IDb {
                return("'$str'");
        }
 
+       function reconnect() {
+               $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
+       }
+
        function connect($host, $user, $pass, $db, $port) {
                //return $this->adapter->connect($host, $user, $pass, $db, $port);
+               return ;
        }
 
        function escape_string($s, $strip_tags = true) {