Merge pull request #3778 from annando/initialize-sql

"dba" is now static

diff --git a/boot.php b/boot.php
index 5b82c8b8f28d43cf0f2d7bf224375e9f6d2c2d3b..899a6bd119ca4b8cbbb2bd9b13a95c49ea723892 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -510,6 +510,11 @@ function startup() {
  */
 function get_app() {
        global $a;
+
+       if (empty($a)) {
+               $a = new App(dirname(__DIR__));
+       }
+
        return $a;
 }
 

diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index 490ea0d1cb8e44982100690be9a92d229d456abb..14f5dcfe0c797271ab5d09720223c2a8675d82a8 100755 (executable)
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -47,18 +47,16 @@ $directory = realpath($directory."/..");
 chdir($directory);
 require_once("boot.php");
 
-global $a, $db;
+global $a;
 
-if (is_null($a)) {
+if (empty($a)) {
        $a = new App(dirname(__DIR__));
 }
 
-if (is_null($db)) {
-       @include(".htconfig.php");
-       require_once("include/dba.php");
-       $db = new dba($db_host, $db_user, $db_pass, $db_data);
-       unset($db_host, $db_user, $db_pass, $db_data);
-};
+@include(".htconfig.php");
+require_once("include/dba.php");
+dba::connect($db_host, $db_user, $db_pass, $db_data);
+unset($db_host, $db_user, $db_pass, $db_data);
 
 // the logfile to which to write, should be writeable by the user which is running the server
 $sLogFile = get_config('jabber','logfile');
@@ -81,8 +79,6 @@ class exAuth {
         * @param boolean $bDebug Debug mode
         */
        public function __construct($sLogFile, $bDebug) {
-               global $db;
-
                // setter
                $this->sLogFile         = $sLogFile;
                $this->bDebug           = $bDebug;
@@ -96,7 +92,7 @@ class exAuth {
                // We are connected to the SQL server and are having a log file.
                do {
                        // Quit if the database connection went down
-                       if (!$db->connected()) {
+                       if (!dba::connected()) {
                                $this->writeDebugLog("[debug] the database connection went down");
                                return;
                        }

diff --git a/include/cli_startup.php b/include/cli_startup.php
index 01ee90f421b538a9e3231e57c67e7f8f38087965..645e5eddd8544e8c29b50478834ec1de34dee874 100644 (file)
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -8,19 +8,16 @@ require_once('boot.php');
 // Everything we need to boot standalone 'background' processes
 
 function cli_startup() {
+       global $a;
 
-       global $a, $db;
-
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 
-       if (is_null($db)) {
-               @include(".htconfig.php");
-               require_once("dba.php");
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-       };
+       @include(".htconfig.php");
+       require_once("dba.php");
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
+       unset($db_host, $db_user, $db_pass, $db_data);
 
        require_once('include/session.php');
 
@@ -29,5 +26,4 @@ function cli_startup() {
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();
-
 }

diff --git a/include/dba.php b/include/dba.php
index 73246d4908530e8c3366a7529776ab8e370497bd..42f0614c80a23fecb82233a106eaffdac77ff133 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -11,21 +11,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();
 
-       function __construct($serveraddr, $user, $pass, $db, $install = false) {
+       public static function connect($serveraddr, $user, $pass, $db, $install = false) {
+               if (!is_null(self::$db)) {
+                       return true;
+               }
+
                $a = get_app();
 
                $stamp1 = microtime(true);
@@ -45,24 +46,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 = sprintf(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 +74,47 @@ 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;
+                               self::$connected = true;
 
                                if (isset($a->config["system"]["db_charset"])) {
-                                       $this->db->set_charset($a->config["system"]["db_charset"]);
+                                       self::$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;
+               if (!self::$connected && function_exists('mysql_connect')) {
+                       self::$driver = 'mysql';
+                       self::$db = mysql_connect($serveraddr, $user, $pass);
+                       if (self::$db && mysql_select_db($db, self::$db)) {
+                               self::$connected = true;
 
                                if (isset($a->config["system"]["db_charset"])) {
-                                       mysql_set_charset($a->config["system"]["db_charset"], $this->db);
+                                       mysql_set_charset($a->config["system"]["db_charset"], self::$db);
                                }
                        }
                }
 
                // No suitable SQL driver was found.
-               if (!$this->connected) {
-                       $this->db = null;
+               if (!self::$connected) {
+                       self::$db = null;
                        if (!$install) {
                                system_unavailable();
                        }
                }
                $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 +125,21 @@ 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;
+                                       self::$_server_info = self::$db->server_info;
                                        break;
                                case 'mysql':
-                                       $this->_server_info = mysql_get_server_info($this->db);
+                                       self::$_server_info = mysql_get_server_info(self::$db);
                                        break;
                        }
                }
-               return $this->_server_info;
+               return self::$_server_info;
        }
 
        /**
@@ -162,10 +147,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 +158,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"])) {
@@ -190,7 +175,7 @@ class dba {
                        return;
                }
 
-               $r = $this->q("EXPLAIN ".$query);
+               $r = self::p("EXPLAIN ".$query);
                if (!dbm::is_result($r)) {
                        return;
                }
@@ -198,7 +183,7 @@ class dba {
                $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"])));
@@ -225,79 +210,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;
-               }
-
-               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 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);
+                       case 'mysql':
+                               return @mysql_real_escape_string($str,self::$db);
                }
        }
 
-       function connected() {
-               switch ($this->driver) {
+       public static function connected() {
+               switch (self::$driver) {
                        case 'pdo':
                                // Not sure if this really is working like expected
-                               $connected = ($this->db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
+                               $connected = (self::$db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
                                break;
                        case 'mysqli':
-                               $connected = $this->db->ping();
+                               $connected = self::$db->ping();
                                break;
                        case 'mysql':
-                               $connected = mysql_ping($this->db);
+                               $connected = mysql_ping(self::$db);
                                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 +248,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,7 +266,7 @@ 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) {
+       public static function clean_query($sql) {
                $search = array("\t", "\n", "\r", "  ");
                $replace = array(' ', ' ', ' ', ' ');
                do {
@@ -352,7 +291,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);
@@ -391,8 +330,6 @@ class dba {
         * @return object statement object
         */
        public static function p($sql) {
-               self::initialize();
-
                $a = get_app();
 
                $stamp1 = microtime(true);
@@ -410,7 +347,7 @@ class dba {
                        $args[++$i] = $param;
                }
 
-               if (!self::$dbo || !self::$dbo->connected) {
+               if (!self::$connected) {
                        return false;
                }
 
@@ -419,8 +356,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 +365,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 +381,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,12 +410,12 @@ 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':
@@ -489,26 +426,26 @@ class dba {
 
                                // 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;
                                }
@@ -534,44 +471,44 @@ class dba {
                                }
 
                                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;
+                                       self::$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);
+                               $retval = mysql_query(self::replace_parameters($sql, $args), self::$db);
+                               if (mysql_errno(self::$db)) {
+                                       self::$error = mysql_error(self::$db);
+                                       self::$errorno = mysql_errno(self::$db);
                                } else {
-                                       self::$dbo->affected_rows = mysql_affected_rows($retval);
+                                       self::$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);
+                                       if (self::$affected_rows <= 0) {
+                                               self::$affected_rows = mysql_num_rows($retval);
                                        }
                                }
                                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');
@@ -603,8 +540,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 +562,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,8 +590,6 @@ class dba {
         * @return boolean Are there rows for that condition?
         */
        public static function exists($table, $condition) {
-               self::initialize();
-
                if (empty($table)) {
                        return false;
                }
@@ -691,8 +624,6 @@ class dba {
         * @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 +645,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,12 +655,10 @@ 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':
@@ -748,12 +675,10 @@ class dba {
         * @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':
@@ -771,13 +696,11 @@ class dba {
         * @return array current row
         */
        public static function fetch($stmt) {
-               self::initialize();
-
                if (!is_object($stmt)) {
                        return false;
                }
 
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                return $stmt->fetch(PDO::FETCH_ASSOC);
                        case 'mysqli':
@@ -813,7 +736,7 @@ class dba {
                                }
                                return $columns;
                        case 'mysql':
-                               return mysql_fetch_array(self::$dbo->result, MYSQL_ASSOC);
+                               return mysql_fetch_array($stmt, MYSQL_ASSOC);
                }
        }
 
@@ -827,9 +750,7 @@ 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 (".
+               $sql = "INSERT INTO `".self::escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
                        substr(str_repeat("?, ", count($param)), 0, -2).")";
 
                if ($on_duplicate_update) {
@@ -848,17 +769,15 @@ 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;
+                               $id = self::$db->insert_id;
                                break;
                        case 'mysql':
-                               $id = mysql_insert_id(self::$dbo);
+                               $id = mysql_insert_id(self::$db);
                                break;
                }
                return $id;
@@ -874,11 +793,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 +810,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 +824,6 @@ class dba {
         * @return boolean Was the command executed successfully?
         */
        public static function transaction() {
-               self::initialize();
-
                if (!self::e('COMMIT')) {
                        return false;
                }
@@ -927,8 +840,6 @@ class dba {
         * @return boolean Was the command executed successfully?
         */
        public static function commit() {
-               self::initialize();
-
                if (!self::e('COMMIT')) {
                        return false;
                }
@@ -942,8 +853,6 @@ class dba {
         * @return boolean Was the command executed successfully?
         */
        public static function rollback() {
-               self::initialize();
-
                if (!self::e('ROLLBACK')) {
                        return false;
                }
@@ -983,8 +892,6 @@ class dba {
         * @return boolean|array was the delete successfull? When $in_process is set: deletion data
         */
        public static function delete($table, $param, $in_process = false, &$callstack = array()) {
-               self::initialize();
-
                $commands = array();
 
                // Create a key for the loop prevention
@@ -997,7 +904,7 @@ class dba {
 
                $callstack[$key] = true;
 
-               $table = self::$dbo->escape($table);
+               $table = self::escape($table);
 
                $commands[$key] = array('table' => $table, 'param' => $param);
 
@@ -1147,9 +1054,7 @@ class dba {
         * @return boolean was the update successfull?
         */
        public static function update($table, $fields, $condition, $old_fields = array()) {
-               self::initialize();
-
-               $table = self::$dbo->escape($table);
+               $table = self::escape($table);
 
                if (count($condition) > 0) {
                        $array_element = each($condition);
@@ -1226,8 +1131,6 @@ class dba {
         * $data = dba::select($table, $fields, $condition, $params);
         */
        public static function select($table, $fields = array(), $condition = array(), $params = array()) {
-               self::initialize();
-
                if ($table == '') {
                        return false;
                }
@@ -1295,8 +1198,6 @@ class dba {
         * @return array Data array
         */
        public static function inArray($stmt, $do_close = true) {
-               self::initialize();
-
                if (is_bool($stmt)) {
                        return $stmt;
                }
@@ -1317,9 +1218,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,9 +1227,7 @@ class dba {
         * @return string Error message ('' if no error)
         */
        public static function errorMessage() {
-               self::initialize();
-
-               return self::$dbo->error;
+               return self::$error;
        }
 
        /**
@@ -1340,13 +1237,11 @@ class dba {
         * @return boolean was the close successfull?
         */
        public static function close($stmt) {
-               self::initialize();
-
                if (!is_object($stmt)) {
                        return false;
                }
 
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                return $stmt->closeCursor();
                        case 'mysqli':
@@ -1359,10 +1254,8 @@ class dba {
 }
 
 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));
        }
@@ -1379,17 +1272,15 @@ function dbesc($str) {
  * @return array 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);
 

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 4d615a2f14ba16dcd8929cb3da4fac6c8507de45..b8cf8e57ac4881f846cc03a4ec9f94c5c5cc1edf 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -17,10 +17,8 @@ const DB_UPDATE_FAILED = 2;      // Database check failed
  * Converts all tables from MyISAM to InnoDB
  */
 function convert_to_innodb() {
-       global $db;
-
        $r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
-               dbesc($db->database_name()));
+               dbesc(dba::database_name()));
 
        if (!dbm::is_result($r)) {
                echo t('There are no tables on MyISAM.')."\n";
@@ -33,7 +31,7 @@ function convert_to_innodb() {
 
                $result = dba::e($sql);
                if (!dbm::is_result($result)) {
-                       print_update_error($db, $sql);
+                       print_update_error($sql);
                }
        }
 }
@@ -188,20 +186,19 @@ function print_structure($database) {
 /**
  * @brief Print out database error messages
  *
- * @param object $db Database object
  * @param string $message Message to be added to the error message
  *
  * @return string Error message
  */
-function print_update_error($db, $message) {
+function print_update_error($message) {
        echo sprintf(t("\nError %d occurred during database update:\n%s\n"),
-               $db->errorno, $db->error);
+               dba::errorNo(), dba::errorMessage());
 
        return t('Errors encountered performing database changes: ').$message.EOL;
 }
 
 function update_structure($verbose, $action, $tables=null, $definition=null) {
-       global $a, $db;
+       global $a;
 
        if ($action) {
                Config::set('system', 'maintenance', 1);
@@ -234,8 +231,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
        }
 
        // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
-       if ((version_compare($db->server_info(), '5.7.4') >= 0) &&
-               !(strpos($db->server_info(), 'MariaDB') !== false)) {
+       if ((version_compare(dba::server_info(), '5.7.4') >= 0) &&
+               !(strpos(dba::server_info(), 'MariaDB') !== false)) {
                $ignore = '';
        } else {
                $ignore = ' IGNORE';
@@ -249,7 +246,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                if (!isset($database[$name])) {
                        $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
                        if (!dbm::is_result($r)) {
-                               $errors .= print_update_error($db, $name);
+                               $errors .= print_update_error($name);
                        }
                        $is_new_table = True;
                } else {
@@ -446,7 +443,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        } else {
                                                $r = dba::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
                                                if (!dbm::is_result($r)) {
-                                                       $errors .= print_update_error($db, $sql3);
+                                                       $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                        }
@@ -454,7 +451,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 
                                $r = @dba::e($sql3);
                                if (!dbm::is_result($r)) {
-                                       $errors .= print_update_error($db, $sql3);
+                                       $errors .= print_update_error($sql3);
                                }
                                if ($is_unique) {
                                        if ($ignore != "") {
@@ -462,17 +459,17 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        } else {
                                                $r = dba::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
                                                if (!dbm::is_result($r)) {
-                                                       $errors .= print_update_error($db, $sql3);
+                                                       $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                                $r = dba::e("DROP TABLE `".$name."`;");
                                                if (!dbm::is_result($r)) {
-                                                       $errors .= print_update_error($db, $sql3);
+                                                       $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                                $r = dba::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
                                                if (!dbm::is_result($r)) {
-                                                       $errors .= print_update_error($db, $sql3);
+                                                       $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                        }
@@ -522,7 +519,7 @@ function db_field_command($parameters, $create = true) {
 }
 
 function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
-       global $a, $db;
+       global $a;
 
        $r = true;
 
@@ -1761,18 +1758,16 @@ function db_definition() {
  * run from command line
  */
 function dbstructure_run(&$argv, &$argc) {
-       global $a, $db;
+       global $a;
 
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 
-       if (is_null($db)) {
-               @include ".htconfig.php";
-               require_once "include/dba.php";
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-       }
+       @include ".htconfig.php";
+       require_once "include/dba.php";
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
+       unset($db_host, $db_user, $db_pass, $db_data);
 
        if ($argc == 2) {
                switch ($argv[1]) {

diff --git a/include/poller.php b/include/poller.php
index d3150421143a5521de4ab0f4960b61a163b7a96f..b8f0d7189fdf76f761966c255e79d6e3ef800956 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -19,15 +19,17 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 require_once("boot.php");
 
 function poller_run($argv, $argc){
-       global $a, $db, $poller_up_start, $poller_db_duration;
+       global $a, $poller_up_start, $poller_db_duration;
 
        $poller_up_start = microtime(true);
 
-       $a = new App(dirname(__DIR__));
+       if (empty($a)) {
+               $a = new App(dirname(__DIR__));
+       }
 
-       @include(".htconfig.php");
-       require_once("include/dba.php");
-       $db = new dba($db_host, $db_user, $db_pass, $db_data);
+       require_once ".htconfig.php";
+       require_once "include/dba.php";
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
        unset($db_host, $db_user, $db_pass, $db_data);
 
        Config::load();

diff --git a/include/shadowupdate.php b/include/shadowupdate.php
index 756f220ec823d67a4265738b2b624fb6baec6d34..c41b2312214bb1eed9e019c7ac266b9f412e9793 100644 (file)
--- a/include/shadowupdate.php
+++ b/include/shadowupdate.php
@@ -7,18 +7,16 @@ require_once("boot.php");
 require_once("include/threads.php");
 
 function shadowupdate_run(&$argv, &$argc){
-       global $a, $db;
+       global $a;
 
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 
-       if (is_null($db)) {
-               @include(".htconfig.php");
-               require_once("include/dba.php");
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-       }
+       @include(".htconfig.php");
+       require_once("include/dba.php");
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
+       unset($db_host, $db_user, $db_pass, $db_data);
 
        Config::load();
 

diff --git a/include/text.php b/include/text.php
index 66d4f17ea66ac5b20ef9c486f207d23dfa65e68a..dc34edcd22b2024685e425bbd27551dff3cf2b42 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -702,20 +702,18 @@ $LOGGER_LEVELS = array();
  * LOGGER_ALL
  *
  * @global App $a
- * @global dba $db
  * @global array $LOGGER_LEVELS
  * @param string $msg
  * @param int $level
  */
 function logger($msg, $level = 0) {
        $a = get_app();
-       global $db;
        global $LOGGER_LEVELS;
 
        // turn off logger in install mode
        if (
                $a->module == 'install'
-               || ! ($db && $db->connected)
+               || !dba::$connected
        ) {
                return;
        }
@@ -776,7 +774,6 @@ function logger($msg, $level = 0) {
  * LOGGER_ALL
  *
  * @global App $a
- * @global dba $db
  * @global array $LOGGER_LEVELS
  * @param string $msg
  * @param int $level
@@ -784,12 +781,11 @@ function logger($msg, $level = 0) {
 
 function dlogger($msg, $level = 0) {
        $a = get_app();
-       global $db;
 
        // turn off logger in install mode
        if (
                $a->module == 'install'
-               || ! ($db && $db->connected)
+               || !dba::$connected
        ) {
                return;
        }

diff --git a/include/uimport.php b/include/uimport.php
index 57c5375ef1a8bbfa5365b3ec55f1d5cd66a6b6d6..359fc90673d083a5e317bfda4a415a4b905900ca 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -14,11 +14,6 @@ function last_insert_id() {
        return dba::lastInsertId();
 }
 
-function last_error() {
-       global $db;
-       return $db->error;
-}
-
 /**
  * Remove columns from array $arr that aren't in table $table
  *
@@ -103,7 +98,7 @@ function import_account(App $a, $file) {
        // check for username
        $r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);
        if ($r === false) {
-               logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
+               logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                notice(t('Error! Cannot check nickname'));
                return;
        }
@@ -114,7 +109,7 @@ function import_account(App $a, $file) {
        // check if username matches deleted account
        $r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']);
        if ($r === false) {
-               logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
+               logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                notice(t('Error! Cannot check nickname'));
                return;
        }
@@ -144,7 +139,7 @@ function import_account(App $a, $file) {
        $r = db_import_assoc('user', $account['user']);
        if ($r === false) {
                //echo "<pre>"; var_dump($r, $query, mysql_error()); killme();
-               logger("uimport:insert user : ERROR : " . last_error(), LOGGER_NORMAL);
+               logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                notice(t("User creation error"));
                return;
        }
@@ -165,7 +160,7 @@ function import_account(App $a, $file) {
                $profile['uid'] = $newuid;
                $r = db_import_assoc('profile', $profile);
                if ($r === false) {
-                       logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                        info(t("User profile creation error"));
                        dba::delete('user', array('uid' => $newuid));
                        return;
@@ -208,7 +203,7 @@ function import_account(App $a, $file) {
                $contact['uid'] = $newuid;
                $r = db_import_assoc('contact', $contact);
                if ($r === false) {
-                       logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                        $errorcount++;
                } else {
                        $contact['newid'] = last_insert_id();
@@ -222,7 +217,7 @@ function import_account(App $a, $file) {
                $group['uid'] = $newuid;
                $r = db_import_assoc('group', $group);
                if ($r === false) {
-                       logger("uimport:insert group " . $group['name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert group " . $group['name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                } else {
                        $group['newid'] = last_insert_id();
                }
@@ -249,7 +244,7 @@ function import_account(App $a, $file) {
                if ($import == 2) {
                        $r = db_import_assoc('group_member', $group_member);
                        if ($r === false) {
-                               logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                               logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                        }
                }
        }
@@ -266,7 +261,7 @@ function import_account(App $a, $file) {
                );
 
                if ($r === false) {
-                       logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                }
        }
 
@@ -274,7 +269,7 @@ function import_account(App $a, $file) {
                $pconfig['uid'] = $newuid;
                $r = db_import_assoc('pconfig', $pconfig);
                if ($r === false) {
-                       logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                }
        }
 

diff --git a/index.php b/index.php
index 49a3b216da6624fe4623c80cc43adf2bcd813835..c94675a59ae65a887fe181c1350f714555d3e8d4 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,7 +20,9 @@ use Friendica\Core\Config;
 require_once 'boot.php';
 require_once 'object/BaseObject.php';
 
-$a = new App(__DIR__);
+if (empty($a)) {
+       $a = new App(__DIR__);
+}
 BaseObject::set_app($a);
 
 // We assume that the index.php is called by a frontend process
@@ -51,7 +53,7 @@ if (!$install) {
 require_once "include/dba.php";
 
 if (!$install) {
-       $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+       dba::connect($db_host, $db_user, $db_pass, $db_data, $install);
        unset($db_host, $db_user, $db_pass, $db_data);
 
        /**

diff --git a/mod/admin.php b/mod/admin.php
index 78f12a4820476cb14c2a1ce4a645bcdf416e1302..7c7ee51d53060228a2f21d87d14185090fa5cdc4 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -606,10 +606,9 @@ function admin_page_queue(App $a) {
  * @return string
  */
 function admin_page_summary(App $a) {
-       global $db;
        // are there MyISAM tables in the DB? If so, trigger a warning message
        $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
-               dbesc($db->database_name()));
+               dbesc(dba::database_name()));
        $showwarning = false;
        $warningtext = array();
        if (dbm::is_result($r)) {
@@ -726,7 +725,7 @@ function admin_page_site_post(App $a) {
                $old_host = str_replace("http://", "@", normalise_link($old_url));
 
                function update_table($table_name, $fields, $old_url, $new_url) {
-                       global $db, $a;
+                       global $a;
 
                        $dbold = dbesc($old_url);
                        $dbnew = dbesc($new_url);
@@ -743,7 +742,7 @@ function admin_page_site_post(App $a) {
                        $q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
                        $r = q($q);
                        if (!$r) {
-                               notice("Failed updating '$table_name': ".$db->error);
+                               notice("Failed updating '$table_name': ".dba::errorMessage());
                                goaway('admin/site');
                        }
                }

diff --git a/mod/directory.php b/mod/directory.php
index 9e004ab5d8b41c1e2a28bb630aa95618f7585998..c83b7b4116167c3b33218297f5fc44c78dfa073a 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -24,8 +24,6 @@ function directory_post(App $a) {
 }
 
 function directory_content(App $a) {
-       global $db;
-
        require_once("mod/proxy.php");
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||

diff --git a/mod/install.php b/mod/install.php
index ae462914c84389ac8ee5ab65301183eff91dbff5..ed75e624b58c97a894ec9c92ce4b2bd875e47d49 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -28,7 +28,7 @@ function install_init(App $a) {
 }
 
 function install_post(App $a) {
-       global $install_wizard_pass, $db;
+       global $install_wizard_pass;
 
        switch($install_wizard_pass) {
                case 1:
@@ -44,9 +44,7 @@ function install_post(App $a) {
                        $phpath = notags(trim($_POST['phpath']));
 
                        require_once("include/dba.php");
-                       unset($db);
-                       $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
-                       if (!$db->connected) {
+                       if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true)) {
                                $a->data['db_conn_failed'] = true;
                        }
 
@@ -65,7 +63,7 @@ function install_post(App $a) {
                        $rino = 2;
 
                        // connect to db
-                       $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+                       dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true);
 
                        $tpl = get_markup_template('htconfig.tpl');
                        $txt = replace_macros($tpl,array(
@@ -87,7 +85,7 @@ function install_post(App $a) {
                                $a->data['txt'] = $txt;
                        }
 
-                       $errors = load_database($db);
+                       $errors = load_database();
 
 
                        if ($errors) {
@@ -103,7 +101,7 @@ function install_post(App $a) {
 
 function install_content(App $a) {
 
-       global $install_wizard_pass, $db;
+       global $install_wizard_pass;
        $o = '';
        $wizard_status = "";
        $install_title = t('Friendica Communications Server - Setup');
@@ -133,7 +131,7 @@ function install_content(App $a) {
                $db_return_text .= $txt;
        }
 
-       if ($db && $db->connected) {
+       if (dba::$connected) {
                $r = q("SELECT COUNT(*) as `total` FROM `user`");
                if (dbm::is_result($r) && $r[0]['total']) {
                        $tpl = get_markup_template('install.tpl');
@@ -534,7 +532,7 @@ function load_database_rem($v, $i) {
        }
 }
 
-function load_database($db) {
+function load_database() {
 
        require_once("include/dbstructure.php");
        $errors = update_structure(false, true);

diff --git a/src/App.php b/src/App.php
index 67dfacf7a3fb891d0409da759b1768703cbe9c28..30d66dd2d50d5421a63e4165d1667c7aa208eb52 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -132,8 +132,14 @@ class App {
 
                $hostname = '';
 
-               if (file_exists('.htpreconfig.php')) {
-                       include '.htpreconfig.php';
+               if (! static::directory_usable($basepath, false)) {
+                       throw new Exception('Basepath ' . $basepath . ' isn\'t usable.');
+               }
+
+               $this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
+
+               if (file_exists($this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php')) {
+                       include $this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php';
                }
 
                $this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
@@ -201,12 +207,6 @@ class App {
                        $this->hostname = $hostname;
                }
 
-               if (! static::directory_usable($basepath, false)) {
-                       throw new Exception('Basepath ' . $basepath . ' isn\'t usable.');
-               }
-
-               $this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
-
                set_include_path(
                        get_include_path() . PATH_SEPARATOR
                        . $this->basepath . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR
@@ -416,8 +416,8 @@ class App {
                                $this->path = trim($parsed['path'], '\\/');
                        }
 
-                       if (file_exists('.htpreconfig.php')) {
-                               include '.htpreconfig.php';
+                       if (file_exists($this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php')) {
+                               include $this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php';
                        }
 
                        if (Config::get('config', 'hostname') != '') {

diff --git a/util/db_update.php b/util/db_update.php
index 5b31080506ed7093bdab14b4e754e1ee8032b6d4..d9bb0abf2ec577b5cdfc8db91a308ace31631cbf 100644 (file)
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -11,14 +11,16 @@ use Friendica\App;
  */
 require_once("boot.php");
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
 @include(".htconfig.php");
 
 $lang = get_browser_language();
 load_translation_table($lang);
 
 require_once("include/dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, false);
+dba::connect($db_host, $db_user, $db_pass, $db_data, false);
 unset($db_host, $db_user, $db_pass, $db_data);
 
 $build = get_config('system', 'build');

diff --git a/util/maintenance.php b/util/maintenance.php
index 9c9fc4f19d95404569c10e751fa6173f31a6f257..39c2acb0e1f13a304d0c966ce7ec10bafb064992 100644 (file)
--- a/util/maintenance.php
+++ b/util/maintenance.php
@@ -5,14 +5,17 @@ use Friendica\Core\Config;
 
 require_once("boot.php");
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
+
 @include(".htconfig.php");
 
 $lang = get_browser_language();
 load_translation_table($lang);
 
 require_once("include/dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, false);
+dba::connect($db_host, $db_user, $db_pass, $db_data, false);
 unset($db_host, $db_user, $db_pass, $db_data);
 
 Config::load();

diff --git a/util/typo.php b/util/typo.php
index d837bcefc981cb7f257504417fa7c98a572b0dfd..313033f3e5a1885ac740790dda476504ccb1ee12 100755 (executable)
--- a/util/typo.php
+++ b/util/typo.php
@@ -13,7 +13,9 @@ ini_set('log_errors', '0');
 
 include 'boot.php';
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
 
 if (x($a->config, 'php_path')) {
        $phpath = $a->config['php_path'];