diff options
| -rw-r--r-- | classes/auth/base.php | 2 | ||||
| -rw-r--r-- | classes/db.php | 56 | ||||
| -rw-r--r-- | classes/handler.php | 2 | ||||
| -rw-r--r-- | classes/handler/public.php | 2 | ||||
| -rw-r--r-- | classes/pluginhost.php | 4 |
5 files changed, 42 insertions, 24 deletions
diff --git a/classes/auth/base.php b/classes/auth/base.php index 652b66e6e..dbc77f8cd 100644 --- a/classes/auth/base.php +++ b/classes/auth/base.php @@ -1,10 +1,8 @@ <?php class Auth_Base { - private $dbh; private $pdo; function __construct() { - $this->dbh = Db::get(); $this->pdo = Db::pdo(); } diff --git a/classes/db.php b/classes/db.php index 1a4d0b2ee..05fb82d82 100644 --- a/classes/db.php +++ b/classes/db.php @@ -1,12 +1,29 @@ <?php class Db implements IDb { + + /* @var Db $instance */ private static $instance; + + /* @var IDb $adapter */ private $adapter; + private $link; + + /* @var PDO $pdo */ private $pdo; private function __construct() { + } + + private function __clone() { + // + } + + private function legacy_connect() { + + user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE); + $er = error_reporting(E_ALL); switch (DB_TYPE) { @@ -25,19 +42,31 @@ class Db implements IDb { exit(100); } + $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : ""); + + if (!$this->link) { + print("Error connecting through adapter: " . $this->adapter->last_error()); + exit(101); + } + + error_reporting($er); + } + + private function pdo_connect() { + $db_port = defined('DB_PORT') && DB_PORT ? ';port='.DB_PORT : ''; $this->pdo = new PDO(DB_TYPE . ':dbname='.DB_NAME.';host='.DB_HOST.$db_port, DB_USER, DB_PASS); - $this->pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING ); - if (!$this->pdo) { print("Error connecting via PDO."); exit(101); } + $this->pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING ); + if (DB_TYPE == "pgsql") { $this->pdo->query("set client_encoding = 'UTF-8'"); @@ -52,32 +81,27 @@ class Db implements IDb { $this->pdo->query("SET NAMES " . MYSQL_CHARSET); } } - - $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : ""); - - if (!$this->link) { - print("Error connecting through adapter: " . $this->adapter->last_error()); - exit(101); - } - - error_reporting($er); - } - - private function __clone() { - // } public static function get() { if (self::$instance == null) self::$instance = new self(); + if (!self::$instance->link) { + self::$instance->legacy_connect(); + } + return self::$instance; } - public static function pdo() { + public static function pdo() { if (self::$instance == null) self::$instance = new self(); + if (!self::$instance->pdo) { + self::$instance->pdo_connect(); + } + return self::$instance->pdo; } diff --git a/classes/handler.php b/classes/handler.php index 483b573e3..5b1109492 100644 --- a/classes/handler.php +++ b/classes/handler.php @@ -1,11 +1,9 @@ <?php class Handler implements IHandler { - protected $dbh; protected $pdo; protected $args; function __construct($args) { - $this->dbh = Db::get(); $this->pdo = Db::pdo(); $this->args = $args; } diff --git a/classes/handler/public.php b/classes/handler/public.php index a5b7f94be..e2df4a3cc 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -338,7 +338,7 @@ class Handler_Public extends Handler { } function globalUpdateFeeds() { - RPC::updaterandomfeed_real($this->dbh); + RPC::updaterandomfeed_real(); PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false); } diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 561a10a41..f07e2bbf4 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -1,6 +1,5 @@ <?php class PluginHost { - private $dbh; private $pdo; private $hooks = array(); private $plugins = array(); @@ -63,7 +62,6 @@ class PluginHost { const KIND_USER = 3; function __construct() { - $this->dbh = Db::get(); $this->pdo = Db::pdo(); $this->storage = array(); @@ -91,7 +89,7 @@ class PluginHost { } function get_dbh() { - return $this->dbh; + return Db::get(); } function get_pdo() { |