]> git.mxchange.org Git - friendica.git/blobdiff - include/dba.php
Event: Prevent SQL errors with events without end
[friendica.git] / include / dba.php
index 73246d4908530e8c3366a7529776ab8e370497bd..fc54eefeb36953f609c6a7ebfed886cb37ba090f 100644 (file)
@@ -1,8 +1,10 @@
 <?php
-use \Friendica\Core\System;
 
-require_once("dbm.php");
-require_once('include/datetime.php');
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Database\DBStructure;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * @class MySQL database class
@@ -11,21 +13,22 @@ require_once('include/datetime.php');
  */
 
 class dba {
-
-       private $debug = 0;
-       private $db;
-       private $result;
-       private $driver;
-       public  $connected = false;
-       public  $error = false;
-       public  $errorno = 0;
-       public  $affected_rows = 0;
-       private $_server_info = '';
+       public static $connected = true;
+
+       private static $_server_info = '';
+       private static $db;
+       private static $driver;
+       private static $error = false;
+       private static $errorno = 0;
+       private static $affected_rows = 0;
        private static $in_transaction = false;
-       private static $dbo;
-       private static $relation = array();
+       private static $relation = [];
+
+       public static function connect($serveraddr, $user, $pass, $db, $install = false) {
+               if (!is_null(self::$db)) {
+                       return true;
+               }
 
-       function __construct($serveraddr, $user, $pass, $db, $install = false) {
                $a = get_app();
 
                $stamp1 = microtime(true);
@@ -45,24 +48,24 @@ class dba {
                $db = trim($db);
 
                if (!(strlen($server) && strlen($user))) {
-                       $this->connected = false;
-                       $this->db = null;
-                       return;
+                       self::$connected = false;
+                       self::$db = null;
+                       return false;
                }
 
                if ($install) {
                        if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
                                if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-                                       $this->error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server);
-                                       $this->connected = false;
-                                       $this->db = null;
-                                       return;
+                                       self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
+                                       self::$connected = false;
+                                       self::$db = null;
+                                       return false;
                                }
                        }
                }
 
                if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
-                       $this->driver = 'pdo';
+                       self::$driver = 'pdo';
                        $connect = "mysql:host=".$server.";dbname=".$db;
 
                        if (isset($port)) {
@@ -73,63 +76,36 @@ class dba {
                                $connect .= ";charset=".$a->config["system"]["db_charset"];
                        }
                        try {
-                               $this->db = @new PDO($connect, $user, $pass);
-                               $this->connected = true;
+                               self::$db = @new PDO($connect, $user, $pass);
+                               self::$connected = true;
                        } catch (PDOException $e) {
-                               $this->connected = false;
+                               self::$connected = false;
                        }
                }
 
-               if (!$this->connected && class_exists('mysqli')) {
-                       $this->driver = 'mysqli';
-                       $this->db = @new mysqli($server, $user, $pass, $db, $port);
+               if (!self::$connected && class_exists('mysqli')) {
+                       self::$driver = 'mysqli';
+                       self::$db = @new mysqli($server, $user, $pass, $db, $port);
                        if (!mysqli_connect_errno()) {
-                               $this->connected = true;
-
-                               if (isset($a->config["system"]["db_charset"])) {
-                                       $this->db->set_charset($a->config["system"]["db_charset"]);
-                               }
-                       }
-               }
-
-               if (!$this->connected && function_exists('mysql_connect')) {
-                       $this->driver = 'mysql';
-                       $this->db = mysql_connect($serveraddr, $user, $pass);
-                       if ($this->db && mysql_select_db($db, $this->db)) {
-                               $this->connected = true;
+                               self::$connected = true;
 
                                if (isset($a->config["system"]["db_charset"])) {
-                                       mysql_set_charset($a->config["system"]["db_charset"], $this->db);
+                                       self::$db->set_charset($a->config["system"]["db_charset"]);
                                }
                        }
                }
 
                // No suitable SQL driver was found.
-               if (!$this->connected) {
-                       $this->db = null;
+               if (!self::$connected) {
+                       self::$db = null;
                        if (!$install) {
-                               system_unavailable();
+                               System::unavailable();
                        }
+                       return false;
                }
                $a->save_timestamp($stamp1, "network");
 
-               self::$dbo = $this;
-       }
-
-       /**
-        * @brief Checks if the database object is initialized
-        *
-        * This is a possible bugfix for something that doesn't occur for me.
-        * There seems to be situations, where the object isn't initialized.
-        */
-       private static function initialize() {
-               if (!is_object(self::$dbo)) {
-                       global $db;
-                       self::$dbo = $db;
-                       if (!is_object(self::$dbo)) {
-                               die('Database is uninitialized!');
-                       }
-               }
+               return true;
        }
 
        /**
@@ -140,21 +116,18 @@ class dba {
         *
         * @return string
         */
-       public function server_info() {
-               if ($this->_server_info == '') {
-                       switch ($this->driver) {
+       public static function server_info() {
+               if (self::$_server_info == '') {
+                       switch (self::$driver) {
                                case 'pdo':
-                                       $this->_server_info = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION);
+                                       self::$_server_info = self::$db->getAttribute(PDO::ATTR_SERVER_VERSION);
                                        break;
                                case 'mysqli':
-                                       $this->_server_info = $this->db->server_info;
-                                       break;
-                               case 'mysql':
-                                       $this->_server_info = mysql_get_server_info($this->db);
+                                       self::$_server_info = self::$db->server_info;
                                        break;
                        }
                }
-               return $this->_server_info;
+               return self::$_server_info;
        }
 
        /**
@@ -162,10 +135,10 @@ class dba {
         *
         * @return string
         */
-       public function database_name() {
-               $r = $this->q("SELECT DATABASE() AS `db`");
-
-               return $r[0]['db'];
+       public static function database_name() {
+               $ret = self::p("SELECT DATABASE() AS `db`");
+                $data = self::inArray($ret);
+               return $data[0]['db'];
        }
 
        /**
@@ -173,7 +146,7 @@ class dba {
         *
         * @param string $query The database query that will be analyzed
         */
-       public function log_index($query) {
+       private static function log_index($query) {
                $a = get_app();
 
                if (empty($a->config["system"]["db_log_index"])) {
@@ -186,19 +159,19 @@ class dba {
                }
 
                // Only do the explain on "select", "update" and "delete"
-               if (!in_array(strtolower(substr($query, 0, 6)), array("select", "update", "delete"))) {
+               if (!in_array(strtolower(substr($query, 0, 6)), ["select", "update", "delete"])) {
                        return;
                }
 
-               $r = $this->q("EXPLAIN ".$query);
-               if (!dbm::is_result($r)) {
+               $r = self::p("EXPLAIN ".$query);
+               if (!DBM::is_result($r)) {
                        return;
                }
 
                $watchlist = explode(',', $a->config["system"]["db_log_index_watch"]);
                $blacklist = explode(',', $a->config["system"]["db_log_index_blacklist"]);
 
-               foreach ($r AS $row) {
+               while ($row = dba::fetch($r)) {
                        if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
                                $log = (in_array($row['key'], $watchlist) &&
                                        ($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
@@ -216,7 +189,7 @@ class dba {
 
                        if ($log) {
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                               @file_put_contents($a->config["system"]["db_log_index"], datetime_convert()."\t".
+                               @file_put_contents($a->config["system"]["db_log_index"], DateTimeFormat::utcNow()."\t".
                                                $row['key']."\t".$row['rows']."\t".$row['Extra']."\t".
                                                basename($backtrace[1]["file"])."\t".
                                                $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
@@ -225,79 +198,33 @@ class dba {
                }
        }
 
-       /**
-        * @brief execute SQL query - deprecated
-        *
-        * Please use the dba:: functions instead:
-        * dba::select, dba::exists, dba::insert
-        * dba::delete, dba::update, dba::p, dba::e
-        *
-        * @param string $sql SQL query
-        * @return array Query array
-        */
-       public function q($sql) {
-               $ret = self::p($sql);
-
-               if (is_bool($ret)) {
-                       return $ret;
-               }
-
-               $columns = self::columnCount($ret);
-
-               $data = self::inArray($ret);
-
-               if ((count($data) == 0) && ($columns == 0)) {
-                       return true;
+       public static function escape($str) {
+               switch (self::$driver) {
+                       case 'pdo':
+                               return substr(@self::$db->quote($str, PDO::PARAM_STR), 1, -1);
+                       case 'mysqli':
+                               return @self::$db->real_escape_string($str);
                }
-
-               return $data;
        }
 
-       public function escape($str) {
-               if ($this->db && $this->connected) {
-                       switch ($this->driver) {
-                               case 'pdo':
-                                       return substr(@$this->db->quote($str, PDO::PARAM_STR), 1, -1);
-                               case 'mysqli':
-                                       return @$this->db->real_escape_string($str);
-                               case 'mysql':
-                                       return @mysql_real_escape_string($str,$this->db);
-                       }
-               }
-       }
+       public static function connected() {
+               $connected = false;
 
-       function connected() {
-               switch ($this->driver) {
+               switch (self::$driver) {
                        case 'pdo':
-                               // Not sure if this really is working like expected
-                               $connected = ($this->db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
+                               $r = dba::p("SELECT 1");
+                               if (DBM::is_result($r)) {
+                                       $row = dba::inArray($r);
+                                       $connected = ($row[0]['1'] == '1');
+                               }
                                break;
                        case 'mysqli':
-                               $connected = $this->db->ping();
-                               break;
-                       case 'mysql':
-                               $connected = mysql_ping($this->db);
+                               $connected = self::$db->ping();
                                break;
                }
                return $connected;
        }
 
-       function __destruct() {
-               if ($this->db) {
-                       switch ($this->driver) {
-                               case 'pdo':
-                                       $this->db = null;
-                                       break;
-                               case 'mysqli':
-                                       $this->db->close();
-                                       break;
-                               case 'mysql':
-                                       mysql_close($this->db);
-                                       break;
-                       }
-               }
-       }
-
        /**
         * @brief Replaces ANY_VALUE() function by MIN() function,
         *  if the database server does not support ANY_VALUE().
@@ -309,8 +236,8 @@ class dba {
         * @param string $sql An SQL string without the values
         * @return string The input SQL string modified if necessary.
         */
-       public function any_value_fallback($sql) {
-               $server_info = $this->server_info();
+       public static function any_value_fallback($sql) {
+               $server_info = self::server_info();
                if (version_compare($server_info, '5.7.5', '<') ||
                        (stripos($server_info, 'MariaDB') !== false)) {
                        $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql);
@@ -327,9 +254,9 @@ class dba {
         * @param string $sql An SQL string without the values
         * @return string The input SQL string modified if necessary.
         */
-       public function clean_query($sql) {
-               $search = array("\t", "\n", "\r", "  ");
-               $replace = array(' ', ' ', ' ', ' ');
+       public static function clean_query($sql) {
+               $search = ["\t", "\n", "\r", "  "];
+               $replace = [' ', ' ', ' ', ' '];
                do {
                        $oldsql = $sql;
                        $sql = str_replace($search, $replace, $sql);
@@ -352,7 +279,7 @@ class dba {
                        if (is_int($args[$param]) || is_float($args[$param])) {
                                $replace = intval($args[$param]);
                        } else {
-                               $replace = "'".self::$dbo->escape($args[$param])."'";
+                               $replace = "'".self::escape($args[$param])."'";
                        }
 
                        $pos = strpos($sql, '?', $offset);
@@ -388,11 +315,9 @@ class dba {
         * For all regular queries please use dba::select or dba::exists
         *
         * @param string $sql SQL statement
-        * @return object statement object
+        * @return bool|object statement object
         */
        public static function p($sql) {
-               self::initialize();
-
                $a = get_app();
 
                $stamp1 = microtime(true);
@@ -401,7 +326,7 @@ class dba {
 
                // Renumber the array keys to be sure that they fit
                $i = 0;
-               $args = array();
+               $args = [];
                foreach ($params AS $param) {
                        // Avoid problems with some MySQL servers and boolean values. See issue #3645
                        if (is_bool($param)) {
@@ -410,7 +335,7 @@ class dba {
                        $args[++$i] = $param;
                }
 
-               if (!self::$dbo || !self::$dbo->connected) {
+               if (!self::$connected) {
                        return false;
                }
 
@@ -419,8 +344,8 @@ class dba {
                        logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
                }
 
-               $sql = self::$dbo->clean_query($sql);
-               $sql = self::$dbo->any_value_fallback($sql);
+               $sql = self::clean_query($sql);
+               $sql = self::any_value_fallback($sql);
 
                $orig_sql = $sql;
 
@@ -428,9 +353,9 @@ class dba {
                        $sql = "/*".System::callstack()." */ ".$sql;
                }
 
-               self::$dbo->error = '';
-               self::$dbo->errorno = 0;
-               self::$dbo->affected_rows = 0;
+               self::$error = '';
+               self::$errorno = 0;
+               self::$affected_rows = 0;
 
                // We have to make some things different if this function is called from "e"
                $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
@@ -444,25 +369,25 @@ class dba {
                // We are having an own error logging in the function "e"
                $called_from_e = ($called_from['function'] == 'e');
 
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                // If there are no arguments we use "query"
                                if (count($args) == 0) {
-                                       if (!$retval = self::$dbo->db->query($sql)) {
-                                               $errorInfo = self::$dbo->db->errorInfo();
-                                               self::$dbo->error = $errorInfo[2];
-                                               self::$dbo->errorno = $errorInfo[1];
+                                       if (!$retval = self::$db->query($sql)) {
+                                               $errorInfo = self::$db->errorInfo();
+                                               self::$error = $errorInfo[2];
+                                               self::$errorno = $errorInfo[1];
                                                $retval = false;
                                                break;
                                        }
-                                       self::$dbo->affected_rows = $retval->rowCount();
+                                       self::$affected_rows = $retval->rowCount();
                                        break;
                                }
 
-                               if (!$stmt = self::$dbo->db->prepare($sql)) {
-                                       $errorInfo = self::$dbo->db->errorInfo();
-                                       self::$dbo->error = $errorInfo[2];
-                                       self::$dbo->errorno = $errorInfo[1];
+                               if (!$stmt = self::$db->prepare($sql)) {
+                                       $errorInfo = self::$db->errorInfo();
+                                       self::$error = $errorInfo[2];
+                                       self::$errorno = $errorInfo[1];
                                        $retval = false;
                                        break;
                                }
@@ -473,48 +398,48 @@ class dba {
 
                                if (!$stmt->execute()) {
                                        $errorInfo = $stmt->errorInfo();
-                                       self::$dbo->error = $errorInfo[2];
-                                       self::$dbo->errorno = $errorInfo[1];
+                                       self::$error = $errorInfo[2];
+                                       self::$errorno = $errorInfo[1];
                                        $retval = false;
                                } else {
                                        $retval = $stmt;
-                                       self::$dbo->affected_rows = $retval->rowCount();
+                                       self::$affected_rows = $retval->rowCount();
                                }
                                break;
                        case 'mysqli':
                                // There are SQL statements that cannot be executed with a prepared statement
                                $parts = explode(' ', $orig_sql);
                                $command = strtolower($parts[0]);
-                               $can_be_prepared = in_array($command, array('select', 'update', 'insert', 'delete'));
+                               $can_be_prepared = in_array($command, ['select', 'update', 'insert', 'delete']);
 
                                // The fallback routine is called as well when there are no arguments
                                if (!$can_be_prepared || (count($args) == 0)) {
-                                       $retval = self::$dbo->db->query(self::replace_parameters($sql, $args));
-                                       if (self::$dbo->db->errno) {
-                                               self::$dbo->error = self::$dbo->db->error;
-                                               self::$dbo->errorno = self::$dbo->db->errno;
+                                       $retval = self::$db->query(self::replace_parameters($sql, $args));
+                                       if (self::$db->errno) {
+                                               self::$error = self::$db->error;
+                                               self::$errorno = self::$db->errno;
                                                $retval = false;
                                        } else {
                                                if (isset($retval->num_rows)) {
-                                                       self::$dbo->affected_rows = $retval->num_rows;
+                                                       self::$affected_rows = $retval->num_rows;
                                                } else {
-                                                       self::$dbo->affected_rows = self::$dbo->db->affected_rows;
+                                                       self::$affected_rows = self::$db->affected_rows;
                                                }
                                        }
                                        break;
                                }
 
-                               $stmt = self::$dbo->db->stmt_init();
+                               $stmt = self::$db->stmt_init();
 
                                if (!$stmt->prepare($sql)) {
-                                       self::$dbo->error = $stmt->error;
-                                       self::$dbo->errorno = $stmt->errno;
+                                       self::$error = $stmt->error;
+                                       self::$errorno = $stmt->errno;
                                        $retval = false;
                                        break;
                                }
 
                                $params = '';
-                               $values = array();
+                               $values = [];
                                foreach ($args AS $param => $value) {
                                        if (is_int($args[$param])) {
                                                $params .= 'i';
@@ -530,48 +455,32 @@ class dba {
 
                                if (count($values) > 0) {
                                        array_unshift($values, $params);
-                                       call_user_func_array(array($stmt, 'bind_param'), $values);
+                                       call_user_func_array([$stmt, 'bind_param'], $values);
                                }
 
                                if (!$stmt->execute()) {
-                                       self::$dbo->error = self::$dbo->db->error;
-                                       self::$dbo->errorno = self::$dbo->db->errno;
+                                       self::$error = self::$db->error;
+                                       self::$errorno = self::$db->errno;
                                        $retval = false;
                                } else {
                                        $stmt->store_result();
                                        $retval = $stmt;
-                                       self::$dbo->affected_rows = $retval->affected_rows;
-                               }
-                               break;
-                       case 'mysql':
-                               // For the old "mysql" functions we cannot use prepared statements
-                               $retval = mysql_query(self::replace_parameters($sql, $args), self::$dbo->db);
-                               if (mysql_errno(self::$dbo->db)) {
-                                       self::$dbo->error = mysql_error(self::$dbo->db);
-                                       self::$dbo->errorno = mysql_errno(self::$dbo->db);
-                               } else {
-                                       self::$dbo->affected_rows = mysql_affected_rows($retval);
-
-                                       // Due to missing mysql_* support this here wasn't tested at all
-                                       // See here: http://php.net/manual/en/function.mysql-num-rows.php
-                                       if (self::$dbo->affected_rows <= 0) {
-                                               self::$dbo->affected_rows = mysql_num_rows($retval);
-                                       }
+                                       self::$affected_rows = $retval->affected_rows;
                                }
                                break;
                }
 
                // We are having an own error logging in the function "e"
-               if ((self::$dbo->errorno != 0) && !$called_from_e) {
+               if ((self::$errorno != 0) && !$called_from_e) {
                        // We have to preserve the error code, somewhere in the logging it get lost
-                       $error = self::$dbo->error;
-                       $errorno = self::$dbo->errorno;
+                       $error = self::$error;
+                       $errorno = self::$errorno;
 
-                       logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n".
+                       logger('DB Error '.self::$errorno.': '.self::$error."\n".
                                System::callstack(8)."\n".self::replace_parameters($sql, $params));
 
-                       self::$dbo->error = $error;
-                       self::$dbo->errorno = $errorno;
+                       self::$error = $error;
+                       self::$errorno = $errorno;
                }
 
                $a->save_timestamp($stamp1, 'database');
@@ -585,7 +494,7 @@ class dba {
                                $duration = round($duration, 3);
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-                               @file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t".
+                               @file_put_contents($a->config["system"]["db_log"], DateTimeFormat::utcNow()."\t".$duration."\t".
                                                basename($backtrace[1]["file"])."\t".
                                                $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
                                                substr(self::replace_parameters($sql, $args), 0, 2000)."\n", FILE_APPEND);
@@ -603,8 +512,6 @@ class dba {
         * @return boolean Was the query successfull? False is returned only if an error occurred
         */
        public static function e($sql) {
-               self::initialize();
-
                $a = get_app();
 
                $stamp = microtime(true);
@@ -627,18 +534,18 @@ class dba {
 
                        self::close($stmt);
 
-               } while ((self::$dbo->errorno == 1213) && (--$timeout > 0));
+               } while ((self::$errorno == 1213) && (--$timeout > 0));
 
-               if (self::$dbo->errorno != 0) {
+               if (self::$errorno != 0) {
                        // We have to preserve the error code, somewhere in the logging it get lost
-                       $error = self::$dbo->error;
-                       $errorno = self::$dbo->errorno;
+                       $error = self::$error;
+                       $errorno = self::$errorno;
 
-                       logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n".
+                       logger('DB Error '.self::$errorno.': '.self::$error."\n".
                                System::callstack(8)."\n".self::replace_parameters($sql, $params));
 
-                       self::$dbo->error = $error;
-                       self::$dbo->errorno = $errorno;
+                       self::$error = $error;
+                       self::$errorno = $errorno;
                }
 
                $a->save_timestamp($stamp, "database_write");
@@ -655,21 +562,19 @@ class dba {
         * @return boolean Are there rows for that condition?
         */
        public static function exists($table, $condition) {
-               self::initialize();
-
                if (empty($table)) {
                        return false;
                }
 
-               $fields = array();
+               $fields = [];
 
                $array_element = each($condition);
                $array_key = $array_element['key'];
                if (!is_int($array_key)) {
-                       $fields = array($array_key);
+                       $fields = [$array_key];
                }
 
-               $stmt = self::select($table, $fields, $condition, array('limit' => 1, 'only_query' => true));
+               $stmt = self::select($table, $fields, $condition, ['limit' => 1]);
 
                if (is_bool($stmt)) {
                        $retval = $stmt;
@@ -683,16 +588,15 @@ class dba {
        }
 
        /**
-        * @brief Fetches the first row
+        * Fetches the first row
         *
-        * Please use dba::select or dba::exists whenever this is possible.
+        * Please use dba::selectFirst or dba::exists whenever this is possible.
         *
+        * @brief Fetches the first row
         * @param string $sql SQL statement
         * @return array first row of query
         */
        public static function fetch_first($sql) {
-               self::initialize();
-
                $params = self::getParam(func_get_args());
 
                $stmt = self::p($sql, $params);
@@ -714,9 +618,7 @@ class dba {
         * @return int Number of rows
         */
        public static function affected_rows() {
-               self::initialize();
-
-               return self::$dbo->affected_rows;
+               return self::$affected_rows;
        }
 
        /**
@@ -726,40 +628,32 @@ class dba {
         * @return int Number of columns
         */
        public static function columnCount($stmt) {
-               self::initialize();
-
                if (!is_object($stmt)) {
                        return 0;
                }
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                return $stmt->columnCount();
                        case 'mysqli':
                                return $stmt->field_count;
-                       case 'mysql':
-                               return mysql_affected_rows($stmt);
                }
                return 0;
        }
        /**
         * @brief Returns the number of rows of a statement
         *
-        * @param object Statement object
+        * @param PDOStatement|mysqli_result|mysqli_stmt Statement object
         * @return int Number of rows
         */
        public static function num_rows($stmt) {
-               self::initialize();
-
                if (!is_object($stmt)) {
                        return 0;
                }
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                return $stmt->rowCount();
                        case 'mysqli':
                                return $stmt->num_rows;
-                       case 'mysql':
-                               return mysql_num_rows($stmt);
                }
                return 0;
        }
@@ -767,35 +661,41 @@ class dba {
        /**
         * @brief Fetch a single row
         *
-        * @param object $stmt statement object
+        * @param mixed $stmt statement object
         * @return array current row
         */
        public static function fetch($stmt) {
-               self::initialize();
+               $a = get_app();
+
+               $stamp1 = microtime(true);
+
+               $columns = [];
 
                if (!is_object($stmt)) {
                        return false;
                }
 
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
-                               return $stmt->fetch(PDO::FETCH_ASSOC);
+                               $columns = $stmt->fetch(PDO::FETCH_ASSOC);
+                               break;
                        case 'mysqli':
                                if (get_class($stmt) == 'mysqli_result') {
-                                       return $stmt->fetch_assoc();
+                                       $columns = $stmt->fetch_assoc();
+                                       break;
                                }
 
                                // This code works, but is slow
 
                                // Bind the result to a result array
-                               $cols = array();
+                               $cols = [];
 
-                               $cols_num = array();
+                               $cols_num = [];
                                for ($x = 0; $x < $stmt->field_count; $x++) {
                                        $cols[] = &$cols_num[$x];
                                }
 
-                               call_user_func_array(array($stmt, 'bind_result'), $cols);
+                               call_user_func_array([$stmt, 'bind_result'], $cols);
 
                                if (!$stmt->fetch()) {
                                        return false;
@@ -807,14 +707,14 @@ class dba {
                                $result = $stmt->result_metadata();
                                $fields = $result->fetch_fields();
 
-                               $columns = array();
                                foreach ($cols_num AS $param => $col) {
                                        $columns[$fields[$param]->name] = $col;
                                }
-                               return $columns;
-                       case 'mysql':
-                               return mysql_fetch_array(self::$dbo->result, MYSQL_ASSOC);
                }
+
+               $a->save_timestamp($stamp1, 'database');
+
+               return $columns;
        }
 
        /**
@@ -827,9 +727,13 @@ class dba {
         * @return boolean was the insert successfull?
         */
        public static function insert($table, $param, $on_duplicate_update = false) {
-               self::initialize();
 
-               $sql = "INSERT INTO `".self::$dbo->escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
+               if (empty($table) || empty($param)) {
+                       logger('Table and fields have to be set');
+                       return false;
+               }
+
+               $sql = "INSERT INTO `".self::escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
                        substr(str_repeat("?, ", count($param)), 0, -2).")";
 
                if ($on_duplicate_update) {
@@ -848,17 +752,12 @@ class dba {
         * @return integer Last inserted id
         */
        public static function lastInsertId() {
-               self::initialize();
-
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
-                               $id = self::$dbo->db->lastInsertId();
+                               $id = self::$db->lastInsertId();
                                break;
                        case 'mysqli':
-                               $id = self::$dbo->db->insert_id;
-                               break;
-                       case 'mysql':
-                               $id = mysql_insert_id(self::$dbo);
+                               $id = self::$db->insert_id;
                                break;
                }
                return $id;
@@ -874,11 +773,9 @@ class dba {
         * @return boolean was the lock successful?
         */
        public static function lock($table) {
-               self::initialize();
-
                // See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
                self::e("SET autocommit=0");
-               $success = self::e("LOCK TABLES `".self::$dbo->escape($table)."` WRITE");
+               $success = self::e("LOCK TABLES `".self::escape($table)."` WRITE");
                if (!$success) {
                        self::e("SET autocommit=1");
                } else {
@@ -893,8 +790,6 @@ class dba {
         * @return boolean was the unlock successful?
         */
        public static function unlock() {
-               self::initialize();
-
                // See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
                self::e("COMMIT");
                $success = self::e("UNLOCK TABLES");
@@ -909,8 +804,6 @@ class dba {
         * @return boolean Was the command executed successfully?
         */
        public static function transaction() {
-               self::initialize();
-
                if (!self::e('COMMIT')) {
                        return false;
                }
@@ -927,8 +820,6 @@ class dba {
         * @return boolean Was the command executed successfully?
         */
        public static function commit() {
-               self::initialize();
-
                if (!self::e('COMMIT')) {
                        return false;
                }
@@ -942,8 +833,6 @@ class dba {
         * @return boolean Was the command executed successfully?
         */
        public static function rollback() {
-               self::initialize();
-
                if (!self::e('ROLLBACK')) {
                        return false;
                }
@@ -954,12 +843,12 @@ class dba {
        /**
         * @brief Build the array with the table relations
         *
-        * The array is build from the database definitions in dbstructure.php
+        * The array is build from the database definitions in DBStructure.php
         *
         * This process must only be started once, since the value is cached.
         */
        private static function build_relation_data() {
-               $definition = db_definition();
+               $definition = DBStructure::definition();
 
                foreach ($definition AS $table => $structure) {
                        foreach ($structure['fields'] AS $field => $field_struct) {
@@ -975,20 +864,24 @@ class dba {
        /**
         * @brief Delete a row from a table
         *
-        * @param string $table Table name
-        * @param array $param parameter array
-        * @param boolean $in_process Internal use: Only do a commit after the last delete
-        * @param array $callstack Internal use: prevent endless loops
+        * @param string  $table       Table name
+        * @param array   $conditions  Field condition(s)
+        * @param boolean $in_process  Internal use: Only do a commit after the last delete
+        * @param array   $callstack   Internal use: prevent endless loops
         *
-        * @return boolean|array was the delete successfull? When $in_process is set: deletion data
+        * @return boolean|array was the delete successful? When $in_process is set: deletion data
         */
-       public static function delete($table, $param, $in_process = false, &$callstack = array()) {
-               self::initialize();
+       public static function delete($table, array $conditions, $in_process = false, array &$callstack = [])
+       {
+               if (empty($table) || empty($conditions)) {
+                       logger('Table and conditions have to be set');
+                       return false;
+               }
 
-               $commands = array();
+               $commands = [];
 
                // Create a key for the loop prevention
-               $key = $table.':'.implode(':', array_keys($param)).':'.implode(':', $param);
+               $key = $table . ':' . implode(':', array_keys($conditions)) . ':' . implode(':', $conditions);
 
                // We quit when this key already exists in the callstack.
                if (isset($callstack[$key])) {
@@ -997,9 +890,9 @@ class dba {
 
                $callstack[$key] = true;
 
-               $table = self::$dbo->escape($table);
+               $table = self::escape($table);
 
-               $commands[$key] = array('table' => $table, 'param' => $param);
+               $commands[$key] = ['table' => $table, 'conditions' => $conditions];
 
                // To speed up the whole process we cache the table relations
                if (count(self::$relation) == 0) {
@@ -1013,28 +906,28 @@ class dba {
                        $rel_def = array_values(self::$relation[$table])[0];
 
                        // Create a key for preventing double queries
-                       $qkey = $field.'-'.$table.':'.implode(':', array_keys($param)).':'.implode(':', $param);
+                       $qkey = $field . '-' . $table . ':' . implode(':', array_keys($conditions)) . ':' . implode(':', $conditions);
 
                        // When the search field is the relation field, we don't need to fetch the rows
                        // This is useful when the leading record is already deleted in the frontend but the rest is done in the backend
-                       if ((count($param) == 1) && ($field == array_keys($param)[0])) {
+                       if ((count($conditions) == 1) && ($field == array_keys($conditions)[0])) {
                                foreach ($rel_def AS $rel_table => $rel_fields) {
                                        foreach ($rel_fields AS $rel_field) {
-                                               $retval = self::delete($rel_table, array($rel_field => array_values($param)[0]), true, $callstack);
+                                               $retval = self::delete($rel_table, [$rel_field => array_values($conditions)[0]], true, $callstack);
                                                $commands = array_merge($commands, $retval);
                                        }
                                }
-                       // We quit when this key already exists in the callstack.
+                               // We quit when this key already exists in the callstack.
                        } elseif (!isset($callstack[$qkey])) {
 
                                $callstack[$qkey] = true;
 
                                // Fetch all rows that are to be deleted
-                               $data = self::select($table, array($field), $param);
+                               $data = self::select($table, [$field], $conditions);
 
                                while ($row = self::fetch($data)) {
                                        // Now we accumulate the delete commands
-                                       $retval = self::delete($table, array($field => $row[$field]), true, $callstack);
+                                       $retval = self::delete($table, [$field => $row[$field]], true, $callstack);
                                        $commands = array_merge($commands, $retval);
                                }
 
@@ -1053,24 +946,24 @@ class dba {
                                self::transaction();
                        }
 
-                       $compacted = array();
-                       $counter = array();
+                       $compacted = [];
+                       $counter = [];
 
                        foreach ($commands AS $command) {
-                               $condition = $command['param'];
-                               $array_element = each($condition);
+                               $conditions = $command['conditions'];
+                               $array_element = each($conditions);
                                $array_key = $array_element['key'];
                                if (is_int($array_key)) {
-                                       $condition_string = " WHERE ".array_shift($condition);
+                                       $condition_string = " WHERE " . array_shift($conditions);
                                } else {
-                                       $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
+                                       $condition_string = " WHERE `" . implode("` = ? AND `", array_keys($conditions)) . "` = ?";
                                }
 
-                               if ((count($command['param']) > 1) || is_int($array_key)) {
-                                       $sql = "DELETE FROM `".$command['table']."`".$condition_string;
-                                       logger(self::replace_parameters($sql, $condition), LOGGER_DATA);
+                               if ((count($command['conditions']) > 1) || is_int($array_key)) {
+                                       $sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
+                                       logger(self::replace_parameters($sql, $conditions), LOGGER_DATA);
 
-                                       if (!self::e($sql, $condition)) {
+                                       if (!self::e($sql, $conditions)) {
                                                if ($do_transaction) {
                                                        self::rollback();
                                                }
@@ -1078,25 +971,25 @@ class dba {
                                        }
                                } else {
                                        $key_table = $command['table'];
-                                       $key_param = array_keys($command['param'])[0];
-                                       $value = array_values($command['param'])[0];
+                                       $key_condition = array_keys($command['conditions'])[0];
+                                       $value = array_values($command['conditions'])[0];
 
                                        // Split the SQL queries in chunks of 100 values
                                        // We do the $i stuff here to make the code better readable
-                                       $i = $counter[$key_table][$key_param];
-                                       if (count($compacted[$key_table][$key_param][$i]) > 100) {
+                                       $i = $counter[$key_table][$key_condition];
+                                       if (count($compacted[$key_table][$key_condition][$i]) > 100) {
                                                ++$i;
                                        }
 
-                                       $compacted[$key_table][$key_param][$i][$value] = $value;
-                                       $counter[$key_table][$key_param] = $i;
+                                       $compacted[$key_table][$key_condition][$i][$value] = $value;
+                                       $counter[$key_table][$key_condition] = $i;
                                }
                        }
                        foreach ($compacted AS $table => $values) {
                                foreach ($values AS $field => $field_value_list) {
                                        foreach ($field_value_list AS $field_values) {
-                                               $sql = "DELETE FROM `".$table."` WHERE `".$field."` IN (".
-                                                       substr(str_repeat("?, ", count($field_values)), 0, -2).");";
+                                               $sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" .
+                                                       substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
 
                                                logger(self::replace_parameters($sql, $field_values), LOGGER_DATA);
 
@@ -1146,34 +1039,34 @@ class dba {
         *
         * @return boolean was the update successfull?
         */
-       public static function update($table, $fields, $condition, $old_fields = array()) {
-               self::initialize();
+       public static function update($table, $fields, $condition, $old_fields = []) {
 
-               $table = self::$dbo->escape($table);
+               if (empty($table) || empty($fields) || empty($condition)) {
+                       logger('Table, fields and condition have to be set');
+                       return false;
+               }
 
-               if (count($condition) > 0) {
-                       $array_element = each($condition);
-                       $array_key = $array_element['key'];
-                       if (is_int($array_key)) {
-                               $condition_string = " WHERE ".array_shift($condition);
-                       } else {
-                               $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
-                       }
+               $table = self::escape($table);
+
+               $array_element = each($condition);
+               $array_key = $array_element['key'];
+               if (is_int($array_key)) {
+                       $condition_string = " WHERE ".array_shift($condition);
                } else {
-                       $condition_string = "";
+                       $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
                }
 
                if (is_bool($old_fields)) {
                        $do_insert = $old_fields;
 
-                       $old_fields = self::select($table, array(), $condition, array('limit' => 1));
+                       $old_fields = self::selectFirst($table, [], $condition);
 
                        if (is_bool($old_fields)) {
                                if ($do_insert) {
                                        $values = array_merge($condition, $fields);
                                        return self::insert($table, $values, $do_insert);
                                }
-                               $old_fields = array();
+                               $old_fields = [];
                        }
                }
 
@@ -1203,15 +1096,40 @@ class dba {
                return self::e($sql, $params);
        }
 
+       /**
+        * Retrieve a single record from a table and returns it in an associative array
+        *
+        * @brief Retrieve a single record from a table
+        * @param string $table
+        * @param array  $fields
+        * @param array  $condition
+        * @param array  $params
+        * @return bool|array
+        * @see dba::select
+        */
+       public static function selectFirst($table, array $fields = [], array $condition = [], $params = [])
+       {
+               $params['limit'] = 1;
+               $result = self::select($table, $fields, $condition, $params);
+
+               if (is_bool($result)) {
+                       return $result;
+               } else {
+                       $row = self::fetch($result);
+                       self::close($result);
+                       return $row;
+               }
+       }
+
        /**
         * @brief Select rows from a table
         *
-        * @param string $table Table name
-        * @param array $fields array of selected fields
-        * @param array $condition array of fields for condition
-        * @param array $params array of several parameters
+        * @param string $table     Table name
+        * @param array  $fields    Array of selected fields, empty for all
+        * @param array  $condition Array of fields for condition
+        * @param array  $params    Array of several parameters
         *
-        * @return boolean|object If "limit" is equal "1" only a single row is returned, else a query object is returned
+        * @return boolean|object
         *
         * Example:
         * $table = "item";
@@ -1221,72 +1139,118 @@ class dba {
         * or:
         * $condition = array("`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr');
         *
-        * $params = array("order" => array("id", "received" => true), "limit" => 1);
+        * $params = array("order" => array("id", "received" => true), "limit" => 10);
         *
         * $data = dba::select($table, $fields, $condition, $params);
         */
-       public static function select($table, $fields = array(), $condition = array(), $params = array()) {
-               self::initialize();
-
+       public static function select($table, array $fields = [], array $condition = [], array $params = [])
+       {
                if ($table == '') {
                        return false;
                }
 
                if (count($fields) > 0) {
-                       $select_fields = "`".implode("`, `", array_values($fields))."`";
+                       $select_fields = "`" . implode("`, `", array_values($fields)) . "`";
                } else {
                        $select_fields = "*";
                }
 
-               if (count($condition) > 0) {
-                       $array_element = each($condition);
-                       $array_key = $array_element['key'];
-                       if (is_int($array_key)) {
-                               $condition_string = " WHERE ".array_shift($condition);
-                       } else {
-                               $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
-                       }
-               } else {
-                       $condition_string = "";
-               }
-
-               $param_string = '';
-               $single_row = false;
+               $condition_string = self::buildCondition($condition);
 
+               $order_string = '';
                if (isset($params['order'])) {
-                       $param_string .= " ORDER BY ";
+                       $order_string = " ORDER BY ";
                        foreach ($params['order'] AS $fields => $order) {
                                if (!is_int($fields)) {
-                                       $param_string .= "`".$fields."` ".($order ? "DESC" : "ASC").", ";
+                                       $order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
                                } else {
-                                       $param_string .= "`".$order."`, ";
+                                       $order_string .= "`" . $order . "`, ";
                                }
                        }
-                       $param_string = substr($param_string, 0, -2);
+                       $order_string = substr($order_string, 0, -2);
                }
 
+               $limit_string = '';
                if (isset($params['limit']) && is_int($params['limit'])) {
-                       $param_string .= " LIMIT ".$params['limit'];
-                       $single_row = ($params['limit'] == 1);
+                       $limit_string = " LIMIT " . $params['limit'];
                }
 
-               if (isset($params['only_query']) && $params['only_query']) {
-                       $single_row = !$params['only_query'];
+               if (isset($params['limit']) && is_array($params['limit'])) {
+                       $limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
                }
 
-               $sql = "SELECT ".$select_fields." FROM `".$table."`".$condition_string.$param_string;
+               $sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $order_string . $limit_string;
 
                $result = self::p($sql, $condition);
 
-               if (is_bool($result) || !$single_row) {
-                       return $result;
-               } else {
-                       $row = self::fetch($result);
-                       self::close($result);
-                       return $row;
+               return $result;
+       }
+
+       /**
+        * @brief Counts the rows from a table satisfying the provided condition
+        *
+        * @param string $table Table name
+        * @param array $condition array of fields for condition
+        *
+        * @return int
+        *
+        * Example:
+        * $table = "item";
+        *
+        * $condition = ["uid" => 1, "network" => 'dspr'];
+        * or:
+        * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr'];
+        *
+        * $count = dba::count($table, $condition);
+        */
+       public static function count($table, array $condition = [])
+       {
+               if ($table == '') {
+                       return false;
                }
+
+               $condition_string = self::buildCondition($condition);
+
+               $sql = "SELECT COUNT(*) AS `count` FROM `".$table."`".$condition_string;
+
+               $row = self::fetch_first($sql, $condition);
+
+               return $row['count'];
        }
 
+       /**
+        * @brief Returns the SQL condition string built from the provided condition array
+        *
+        * This function operates with two modes.
+        * - Supplied with a filed/value associative array, it builds simple strict
+        *   equality conditions linked by AND.
+        * - Supplied with a flat list, the first element is the condition string and
+        *   the following arguments are the values to be interpolated
+        *
+        * $condition = ["uid" => 1, "network" => 'dspr'];
+        * or:
+        * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr'];
+        *
+        * In either case, the provided array is left with the parameters only
+        *
+        * @param array $condition
+        * @return string
+        */
+       private static function buildCondition(array &$condition = [])
+       {
+               $condition_string = '';
+               if (count($condition) > 0) {
+                       $array_element = each($condition);
+                       $array_key = $array_element['key'];
+                       if (is_int($array_key)) {
+                               $condition_string = " WHERE ".array_shift($condition);
+                       } else {
+                               $condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
+                       }
+               }
+
+               return $condition_string;
+       }
 
        /**
         * @brief Fills an array with data from a query
@@ -1295,13 +1259,11 @@ class dba {
         * @return array Data array
         */
        public static function inArray($stmt, $do_close = true) {
-               self::initialize();
-
                if (is_bool($stmt)) {
                        return $stmt;
                }
 
-               $data = array();
+               $data = [];
                while ($row = self::fetch($stmt)) {
                        $data[] = $row;
                }
@@ -1317,9 +1279,7 @@ class dba {
         * @return string Error number (0 if no error)
         */
        public static function errorNo() {
-               self::initialize();
-
-               return self::$dbo->errorno;
+               return self::$errorno;
        }
 
        /**
@@ -1328,41 +1288,43 @@ class dba {
         * @return string Error message ('' if no error)
         */
        public static function errorMessage() {
-               self::initialize();
-
-               return self::$dbo->error;
+               return self::$error;
        }
 
        /**
         * @brief Closes the current statement
         *
         * @param object $stmt statement object
-        * @return boolean was the close successfull?
+        * @return boolean was the close successful?
         */
        public static function close($stmt) {
-               self::initialize();
+               $a = get_app();
+
+               $stamp1 = microtime(true);
 
                if (!is_object($stmt)) {
                        return false;
                }
 
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
-                               return $stmt->closeCursor();
+                               $ret = $stmt->closeCursor();
+                               break;
                        case 'mysqli':
-                               return $stmt->free_result();
-                               return $stmt->close();
-                       case 'mysql':
-                               return mysql_free_result($stmt);
+                               $stmt->free_result();
+                               $ret = $stmt->close();
+                               break;
                }
+
+               $a->save_timestamp($stamp1, 'database');
+
+               return $ret;
        }
 }
 
 function dbesc($str) {
-       global $db;
-
-       if ($db && $db->connected) {
-               return($db->escape($str));
+       if (dba::$connected) {
+               return(dba::escape($str));
        } else {
                return(str_replace("'","\\'",$str));
        }
@@ -1376,20 +1338,18 @@ function dbesc($str) {
  * dba::delete, dba::update, dba::p, dba::e
  *
  * @param $args Query parameters (1 to N parameters of different types)
- * @return array Query array
+ * @return array|bool Query array
  */
 function q($sql) {
-       global $db;
-
        $args = func_get_args();
        unset($args[0]);
 
-       if (!$db || !$db->connected) {
+       if (!dba::$connected) {
                return false;
        }
 
-       $sql = $db->clean_query($sql);
-       $sql = $db->any_value_fallback($sql);
+       $sql = dba::clean_query($sql);
+       $sql = dba::any_value_fallback($sql);
 
        $stmt = @vsprintf($sql, $args);