From 701e761c689608569c02d3218145048027b41794 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 4 Apr 2017 19:47:32 +0200 Subject: [PATCH] added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder --- include/dba_pdo.php | 185 +++++++++++++++++++++------------------- include/dbstructure.php | 16 ++-- include/diaspora.php | 14 +-- include/expire.php | 7 +- 4 files changed, 119 insertions(+), 103 deletions(-) diff --git a/include/dba_pdo.php b/include/dba_pdo.php index 4549d7a0ce..4a1d5aca15 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -49,12 +49,14 @@ class dba { function __construct($server,$user,$pass,$db,$install = false) { $a = get_app(); - # work around, to store the database - configuration in DDDBL - $objDataObjectPool = new DataObjectPool('Database-Definition'); - $objDataObjectPool->add('DEFAULT', array('CONNECTION' => "mysql:host=$server;dbname=$db", - 'USER' => $user, - 'PASS' => $pass, - 'DEFAULT' => true)); + // work around, to store the database - configuration in DDDBL + $objDataObjectPool = new DataObjectPool('Database-Definition'); + $objDataObjectPool->add('DEFAULT', array( + 'CONNECTION' => "mysql:host=$server;dbname=$db", + 'USER' => $user, + 'PASS' => $pass, + 'DEFAULT' => true + )); $stamp1 = microtime(true); @@ -63,35 +65,34 @@ class dba { $pass = trim($pass); $db = trim($db); - if (!(strlen($server) && strlen($user))){ + if (!(strlen($server) && strlen($user))) { $this->connected = false; $this->db = null; return; } - 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; - } + if ($install && 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; } } - # etablish connection to database and store PDO object - DDDBL\connect(); - $this->db = DDDBL\getDB(); + // Establish connection to database and store PDO object + DDDBL\connect(); + $this->db = DDDBL\getDB(); - if (DDDBL\isConnected()) { - $this->connected = true; - } + if (DDDBL\isConnected()) { + $this->connected = true; + } if (! $this->connected) { $this->db = null; - if (! $install) + if (! $install) { system_unavailable(); + } } $a->save_timestamp($stamp1, "network"); @@ -104,44 +105,49 @@ class dba { public function q($sql, $onlyquery = false) { $a = get_app(); - $strHandler = (true === $onlyquery) ? 'PDOStatement' : 'MULTI'; + $strHandler = (true === $onlyquery) ? 'PDOStatement' : 'MULTI'; - $strQueryAlias = md5($sql); - $strSQLType = strtoupper(strstr($sql, ' ', true)); + $strQueryAlias = md5($sql); + $strSQLType = strtoupper(strstr($sql, ' ', true)); - $objPreparedQueryPool = new DataObjectPool('Query-Definition'); + $objPreparedQueryPool = new DataObjectPool('Query-Definition'); - # check if query do not exists till now, if so create its definition - if (!$objPreparedQueryPool->exists($strQueryAlias)) - $objPreparedQueryPool->add($strQueryAlias, array('QUERY' => $sql, - 'HANDLER' => $strHandler)); + // check if query do not exists till now, if so create its definition + if (!$objPreparedQueryPool->exists($strQueryAlias)) { + $objPreparedQueryPool->add($strQueryAlias, array( + 'QUERY' => $sql, + 'HANDLER' => $strHandler + )); + } - if ((! $this->db) || (! $this->connected)) + if ((! $this->db) || (! $this->connected)) { return false; + } $this->error = ''; $stamp1 = microtime(true); - try { - $r = DDDBL\get($strQueryAlias); - - # bad workaround to emulate the bizzare behavior of mysql_query - if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) - $result = true; - $intErrorCode = false; + try { + $r = DDDBL\get($strQueryAlias); - } catch (Exception $objException) { - $result = false; - $intErrorCode = $objPreparedQueryPool->get($strQueryAlias)->get('PDOStatement')->errorCode(); - } + // bad workaround to emulate the bizzare behavior of mysql_query + if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) { + $result = true; + } + $intErrorCode = false; + } catch (Exception $objException) { + $result = false; + $intErrorCode = $objPreparedQueryPool->get($strQueryAlias)->get('PDOStatement')->errorCode(); + } $stamp2 = microtime(true); $duration = (float)($stamp2-$stamp1); $a->save_timestamp($stamp1, "database"); - if (x($a->config,'system') && x($a->config['system'],'db_log')) { + /// @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 (($duration > $a->config["system"]["db_loglimit"])) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); @@ -152,24 +158,24 @@ class dba { } } - if ($intErrorCode) - $this->error = $intErrorCode; + if ($intErrorCode) { + $this->error = $intErrorCode; + } if (strlen($this->error)) { logger('dba: ' . $this->error); } if ($this->debug) { - $mesg = ''; - if ($result === false) + if ($result === false) { $mesg = 'false'; - elseif ($result === true) + } elseif ($result === true) { $mesg = 'true'; - else { - # this needs fixing, but is a bug itself - #$mesg = mysql_num_rows($result) . ' results' . EOL; + } else { + /// @TODO this needs fixing, but is a bug itself + // $mesg = mysql_num_rows($result) . ' results' . EOL; } $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg @@ -179,46 +185,49 @@ class dba { logger('dba: ' . $str ); } - /** + /* * 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. * These usually indicate SQL syntax errors that need to be resolved. */ - if (isset($result) AND ($result === false)) { 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); + } } - if (isset($result) AND (($result === true) || ($result === false))) + if (isset($result) AND (($result === true) || ($result === false))) { return $result; + } if ($onlyquery) { $this->result = $r; # this will store an PDOStatement Object in result - $this->result->execute(); # execute the Statement, to get its result + $this->result->execute(); # execute the Statement, to get its result return true; } //$a->save_timestamp($stamp1, "database"); - if ($this->debug) + if ($this->debug) { logger('dba: ' . printable(print_r($r, true))); - return($r); + } + + return $r; } public function qfetch() { + if (false === $this->result) { + return false; + } - if (false === $this->result) - return false; - - return $this->result->fetch(); - + return $this->result->fetch(); } public function qclose() { - if ($this->result) - return $this->result->closeCursor(); + if ($this->result) { + return $this->result->closeCursor(); + } } public function dbg($dbg) { @@ -227,17 +236,20 @@ class dba { public function escape($str) { if ($this->db && $this->connected) { - $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, - # so we must remove them from here and wait until everything uses prepared statements - return mb_substr($strQuoted, 1, mb_strlen($strQuoted) - 2); + $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, + * so we must remove them from here and wait until everything uses prepared statements + */ + return mb_substr($strQuoted, 1, mb_strlen($strQuoted) - 2); } } - function __destruct() { - if ($this->db) - DDDBL\disconnect(); + public function __destruct() { + if ($this->db) { + DDDBL\disconnect(); + } } }} @@ -300,34 +312,33 @@ function q($sql) { }} +if (! function_exists('dbq')) { /** - * * Raw db query, no arguments - * */ - -if (! function_exists('dbq')) { function dbq($sql) { global $db; - if ($db && $db->connected) + if ($db && $db->connected) { $ret = $db->q($sql); - else + } else { $ret = false; + } return $ret; }} -// Caller is responsible for ensuring that any integer arguments to -// dbesc_array are actually integers and not malformed strings containing -// SQL injection vectors. All integer array elements should be specifically -// cast to int to avoid trouble. - - +/* + * Caller is responsible for ensuring that any integer arguments to + * dbesc_array are actually integers and not malformed strings containing + * SQL injection vectors. All integer array elements should be specifically + * cast to int to avoid trouble. + */ if (! function_exists('dbesc_array_cb')) { function dbesc_array_cb(&$item, $key) { - if (is_string($item)) + if (is_string($item)) { $item = dbesc($item); + } }} @@ -340,5 +351,5 @@ function dbesc_array(&$arr) { if (! function_exists('dba_timer')) { function dba_timer() { - return microtime(true); + return microtime(true); }} diff --git a/include/dbstructure.php b/include/dbstructure.php index 6a14220c24..3aebef0ad8 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -3,12 +3,12 @@ use Friendica\App; use Friendica\Core\Config; -require_once("boot.php"); -require_once("include/text.php"); +require_once "boot.php"; +require_once "include/text.php"; define('NEW_UPDATE_ROUTINE_VERSION', 1170); -/* +/** * Converts all tables from MyISAM to InnoDB */ function convert_to_innodb() { @@ -1756,7 +1756,7 @@ function dbstructure_run(&$argv, &$argc) { unset($db_host, $db_user, $db_pass, $db_data); } - if ($argc==2) { + if ($argc == 2) { switch ($argv[1]) { case "dryrun": update_structure(true, false); @@ -1766,7 +1766,7 @@ function dbstructure_run(&$argv, &$argc) { $build = get_config('system','build'); if (!x($build)) { - set_config('system','build',DB_UPDATE_VERSION); + set_config('system', 'build', DB_UPDATE_VERSION); $build = DB_UPDATE_VERSION; } @@ -1776,7 +1776,9 @@ function dbstructure_run(&$argv, &$argc) { // run any left update_nnnn functions in update.php for ($x = $stored; $x < $current; $x ++) { $r = run_update_function($x); - if (!$r) break; + if (!$r) { + break; + } } 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"]); killme(); } diff --git a/include/diaspora.php b/include/diaspora.php index 820f8bd896..f0d1a8ca31 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -3777,8 +3777,10 @@ class Diaspora { $message = self::construct_like($r[0], $contact); $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')", intval($message_id), dbesc(json_encode($message)) @@ -3810,9 +3812,11 @@ class Diaspora { $message = self::construct_comment($item, $contact); $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. - q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')", + /* + * 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')", intval($message_id), dbesc(json_encode($message)) ); diff --git a/include/expire.php b/include/expire.php index 73bffb20dc..aa34cbaa5b 100644 --- a/include/expire.php +++ b/include/expire.php @@ -19,18 +19,17 @@ function expire_run(&$argv, &$argc){ } // 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`"); } logger('expire: start'); - $r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0"); + $r = q("SELECT `uid`, `username`, `expire` FROM `user` WHERE `expire` != 0"); if (dbm::is_result($r)) { foreach ($r as $rr) { logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG); - item_expire($rr['uid'],$rr['expire']); + item_expire($rr['uid'], $rr['expire']); } } -- 2.39.5