From d62f4908146f2bdfb396bff06f74afb62995e4a3 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 25 Apr 2016 20:12:36 -0700 Subject: Setup was horked after this commit and I couldn't easily make it right so reverting - will try again at a future date Revert "remove global db variable" This reverts commit c3b0c0f32a17649503db67f208cce6f9e0cdc322. --- include/dba/dba_driver.php | 121 ++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 67 deletions(-) (limited to 'include/dba') diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index 4bad70323..3c5b0b67e 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -7,57 +7,44 @@ * functions for working with databases. */ - -class DBA { - - static public $dba = null; - static public $dbtype = null; - - - /** - * @brief Returns the database driver object. - * - * If available it will use PHP's mysqli otherwise mysql driver. - * - * @param string $server DB server name - * @param string $port DB port - * @param string $user DB username - * @param string $pass DB password - * @param string $db database name - * @param string $dbtype 0 for mysql, 1 for postgres - * @param bool $install Defaults to false - * @return null|dba_driver A database driver object (dba_mysql|dba_mysqli) or null if no driver found. - */ - - function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) { - - self::$dba = null; - - self::$dbtype = intval($dbtype); - - if(self::$dbtype == DBTYPE_POSTGRES) { - require_once('include/dba/dba_postgres.php'); - if(is_null($port)) $port = 5432; - self::$dba = new dba_postgres($server, $port, $user, $pass, $db, $install); - } - else { - if(class_exists('mysqli')) { - if (is_null($port)) $port = ini_get("mysqli.default_port"); - require_once('include/dba/dba_mysqli.php'); - self::$dba = new dba_mysqli($server, $port,$user,$pass,$db,$install); - } - else { - // UNSUPPORTED, OBSOLETE - if (is_null($port)) $port = "3306"; - require_once('include/dba/dba_mysql.php'); - self::$dba = new dba_mysql($server, $port,$user,$pass,$db,$install); - } +/** + * @brief Returns the database driver object. + * + * If available it will use PHP's mysqli otherwise mysql driver. + * + * @param string $server DB server name + * @param string $port DB port + * @param string $user DB username + * @param string $pass DB password + * @param string $db database name + * @param string $dbtype 0 for mysql, 1 for postgres + * @param bool $install Defaults to false + * @return null|dba_driver A database driver object (dba_mysql|dba_mysqli) or null if no driver found. + */ +function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) { + $dba = null; + + $dbtype = intval($dbtype); + + if($dbtype == DBTYPE_POSTGRES) { + require_once('include/dba/dba_postgres.php'); + if(is_null($port)) $port = 5432; + $dba = new dba_postgres($server, $port, $user, $pass, $db, $install); + } else { + if(class_exists('mysqli')) { + if (is_null($port)) $port = ini_get("mysqli.default_port"); + require_once('include/dba/dba_mysqli.php'); + $dba = new dba_mysqli($server, $port,$user,$pass,$db,$install); + } else { + if (is_null($port)) $port = "3306"; + require_once('include/dba/dba_mysql.php'); + $dba = new dba_mysql($server, $port,$user,$pass,$db,$install); } - - define('NULL_DATE', self::$dba->get_null_date()); - define('ACTIVE_DBTYPE', self::$dbtype); - return self::$dba; } + + define('NULL_DATE', $dba->get_null_date()); + define('ACTIVE_DBTYPE', $dbtype); + return $dba; } /** @@ -66,7 +53,6 @@ class DBA { * This class gets extended by the real database driver classes, e.g. dba_mysql, * dba_mysqli. */ - abstract class dba_driver { // legacy behavior const INSTALL_SCRIPT='install/schema_mysql.sql'; @@ -217,10 +203,10 @@ function printable($s) { * @param int $state 0 to disable debugging */ function dbg($state) { -// global $db; + global $db; - if(DBA::$dba) - DBA::$dba->dbg($state); + if($db) + $db->dbg($state); } /** @@ -234,20 +220,21 @@ function dbg($state) { * @return Return an escaped string of the value to pass to a DB query. */ function dbesc($str) { - if(DBA::$dba && DBA::$dba->connected) - return(DBA::$dba->escape($str)); + global $db; + + if($db && $db->connected) + return($db->escape($str)); else return(str_replace("'", "\\'", $str)); } - function dbescbin($str) { global $db; - return DBA::$dba->escapebin($str); + return $db->escapebin($str); } function dbunescbin($str) { global $db; - return DBA::$dba->unescapebin($str); + return $db->unescapebin($str); } function dbescdate($date) { @@ -261,27 +248,27 @@ function dbescdate($date) { function db_quoteinterval($txt) { global $db; - return DBA::$dba->quote_interval($txt); + return $db->quote_interval($txt); } function dbesc_identifier($str) { global $db; - return DBA::$dba->escape_identifier($str); + return $db->escape_identifier($str); } function db_utcnow() { global $db; - return DBA::$dba->utcnow(); + return $db->utcnow(); } function db_optimizetable($table) { global $db; - DBA::$dba->optimize_table($table); + $db->optimize_table($table); } function db_concat($fld, $sep) { global $db; - return DBA::$dba->concat($fld, $sep); + return $db->concat($fld, $sep); } // Function: q($sql,$args); @@ -311,7 +298,7 @@ function q($sql) { $args = func_get_args(); unset($args[0]); - if(DBA::$dba && DBA::$dba->connected) { + if($db && $db->connected) { $stmt = vsprintf($sql, $args); if($stmt === false) { if(version_compare(PHP_VERSION, '5.4.0') >= 0) @@ -320,7 +307,7 @@ function q($sql) { else logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true),LOGGER_NORMAL,LOG_CRIT); } - return DBA::$dba->q($stmt); + return $db->q($stmt); } /* @@ -342,8 +329,8 @@ function q($sql) { function dbq($sql) { global $db; - if(DBA::$dba && DBA::$dba->connected) - $ret = DBA::$dba->q($sql); + if($db && $db->connected) + $ret = $db->q($sql); else $ret = false; -- cgit v1.2.3