strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3778 from annando/initialize-sql

Browse source 
"dba" is now static
This commit is contained in:
Tobias Diekershoff 2017-10-12 07:24:16 +02:00 committed by GitHub
commit bc41a2b606
17 changed files with 238 additions and 360 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boot.php
View file

@ -510,6 +510,11 @@ function startup() {
*/ */
function get_app() { function get_app() {
global $a; global $a;
if (empty($a)) {
$a = new App(dirname(__DIR__));
}
return $a; return $a;
} }

12
include/auth_ejabberd.php
View file

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

10
include/cli_startup.php
View file

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

383
include/dba.php
View file

@ -11,21 +11,22 @@ require_once('include/datetime.php');
*/ */
class dba { class dba {
public static $connected = true;
private $debug = 0; private static $_server_info = '';
private $db; private static $db;
private $result; private static $driver;
private $driver; private static $error = false;
public $connected = false; private static $errorno = 0;
public $error = false; private static $affected_rows = 0;
public $errorno = 0;
public $affected_rows = 0;
private $_server_info = '';
private static $in_transaction = false; private static $in_transaction = false;
private static $dbo;
private static $relation = array(); 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(); $a = get_app();
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -45,24 +46,24 @@ class dba {
$db = trim($db); $db = trim($db);
if (!(strlen($server) && strlen($user))) { if (!(strlen($server) && strlen($user))) {
$this->connected = false; self::$connected = false;
$this->db = null; self::$db = null;
return; return false;
} }
if ($install) { if ($install) {
if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
$this->error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server); self::$error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server);
$this->connected = false; self::$connected = false;
$this->db = null; self::$db = null;
return; return false;
} }
} }
} }
if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) { if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
$this->driver = 'pdo'; self::$driver = 'pdo';
$connect = "mysql:host=".$server.";dbname=".$db; $connect = "mysql:host=".$server.";dbname=".$db;
if (isset($port)) { if (isset($port)) {
@ -73,63 +74,47 @@ class dba {
$connect .= ";charset=".$a->config["system"]["db_charset"]; $connect .= ";charset=".$a->config["system"]["db_charset"];
} }
try { try {
$this->db = @new PDO($connect, $user, $pass); self::$db = @new PDO($connect, $user, $pass);
$this->connected = true; self::$connected = true;
} catch (PDOException $e) { } catch (PDOException $e) {
$this->connected = false; self::$connected = false;
} }
} }
if (!$this->connected && class_exists('mysqli')) { if (!self::$connected && class_exists('mysqli')) {
$this->driver = 'mysqli'; self::$driver = 'mysqli';
$this->db = @new mysqli($server, $user, $pass, $db, $port); self::$db = @new mysqli($server, $user, $pass, $db, $port);
if (!mysqli_connect_errno()) { if (!mysqli_connect_errno()) {
$this->connected = true; self::$connected = true;
if (isset($a->config["system"]["db_charset"])) { 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')) { if (!self::$connected && function_exists('mysql_connect')) {
$this->driver = 'mysql'; self::$driver = 'mysql';
$this->db = mysql_connect($serveraddr, $user, $pass); self::$db = mysql_connect($serveraddr, $user, $pass);
if ($this->db && mysql_select_db($db, $this->db)) { if (self::$db && mysql_select_db($db, self::$db)) {
$this->connected = true; self::$connected = true;
if (isset($a->config["system"]["db_charset"])) { 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. // No suitable SQL driver was found.
if (!$this->connected) { if (!self::$connected) {
$this->db = null; self::$db = null;
if (!$install) { if (!$install) {
system_unavailable(); system_unavailable();
} }
} }
$a->save_timestamp($stamp1, "network"); $a->save_timestamp($stamp1, "network");
self::$dbo = $this; return true;
}
/**
* @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!');
}
}
} }
/** /**
@ -140,21 +125,21 @@ class dba {
* *
* @return string * @return string
*/ */
public function server_info() { public static function server_info() {
if ($this->_server_info == '') { if (self::$_server_info == '') {
switch ($this->driver) { switch (self::$driver) {
case 'pdo': case 'pdo':
$this->_server_info = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION); self::$_server_info = self::$db->getAttribute(PDO::ATTR_SERVER_VERSION);
break; break;
case 'mysqli': case 'mysqli':
$this->_server_info = $this->db->server_info; self::$_server_info = self::$db->server_info;
break; break;
case 'mysql': case 'mysql':
$this->_server_info = mysql_get_server_info($this->db); self::$_server_info = mysql_get_server_info(self::$db);
break; break;
} }
} }
return $this->_server_info; return self::$_server_info;
} }
/** /**
@ -162,10 +147,10 @@ class dba {
* *
* @return string * @return string
*/ */
public function database_name() { public static function database_name() {
$r = $this->q("SELECT DATABASE() AS `db`"); $ret = self::p("SELECT DATABASE() AS `db`");
$data = self::inArray($ret);
return $r[0]['db']; return $data[0]['db'];
} }
/** /**
@ -173,7 +158,7 @@ class dba {
* *
* @param string $query The database query that will be analyzed * @param string $query The database query that will be analyzed
*/ */
public function log_index($query) { private static function log_index($query) {
$a = get_app(); $a = get_app();
if (empty($a->config["system"]["db_log_index"])) { if (empty($a->config["system"]["db_log_index"])) {
@ -190,7 +175,7 @@ class dba {
return; return;
} }
$r = $this->q("EXPLAIN ".$query); $r = self::p("EXPLAIN ".$query);
if (!dbm::is_result($r)) { if (!dbm::is_result($r)) {
return; return;
} }
@ -198,7 +183,7 @@ class dba {
$watchlist = explode(',', $a->config["system"]["db_log_index_watch"]); $watchlist = explode(',', $a->config["system"]["db_log_index_watch"]);
$blacklist = explode(',', $a->config["system"]["db_log_index_blacklist"]); $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)) { if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
$log = (in_array($row['key'], $watchlist) && $log = (in_array($row['key'], $watchlist) &&
($row['rows'] >= intval($a->config["system"]["db_loglimit_index"]))); ($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
@ -225,79 +210,33 @@ class dba {
} }
} }
/** public static function escape($str) {
* @brief execute SQL query - deprecated switch (self::$driver) {
*
* 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': case 'pdo':
return substr(@$this->db->quote($str, PDO::PARAM_STR), 1, -1); return substr(@self::$db->quote($str, PDO::PARAM_STR), 1, -1);
case 'mysqli': case 'mysqli':
return @$this->db->real_escape_string($str); return @self::$db->real_escape_string($str);
case 'mysql': case 'mysql':
return @mysql_real_escape_string($str,$this->db); return @mysql_real_escape_string($str,self::$db);
}
} }
} }
function connected() { public static function connected() {
switch ($this->driver) { switch (self::$driver) {
case 'pdo': case 'pdo':
// Not sure if this really is working like expected // 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; break;
case 'mysqli': case 'mysqli':
$connected = $this->db->ping(); $connected = self::$db->ping();
break; break;
case 'mysql': case 'mysql':
$connected = mysql_ping($this->db); $connected = mysql_ping(self::$db);
break; break;
} }
return $connected; 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, * @brief Replaces ANY_VALUE() function by MIN() function,
* if the database server does not support ANY_VALUE(). * if the database server does not support ANY_VALUE().
@ -309,8 +248,8 @@ class dba {
* @param string $sql An SQL string without the values * @param string $sql An SQL string without the values
* @return string The input SQL string modified if necessary. * @return string The input SQL string modified if necessary.
*/ */
public function any_value_fallback($sql) { public static function any_value_fallback($sql) {
$server_info = $this->server_info(); $server_info = self::server_info();
if (version_compare($server_info, '5.7.5', '<') || if (version_compare($server_info, '5.7.5', '<') ||
(stripos($server_info, 'MariaDB') !== false)) { (stripos($server_info, 'MariaDB') !== false)) {
$sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql); $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql);
@ -327,7 +266,7 @@ class dba {
* @param string $sql An SQL string without the values * @param string $sql An SQL string without the values
* @return string The input SQL string modified if necessary. * @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", " "); $search = array("\t", "\n", "\r", " ");
$replace = array(' ', ' ', ' ', ' '); $replace = array(' ', ' ', ' ', ' ');
do { do {
@ -352,7 +291,7 @@ class dba {
if (is_int($args[$param]) || is_float($args[$param])) { if (is_int($args[$param]) || is_float($args[$param])) {
$replace = intval($args[$param]); $replace = intval($args[$param]);
} else { } else {
$replace = "'".self::$dbo->escape($args[$param])."'"; $replace = "'".self::escape($args[$param])."'";
} }
$pos = strpos($sql, '?', $offset); $pos = strpos($sql, '?', $offset);
@ -391,8 +330,6 @@ class dba {
* @return object statement object * @return object statement object
*/ */
public static function p($sql) { public static function p($sql) {
self::initialize();
$a = get_app(); $a = get_app();
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -410,7 +347,7 @@ class dba {
$args[++$i] = $param; $args[++$i] = $param;
} }
if (!self::$dbo || !self::$dbo->connected) { if (!self::$connected) {
return false; return false;
} }
@ -419,8 +356,8 @@ class dba {
logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG); logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
} }
$sql = self::$dbo->clean_query($sql); $sql = self::clean_query($sql);
$sql = self::$dbo->any_value_fallback($sql); $sql = self::any_value_fallback($sql);
$orig_sql = $sql; $orig_sql = $sql;
@ -428,9 +365,9 @@ class dba {
$sql = "/*".System::callstack()." */ ".$sql; $sql = "/*".System::callstack()." */ ".$sql;
} }
self::$dbo->error = ''; self::$error = '';
self::$dbo->errorno = 0; self::$errorno = 0;
self::$dbo->affected_rows = 0; self::$affected_rows = 0;
// We have to make some things different if this function is called from "e" // We have to make some things different if this function is called from "e"
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); $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" // We are having an own error logging in the function "e"
$called_from_e = ($called_from['function'] == 'e'); $called_from_e = ($called_from['function'] == 'e');
switch (self::$dbo->driver) { switch (self::$driver) {
case 'pdo': case 'pdo':
// If there are no arguments we use "query" // If there are no arguments we use "query"
if (count($args) == 0) { if (count($args) == 0) {
if (!$retval = self::$dbo->db->query($sql)) { if (!$retval = self::$db->query($sql)) {
$errorInfo = self::$dbo->db->errorInfo(); $errorInfo = self::$db->errorInfo();
self::$dbo->error = $errorInfo[2]; self::$error = $errorInfo[2];
self::$dbo->errorno = $errorInfo[1]; self::$errorno = $errorInfo[1];
$retval = false; $retval = false;
break; break;
} }
self::$dbo->affected_rows = $retval->rowCount(); self::$affected_rows = $retval->rowCount();
break; break;
} }
if (!$stmt = self::$dbo->db->prepare($sql)) { if (!$stmt = self::$db->prepare($sql)) {
$errorInfo = self::$dbo->db->errorInfo(); $errorInfo = self::$db->errorInfo();
self::$dbo->error = $errorInfo[2]; self::$error = $errorInfo[2];
self::$dbo->errorno = $errorInfo[1]; self::$errorno = $errorInfo[1];
$retval = false; $retval = false;
break; break;
} }
@ -473,12 +410,12 @@ class dba {
if (!$stmt->execute()) { if (!$stmt->execute()) {
$errorInfo = $stmt->errorInfo(); $errorInfo = $stmt->errorInfo();
self::$dbo->error = $errorInfo[2]; self::$error = $errorInfo[2];
self::$dbo->errorno = $errorInfo[1]; self::$errorno = $errorInfo[1];
$retval = false; $retval = false;
} else { } else {
$retval = $stmt; $retval = $stmt;
self::$dbo->affected_rows = $retval->rowCount(); self::$affected_rows = $retval->rowCount();
} }
break; break;
case 'mysqli': case 'mysqli':
@ -489,26 +426,26 @@ class dba {
// The fallback routine is called as well when there are no arguments // The fallback routine is called as well when there are no arguments
if (!$can_be_prepared || (count($args) == 0)) { if (!$can_be_prepared || (count($args) == 0)) {
$retval = self::$dbo->db->query(self::replace_parameters($sql, $args)); $retval = self::$db->query(self::replace_parameters($sql, $args));
if (self::$dbo->db->errno) { if (self::$db->errno) {
self::$dbo->error = self::$dbo->db->error; self::$error = self::$db->error;
self::$dbo->errorno = self::$dbo->db->errno; self::$errorno = self::$db->errno;
$retval = false; $retval = false;
} else { } else {
if (isset($retval->num_rows)) { if (isset($retval->num_rows)) {
self::$dbo->affected_rows = $retval->num_rows; self::$affected_rows = $retval->num_rows;
} else { } else {
self::$dbo->affected_rows = self::$dbo->db->affected_rows; self::$affected_rows = self::$db->affected_rows;
} }
} }
break; break;
} }
$stmt = self::$dbo->db->stmt_init(); $stmt = self::$db->stmt_init();
if (!$stmt->prepare($sql)) { if (!$stmt->prepare($sql)) {
self::$dbo->error = $stmt->error; self::$error = $stmt->error;
self::$dbo->errorno = $stmt->errno; self::$errorno = $stmt->errno;
$retval = false; $retval = false;
break; break;
} }
@ -534,44 +471,44 @@ class dba {
} }
if (!$stmt->execute()) { if (!$stmt->execute()) {
self::$dbo->error = self::$dbo->db->error; self::$error = self::$db->error;
self::$dbo->errorno = self::$dbo->db->errno; self::$errorno = self::$db->errno;
$retval = false; $retval = false;
} else { } else {
$stmt->store_result(); $stmt->store_result();
$retval = $stmt; $retval = $stmt;
self::$dbo->affected_rows = $retval->affected_rows; self::$affected_rows = $retval->affected_rows;
} }
break; break;
case 'mysql': case 'mysql':
// For the old "mysql" functions we cannot use prepared statements // For the old "mysql" functions we cannot use prepared statements
$retval = mysql_query(self::replace_parameters($sql, $args), self::$dbo->db); $retval = mysql_query(self::replace_parameters($sql, $args), self::$db);
if (mysql_errno(self::$dbo->db)) { if (mysql_errno(self::$db)) {
self::$dbo->error = mysql_error(self::$dbo->db); self::$error = mysql_error(self::$db);
self::$dbo->errorno = mysql_errno(self::$dbo->db); self::$errorno = mysql_errno(self::$db);
} else { } 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 // Due to missing mysql_* support this here wasn't tested at all
// See here: http://php.net/manual/en/function.mysql-num-rows.php // See here: http://php.net/manual/en/function.mysql-num-rows.php
if (self::$dbo->affected_rows <= 0) { if (self::$affected_rows <= 0) {
self::$dbo->affected_rows = mysql_num_rows($retval); self::$affected_rows = mysql_num_rows($retval);
} }
} }
break; break;
} }
// We are having an own error logging in the function "e" // 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 // We have to preserve the error code, somewhere in the logging it get lost
$error = self::$dbo->error; $error = self::$error;
$errorno = self::$dbo->errorno; $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)); System::callstack(8)."\n".self::replace_parameters($sql, $params));
self::$dbo->error = $error; self::$error = $error;
self::$dbo->errorno = $errorno; self::$errorno = $errorno;
} }
$a->save_timestamp($stamp1, 'database'); $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 * @return boolean Was the query successfull? False is returned only if an error occurred
*/ */
public static function e($sql) { public static function e($sql) {
self::initialize();
$a = get_app(); $a = get_app();
$stamp = microtime(true); $stamp = microtime(true);
@ -627,18 +562,18 @@ class dba {
self::close($stmt); 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 // We have to preserve the error code, somewhere in the logging it get lost
$error = self::$dbo->error; $error = self::$error;
$errorno = self::$dbo->errorno; $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)); System::callstack(8)."\n".self::replace_parameters($sql, $params));
self::$dbo->error = $error; self::$error = $error;
self::$dbo->errorno = $errorno; self::$errorno = $errorno;
} }
$a->save_timestamp($stamp, "database_write"); $a->save_timestamp($stamp, "database_write");
@ -655,8 +590,6 @@ class dba {
* @return boolean Are there rows for that condition? * @return boolean Are there rows for that condition?
*/ */
public static function exists($table, $condition) { public static function exists($table, $condition) {
self::initialize();
if (empty($table)) { if (empty($table)) {
return false; return false;
} }
@ -691,8 +624,6 @@ class dba {
* @return array first row of query * @return array first row of query
*/ */
public static function fetch_first($sql) { public static function fetch_first($sql) {
self::initialize();
$params = self::getParam(func_get_args()); $params = self::getParam(func_get_args());
$stmt = self::p($sql, $params); $stmt = self::p($sql, $params);
@ -714,9 +645,7 @@ class dba {
* @return int Number of rows * @return int Number of rows
*/ */
public static function affected_rows() { public static function affected_rows() {
self::initialize(); return self::$affected_rows;
return self::$dbo->affected_rows;
} }
/** /**
@ -726,12 +655,10 @@ class dba {
* @return int Number of columns * @return int Number of columns
*/ */
public static function columnCount($stmt) { public static function columnCount($stmt) {
self::initialize();
if (!is_object($stmt)) { if (!is_object($stmt)) {
return 0; return 0;
} }
switch (self::$dbo->driver) { switch (self::$driver) {
case 'pdo': case 'pdo':
return $stmt->columnCount(); return $stmt->columnCount();
case 'mysqli': case 'mysqli':
@ -748,12 +675,10 @@ class dba {
* @return int Number of rows * @return int Number of rows
*/ */
public static function num_rows($stmt) { public static function num_rows($stmt) {
self::initialize();
if (!is_object($stmt)) { if (!is_object($stmt)) {
return 0; return 0;
} }
switch (self::$dbo->driver) { switch (self::$driver) {
case 'pdo': case 'pdo':
return $stmt->rowCount(); return $stmt->rowCount();
case 'mysqli': case 'mysqli':
@ -771,13 +696,11 @@ class dba {
* @return array current row * @return array current row
*/ */
public static function fetch($stmt) { public static function fetch($stmt) {
self::initialize();
if (!is_object($stmt)) { if (!is_object($stmt)) {
return false; return false;
} }
switch (self::$dbo->driver) { switch (self::$driver) {
case 'pdo': case 'pdo':
return $stmt->fetch(PDO::FETCH_ASSOC); return $stmt->fetch(PDO::FETCH_ASSOC);
case 'mysqli': case 'mysqli':
@ -813,7 +736,7 @@ class dba {
} }
return $columns; return $columns;
case 'mysql': 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? * @return boolean was the insert successfull?
*/ */
public static function insert($table, $param, $on_duplicate_update = false) { public static function insert($table, $param, $on_duplicate_update = false) {
self::initialize(); $sql = "INSERT INTO `".self::escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
$sql = "INSERT INTO `".self::$dbo->escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
substr(str_repeat("?, ", count($param)), 0, -2).")"; substr(str_repeat("?, ", count($param)), 0, -2).")";
if ($on_duplicate_update) { if ($on_duplicate_update) {
@ -848,17 +769,15 @@ class dba {
* @return integer Last inserted id * @return integer Last inserted id
*/ */
public static function lastInsertId() { public static function lastInsertId() {
self::initialize(); switch (self::$driver) {
switch (self::$dbo->driver) {
case 'pdo': case 'pdo':
$id = self::$dbo->db->lastInsertId(); $id = self::$db->lastInsertId();
break; break;
case 'mysqli': case 'mysqli':
$id = self::$dbo->db->insert_id; $id = self::$db->insert_id;
break; break;
case 'mysql': case 'mysql':
$id = mysql_insert_id(self::$dbo); $id = mysql_insert_id(self::$db);
break; break;
} }
return $id; return $id;
@ -874,11 +793,9 @@ class dba {
* @return boolean was the lock successful? * @return boolean was the lock successful?
*/ */
public static function lock($table) { public static function lock($table) {
self::initialize();
// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html // See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
self::e("SET autocommit=0"); 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) { if (!$success) {
self::e("SET autocommit=1"); self::e("SET autocommit=1");
} else { } else {
@ -893,8 +810,6 @@ class dba {
* @return boolean was the unlock successful? * @return boolean was the unlock successful?
*/ */
public static function unlock() { public static function unlock() {
self::initialize();
// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html // See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
self::e("COMMIT"); self::e("COMMIT");
$success = self::e("UNLOCK TABLES"); $success = self::e("UNLOCK TABLES");
@ -909,8 +824,6 @@ class dba {
* @return boolean Was the command executed successfully? * @return boolean Was the command executed successfully?
*/ */
public static function transaction() { public static function transaction() {
self::initialize();
if (!self::e('COMMIT')) { if (!self::e('COMMIT')) {
return false; return false;
} }
@ -927,8 +840,6 @@ class dba {
* @return boolean Was the command executed successfully? * @return boolean Was the command executed successfully?
*/ */
public static function commit() { public static function commit() {
self::initialize();
if (!self::e('COMMIT')) { if (!self::e('COMMIT')) {
return false; return false;
} }
@ -942,8 +853,6 @@ class dba {
* @return boolean Was the command executed successfully? * @return boolean Was the command executed successfully?
*/ */
public static function rollback() { public static function rollback() {
self::initialize();
if (!self::e('ROLLBACK')) { if (!self::e('ROLLBACK')) {
return false; return false;
} }
@ -983,8 +892,6 @@ class dba {
* @return boolean|array was the delete successfull? When $in_process is set: deletion data * @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()) { public static function delete($table, $param, $in_process = false, &$callstack = array()) {
self::initialize();
$commands = array(); $commands = array();
// Create a key for the loop prevention // Create a key for the loop prevention
@ -997,7 +904,7 @@ class dba {
$callstack[$key] = true; $callstack[$key] = true;
$table = self::$dbo->escape($table); $table = self::escape($table);
$commands[$key] = array('table' => $table, 'param' => $param); $commands[$key] = array('table' => $table, 'param' => $param);
@ -1147,9 +1054,7 @@ class dba {
* @return boolean was the update successfull? * @return boolean was the update successfull?
*/ */
public static function update($table, $fields, $condition, $old_fields = array()) { public static function update($table, $fields, $condition, $old_fields = array()) {
self::initialize(); $table = self::escape($table);
$table = self::$dbo->escape($table);
if (count($condition) > 0) { if (count($condition) > 0) {
$array_element = each($condition); $array_element = each($condition);
@ -1226,8 +1131,6 @@ class dba {
* $data = dba::select($table, $fields, $condition, $params); * $data = dba::select($table, $fields, $condition, $params);
*/ */
public static function select($table, $fields = array(), $condition = array(), $params = array()) { public static function select($table, $fields = array(), $condition = array(), $params = array()) {
self::initialize();
if ($table == '') { if ($table == '') {
return false; return false;
} }
@ -1295,8 +1198,6 @@ class dba {
* @return array Data array * @return array Data array
*/ */
public static function inArray($stmt, $do_close = true) { public static function inArray($stmt, $do_close = true) {
self::initialize();
if (is_bool($stmt)) { if (is_bool($stmt)) {
return $stmt; return $stmt;
} }
@ -1317,9 +1218,7 @@ class dba {
* @return string Error number (0 if no error) * @return string Error number (0 if no error)
*/ */
public static function errorNo() { public static function errorNo() {
self::initialize(); return self::$errorno;
return self::$dbo->errorno;
} }
/** /**
@ -1328,9 +1227,7 @@ class dba {
* @return string Error message ('' if no error) * @return string Error message ('' if no error)
*/ */
public static function errorMessage() { public static function errorMessage() {
self::initialize(); return self::$error;
return self::$dbo->error;
} }
/** /**
@ -1340,13 +1237,11 @@ class dba {
* @return boolean was the close successfull? * @return boolean was the close successfull?
*/ */
public static function close($stmt) { public static function close($stmt) {
self::initialize();
if (!is_object($stmt)) { if (!is_object($stmt)) {
return false; return false;
} }
switch (self::$dbo->driver) { switch (self::$driver) {
case 'pdo': case 'pdo':
return $stmt->closeCursor(); return $stmt->closeCursor();
case 'mysqli': case 'mysqli':
@ -1359,10 +1254,8 @@ class dba {
} }
function dbesc($str) { function dbesc($str) {
global $db; if (dba::$connected) {
return(dba::escape($str));
if ($db && $db->connected) {
return($db->escape($str));
} else { } else {
return(str_replace("'","\\'",$str)); return(str_replace("'","\\'",$str));
} }
@ -1379,17 +1272,15 @@ function dbesc($str) {
* @return array Query array * @return array Query array
*/ */
function q($sql) { function q($sql) {
global $db;
$args = func_get_args(); $args = func_get_args();
unset($args[0]); unset($args[0]);
if (!$db || !$db->connected) { if (!dba::$connected) {
return false; return false;
} }
$sql = $db->clean_query($sql); $sql = dba::clean_query($sql);
$sql = $db->any_value_fallback($sql); $sql = dba::any_value_fallback($sql);
$stmt = @vsprintf($sql, $args); $stmt = @vsprintf($sql, $args);

39
include/dbstructure.php
View file

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

10
include/poller.php
View file

@ -19,15 +19,17 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
require_once("boot.php"); require_once("boot.php");
function poller_run($argv, $argc){ 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); $poller_up_start = microtime(true);
if (empty($a)) {
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));
}
@include(".htconfig.php"); require_once ".htconfig.php";
require_once("include/dba.php"); require_once "include/dba.php";
$db = new dba($db_host, $db_user, $db_pass, $db_data); dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
Config::load(); Config::load();

8
include/shadowupdate.php
View file

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

8
include/text.php
View file

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

23
include/uimport.php
View file

@ -14,11 +14,6 @@ function last_insert_id() {
return dba::lastInsertId(); return dba::lastInsertId();
} }
function last_error() {
global $db;
return $db->error;
}
/** /**
* Remove columns from array $arr that aren't in table $table * Remove columns from array $arr that aren't in table $table
* *
@ -103,7 +98,7 @@ function import_account(App $a, $file) {
// check for username // check for username
$r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']); $r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);
if ($r === false) { 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')); notice(t('Error! Cannot check nickname'));
return; return;
} }
@ -114,7 +109,7 @@ function import_account(App $a, $file) {
// check if username matches deleted account // check if username matches deleted account
$r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']); $r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']);
if ($r === false) { 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')); notice(t('Error! Cannot check nickname'));
return; return;
} }
@ -144,7 +139,7 @@ function import_account(App $a, $file) {
$r = db_import_assoc('user', $account['user']); $r = db_import_assoc('user', $account['user']);
if ($r === false) { if ($r === false) {
//echo "<pre>"; var_dump($r, $query, mysql_error()); killme(); //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")); notice(t("User creation error"));
return; return;
} }
@ -165,7 +160,7 @@ function import_account(App $a, $file) {
$profile['uid'] = $newuid; $profile['uid'] = $newuid;
$r = db_import_assoc('profile', $profile); $r = db_import_assoc('profile', $profile);
if ($r === false) { 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")); info(t("User profile creation error"));
dba::delete('user', array('uid' => $newuid)); dba::delete('user', array('uid' => $newuid));
return; return;
@ -208,7 +203,7 @@ function import_account(App $a, $file) {
$contact['uid'] = $newuid; $contact['uid'] = $newuid;
$r = db_import_assoc('contact', $contact); $r = db_import_assoc('contact', $contact);
if ($r === false) { 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++; $errorcount++;
} else { } else {
$contact['newid'] = last_insert_id(); $contact['newid'] = last_insert_id();
@ -222,7 +217,7 @@ function import_account(App $a, $file) {
$group['uid'] = $newuid; $group['uid'] = $newuid;
$r = db_import_assoc('group', $group); $r = db_import_assoc('group', $group);
if ($r === false) { 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 { } else {
$group['newid'] = last_insert_id(); $group['newid'] = last_insert_id();
} }
@ -249,7 +244,7 @@ function import_account(App $a, $file) {
if ($import == 2) { if ($import == 2) {
$r = db_import_assoc('group_member', $group_member); $r = db_import_assoc('group_member', $group_member);
if ($r === false) { 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) { 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; $pconfig['uid'] = $newuid;
$r = db_import_assoc('pconfig', $pconfig); $r = db_import_assoc('pconfig', $pconfig);
if ($r === false) { 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);
} }
} }

4
index.php
View file

@ -20,7 +20,9 @@ use Friendica\Core\Config;
require_once 'boot.php'; require_once 'boot.php';
require_once 'object/BaseObject.php'; require_once 'object/BaseObject.php';
if (empty($a)) {
$a = new App(__DIR__); $a = new App(__DIR__);
}
BaseObject::set_app($a); BaseObject::set_app($a);
// We assume that the index.php is called by a frontend process // We assume that the index.php is called by a frontend process
@ -51,7 +53,7 @@ if (!$install) {
require_once "include/dba.php"; require_once "include/dba.php";
if (!$install) { 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); unset($db_host, $db_user, $db_pass, $db_data);
/** /**

7
mod/admin.php
View file

@ -606,10 +606,9 @@ function admin_page_queue(App $a) {
* @return string * @return string
*/ */
function admin_page_summary(App $a) { function admin_page_summary(App $a) {
global $db;
// are there MyISAM tables in the DB? If so, trigger a warning message // 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", $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; $showwarning = false;
$warningtext = array(); $warningtext = array();
if (dbm::is_result($r)) { 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)); $old_host = str_replace("http://", "@", normalise_link($old_url));
function update_table($table_name, $fields, $old_url, $new_url) { function update_table($table_name, $fields, $old_url, $new_url) {
global $db, $a; global $a;
$dbold = dbesc($old_url); $dbold = dbesc($old_url);
$dbnew = dbesc($new_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); $q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
$r = q($q); $r = q($q);
if (!$r) { if (!$r) {
notice("Failed updating '$table_name': ".$db->error); notice("Failed updating '$table_name': ".dba::errorMessage());
goaway('admin/site'); goaway('admin/site');
} }
} }

2
mod/directory.php
View file

@ -24,8 +24,6 @@ function directory_post(App $a) {
} }
function directory_content(App $a) { function directory_content(App $a) {
global $db;
require_once("mod/proxy.php"); require_once("mod/proxy.php");
if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||

16
mod/install.php
View file

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

20
src/App.php
View file

@ -132,8 +132,14 @@ class App {
$hostname = ''; $hostname = '';
if (file_exists('.htpreconfig.php')) { if (! static::directory_usable($basepath, false)) {
include '.htpreconfig.php'; 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'); $this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
@ -201,12 +207,6 @@ class App {
$this->hostname = $hostname; $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( set_include_path(
get_include_path() . PATH_SEPARATOR get_include_path() . PATH_SEPARATOR
. $this->basepath . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR . $this->basepath . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR
@ -416,8 +416,8 @@ class App {
$this->path = trim($parsed['path'], '\\/'); $this->path = trim($parsed['path'], '\\/');
} }
if (file_exists('.htpreconfig.php')) { if (file_exists($this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php')) {
include '.htpreconfig.php'; include $this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php';
} }
if (Config::get('config', 'hostname') != '') { if (Config::get('config', 'hostname') != '') {

4
util/db_update.php
View file

@ -11,14 +11,16 @@ use Friendica\App;
*/ */
require_once("boot.php"); require_once("boot.php");
if (empty($a)) {
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));
}
@include(".htconfig.php"); @include(".htconfig.php");
$lang = get_browser_language(); $lang = get_browser_language();
load_translation_table($lang); load_translation_table($lang);
require_once("include/dba.php"); 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); unset($db_host, $db_user, $db_pass, $db_data);
$build = get_config('system', 'build'); $build = get_config('system', 'build');

5
util/maintenance.php
View file

@ -5,14 +5,17 @@ use Friendica\Core\Config;
require_once("boot.php"); require_once("boot.php");
if (empty($a)) {
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));
}
@include(".htconfig.php"); @include(".htconfig.php");
$lang = get_browser_language(); $lang = get_browser_language();
load_translation_table($lang); load_translation_table($lang);
require_once("include/dba.php"); 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); unset($db_host, $db_user, $db_pass, $db_data);
Config::load(); Config::load();

2
util/typo.php
View file

@ -13,7 +13,9 @@ ini_set('log_errors', '0');
include 'boot.php'; include 'boot.php';
if (empty($a)) {
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));
}
if (x($a->config, 'php_path')) { if (x($a->config, 'php_path')) {
$phpath = $a->config['php_path']; $phpath = $a->config['php_path'];