friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

added spaces + some curly braces + some usage of dbm::is_result() 

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-04-04 19:47:32 +02:00 committed by Roland Häder
parent fd9c9603e4
commit 701e761c68
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
4 changed files with 121 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
include/dba_pdo.php
View File

@ -49,12 +49,14 @@ class dba {
function __construct($server,$user,$pass,$db,$install = false) { function __construct($server,$user,$pass,$db,$install = false) {
$a = get_app(); $a = get_app();
# work around, to store the database - configuration in DDDBL // work around, to store the database - configuration in DDDBL
$objDataObjectPool = new DataObjectPool('Database-Definition'); $objDataObjectPool = new DataObjectPool('Database-Definition');
$objDataObjectPool->add('DEFAULT', array('CONNECTION' => "mysql:host=$server;dbname=$db", $objDataObjectPool->add('DEFAULT', array(
'CONNECTION' => "mysql:host=$server;dbname=$db",
'USER' => $user, 'USER' => $user,
'PASS' => $pass, 'PASS' => $pass,
'DEFAULT' => true)); 'DEFAULT' => true
));
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -69,8 +71,7 @@ class dba {
return; return;
} }
if ($install) { if ($install && 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); $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
$this->connected = false; $this->connected = false;
@ -78,9 +79,8 @@ class dba {
return; return;
} }
} }
}
# etablish connection to database and store PDO object // Establish connection to database and store PDO object
DDDBL\connect(); DDDBL\connect();
$this->db = DDDBL\getDB(); $this->db = DDDBL\getDB();
@ -90,9 +90,10 @@ class dba {
if (! $this->connected) { if (! $this->connected) {
$this->db = null; $this->db = null;
if (! $install) if (! $install) {
system_unavailable(); system_unavailable();
} }
}
$a->save_timestamp($stamp1, "network"); $a->save_timestamp($stamp1, "network");
} }
@ -111,13 +112,17 @@ class dba {
$objPreparedQueryPool = new DataObjectPool('Query-Definition'); $objPreparedQueryPool = new DataObjectPool('Query-Definition');
# check if query do not exists till now, if so create its definition // check if query do not exists till now, if so create its definition
if (!$objPreparedQueryPool->exists($strQueryAlias)) if (!$objPreparedQueryPool->exists($strQueryAlias)) {
$objPreparedQueryPool->add($strQueryAlias, array('QUERY' => $sql, $objPreparedQueryPool->add($strQueryAlias, array(
'HANDLER' => $strHandler)); 'QUERY' => $sql,
'HANDLER' => $strHandler
));
}
if ((! $this->db) || (! $this->connected)) if ((! $this->db) || (! $this->connected)) {
return false; return false;
}
$this->error = ''; $this->error = '';
@ -126,11 +131,11 @@ class dba {
try { try {
$r = DDDBL\get($strQueryAlias); $r = DDDBL\get($strQueryAlias);
# bad workaround to emulate the bizzare behavior of mysql_query // bad workaround to emulate the bizzare behavior of mysql_query
if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) {
$result = true; $result = true;
}
$intErrorCode = false; $intErrorCode = false;
} catch (Exception $objException) { } catch (Exception $objException) {
$result = false; $result = false;
$intErrorCode = $objPreparedQueryPool->get($strQueryAlias)->get('PDOStatement')->errorCode(); $intErrorCode = $objPreparedQueryPool->get($strQueryAlias)->get('PDOStatement')->errorCode();
@ -141,6 +146,7 @@ class dba {
$a->save_timestamp($stamp1, "database"); $a->save_timestamp($stamp1, "database");
/// @TODO really check $a->config for 'system'? it is very generic and should be there
if (x($a->config, 'system') && x($a->config['system'], 'db_log')) { if (x($a->config, 'system') && x($a->config['system'], 'db_log')) {
if (($duration > $a->config["system"]["db_loglimit"])) { if (($duration > $a->config["system"]["db_loglimit"])) {
$duration = round($duration, 3); $duration = round($duration, 3);
@ -152,24 +158,24 @@ class dba {
} }
} }
if ($intErrorCode) if ($intErrorCode) {
$this->error = $intErrorCode; $this->error = $intErrorCode;
}
if (strlen($this->error)) { if (strlen($this->error)) {
logger('dba: ' . $this->error); logger('dba: ' . $this->error);
} }
if ($this->debug) { if ($this->debug) {
$mesg = ''; $mesg = '';
if ($result === false) if ($result === false) {
$mesg = 'false'; $mesg = 'false';
elseif ($result === true) } elseif ($result === true) {
$mesg = 'true'; $mesg = 'true';
else { } else {
# this needs fixing, but is a bug itself /// @TODO this needs fixing, but is a bug itself
#$mesg = mysql_num_rows($result) . ' results' . EOL; // $mesg = mysql_num_rows($result) . ' results' . EOL;
} }
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
@ -179,20 +185,21 @@ class dba {
logger('dba: ' . $str ); logger('dba: ' . $str );
} }
/** /*
* If dbfail.out exists, we will write any failed calls directly to it, * If dbfail.out exists, we will write any failed calls directly to it,
* regardless of any logging that may or may nor be in effect. * regardless of any logging that may or may nor be in effect.
* These usually indicate SQL syntax errors that need to be resolved. * These usually indicate SQL syntax errors that need to be resolved.
*/ */
if (isset($result) AND ($result === false)) { if (isset($result) AND ($result === false)) {
logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error); logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
if (file_exists('dbfail.out')) if (file_exists('dbfail.out')) {
file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND); file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
} }
}
if (isset($result) AND (($result === true) || ($result === false))) if (isset($result) AND (($result === true) || ($result === false))) {
return $result; return $result;
}
if ($onlyquery) { if ($onlyquery) {
$this->result = $r; # this will store an PDOStatement Object in result $this->result = $r; # this will store an PDOStatement Object in result
@ -202,24 +209,26 @@ class dba {
//$a->save_timestamp($stamp1, "database"); //$a->save_timestamp($stamp1, "database");
if ($this->debug) if ($this->debug) {
logger('dba: ' . printable(print_r($r, true))); logger('dba: ' . printable(print_r($r, true)));
return($r); }
return $r;
} }
public function qfetch() { public function qfetch() {
if (false === $this->result) {
if (false === $this->result)
return false; return false;
}
return $this->result->fetch(); return $this->result->fetch();
} }
public function qclose() { public function qclose() {
if ($this->result) if ($this->result) {
return $this->result->closeCursor(); return $this->result->closeCursor();
} }
}
public function dbg($dbg) { public function dbg($dbg) {
$this->debug = $dbg; $this->debug = $dbg;
@ -228,17 +237,20 @@ class dba {
public function escape($str) { public function escape($str) {
if ($this->db && $this->connected) { if ($this->db && $this->connected) {
$strQuoted = $this->db->quote($str); $strQuoted = $this->db->quote($str);
# this workaround is needed, because quote creates "'" and the beginning and the end /*
# of the string, which is correct. but until now the queries set this delimiter manually, * this workaround is needed, because quote creates "'" and the beginning and the end
# so we must remove them from here and wait until everything uses prepared statements * of the string, which is correct. but until now the queries set this delimiter manually,
* so we must remove them from here and wait until everything uses prepared statements
*/
return mb_substr($strQuoted, 1, mb_strlen($strQuoted) - 2); return mb_substr($strQuoted, 1, mb_strlen($strQuoted) - 2);
} }
} }
function __destruct() { public function __destruct() {
if ($this->db) if ($this->db) {
DDDBL\disconnect(); DDDBL\disconnect();
} }
}
}} }}
if (! function_exists('printable')) { if (! function_exists('printable')) {
@ -300,34 +312,33 @@ function q($sql) {
}} }}
/**
*
* Raw db query, no arguments
*
*/
if (! function_exists('dbq')) { if (! function_exists('dbq')) {
/**
* Raw db query, no arguments
*/
function dbq($sql) { function dbq($sql) {
global $db; global $db;
if ($db && $db->connected) if ($db && $db->connected) {
$ret = $db->q($sql); $ret = $db->q($sql);
else } else {
$ret = false; $ret = false;
}
return $ret; return $ret;
}} }}
// Caller is responsible for ensuring that any integer arguments to /*
// dbesc_array are actually integers and not malformed strings containing * Caller is responsible for ensuring that any integer arguments to
// SQL injection vectors. All integer array elements should be specifically * dbesc_array are actually integers and not malformed strings containing
// cast to int to avoid trouble. * SQL injection vectors. All integer array elements should be specifically
* cast to int to avoid trouble.
*/
if (! function_exists('dbesc_array_cb')) { if (! function_exists('dbesc_array_cb')) {
function dbesc_array_cb(&$item, $key) { function dbesc_array_cb(&$item, $key) {
if (is_string($item)) if (is_string($item)) {
$item = dbesc($item); $item = dbesc($item);
}
}} }}

12
include/dbstructure.php
View File

@ -3,12 +3,12 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once("boot.php"); require_once "boot.php";
require_once("include/text.php"); require_once "include/text.php";
define('NEW_UPDATE_ROUTINE_VERSION', 1170); define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/* /**
* Converts all tables from MyISAM to InnoDB * Converts all tables from MyISAM to InnoDB
*/ */
function convert_to_innodb() { function convert_to_innodb() {
@ -1776,7 +1776,9 @@ function dbstructure_run(&$argv, &$argc) {
// run any left update_nnnn functions in update.php // run any left update_nnnn functions in update.php
for ($x = $stored; $x < $current; $x ++) { for ($x = $stored; $x < $current; $x ++) {
$r = run_update_function($x); $r = run_update_function($x);
if (!$r) break; if (!$r) {
break;
}
} }
set_config('system','build',DB_UPDATE_VERSION); set_config('system','build',DB_UPDATE_VERSION);
@ -1803,7 +1805,7 @@ function dbstructure_run(&$argv, &$argc) {
} }
if (array_search(__file__,get_included_files())===0) { if (array_search(__FILE__,get_included_files())===0) {
dbstructure_run($_SERVER["argv"],$_SERVER["argc"]); dbstructure_run($_SERVER["argv"],$_SERVER["argc"]);
killme(); killme();
} }

12
include/diaspora.php
View File

@ -3777,8 +3777,10 @@ class Diaspora {
$message = self::construct_like($r[0], $contact); $message = self::construct_like($r[0], $contact);
$message["author_signature"] = self::signature($contact, $message); $message["author_signature"] = self::signature($contact, $message);
// We now store the signature more flexible to dynamically support new fields. /*
// This will break Diaspora compatibility with Friendica versions prior to 3.5. * Now store the signature more flexible to dynamically support new fields.
* This will break Diaspora compatibility with Friendica versions prior to 3.5.
*/
q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')", q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
intval($message_id), intval($message_id),
dbesc(json_encode($message)) dbesc(json_encode($message))
@ -3810,8 +3812,10 @@ class Diaspora {
$message = self::construct_comment($item, $contact); $message = self::construct_comment($item, $contact);
$message["author_signature"] = self::signature($contact, $message); $message["author_signature"] = self::signature($contact, $message);
// We now store the signature more flexible to dynamically support new fields. /*
// This will break Diaspora compatibility with Friendica versions prior to 3.5. * Now store the signature more flexible to dynamically support new fields.
* This will break Diaspora compatibility with Friendica versions prior to 3.5.
*/
q("INSERT INTO `sign` (`iid`, `signed_text`) VALUES (%d, '%s')", q("INSERT INTO `sign` (`iid`, `signed_text`) VALUES (%d, '%s')",
intval($message_id), intval($message_id),
dbesc(json_encode($message)) dbesc(json_encode($message))

1
include/expire.php
View File

@ -19,7 +19,6 @@ function expire_run(&$argv, &$argc){
} }
// make this optional as it could have a performance impact on large sites // make this optional as it could have a performance impact on large sites
if (intval(get_config('system', 'optimize_items'))) { if (intval(get_config('system', 'optimize_items'))) {
q("OPTIMIZE TABLE `item`"); q("OPTIMIZE TABLE `item`");
} }