Merge pull request #3469 from Quix0r/rewrites/coding-convention-split2-5-2
Coding convention applied split 2-5-2 (of 2-14-2)
This commit is contained in:
Hypolite Petovan
GitHub
commit
0c2c221e50
|
|
@ -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
|
||||
// work around, to store the database - configuration in DDDBL
|
||||
$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,
|
||||
'PASS' => $pass,
|
||||
'DEFAULT' => true));
|
||||
'DEFAULT' => true
|
||||
));
|
||||
|
||||
$stamp1 = microtime(true);
|
||||
|
||||
|
|
@ -69,8 +71,7 @@ class dba {
|
|||
return;
|
||||
}
|
||||
|
||||
if ($install) {
|
||||
if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
|
||||
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;
|
||||
|
|
@ -78,9 +79,8 @@ class dba {
|
|||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# etablish connection to database and store PDO object
|
||||
// Establish connection to database and store PDO object
|
||||
DDDBL\connect();
|
||||
$this->db = DDDBL\getDB();
|
||||
|
||||
|
|
@ -90,9 +90,10 @@ class dba {
|
|||
|
||||
if (! $this->connected) {
|
||||
$this->db = null;
|
||||
if (! $install)
|
||||
if (! $install) {
|
||||
system_unavailable();
|
||||
}
|
||||
}
|
||||
|
||||
$a->save_timestamp($stamp1, "network");
|
||||
}
|
||||
|
|
@ -111,13 +112,17 @@ class dba {
|
|||
|
||||
$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 = '';
|
||||
|
||||
|
|
@ -126,11 +131,11 @@ class dba {
|
|||
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')))
|
||||
// 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();
|
||||
|
|
@ -141,6 +146,7 @@ class dba {
|
|||
|
||||
$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 (($duration > $a->config["system"]["db_loglimit"])) {
|
||||
$duration = round($duration, 3);
|
||||
|
|
@ -152,24 +158,24 @@ class dba {
|
|||
}
|
||||
}
|
||||
|
||||
if ($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,20 +185,21 @@ 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
|
||||
|
|
@ -202,24 +209,26 @@ class dba {
|
|||
|
||||
//$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)
|
||||
if (false === $this->result) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $this->result->fetch();
|
||||
|
||||
}
|
||||
|
||||
public function qclose() {
|
||||
if ($this->result)
|
||||
if ($this->result) {
|
||||
return $this->result->closeCursor();
|
||||
}
|
||||
}
|
||||
|
||||
public function dbg($dbg) {
|
||||
$this->debug = $dbg;
|
||||
|
|
@ -228,17 +237,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
|
||||
/*
|
||||
* 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)
|
||||
public function __destruct() {
|
||||
if ($this->db) {
|
||||
DDDBL\disconnect();
|
||||
}
|
||||
}
|
||||
}}
|
||||
|
||||
if (! function_exists('printable')) {
|
||||
|
|
@ -267,14 +279,13 @@ function dbesc($str) {
|
|||
return(str_replace("'","\\'",$str));
|
||||
}}
|
||||
|
||||
|
||||
|
||||
// Function: q($sql,$args);
|
||||
// Description: execute SQL query with printf style args.
|
||||
// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
|
||||
// 'user', 1);
|
||||
|
||||
if (! function_exists('q')) {
|
||||
/**
|
||||
* Function: q($sql,$args);
|
||||
* Description: execute SQL query with printf style args.
|
||||
* Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
|
||||
* 'user', 1);
|
||||
*/
|
||||
function q($sql) {
|
||||
|
||||
global $db;
|
||||
|
|
@ -284,8 +295,9 @@ function q($sql) {
|
|||
if ($db && $db->connected) {
|
||||
$stmt = @vsprintf($sql,$args); // Disabled warnings
|
||||
//logger("dba: q: $stmt", LOGGER_ALL);
|
||||
if ($stmt === false)
|
||||
if ($stmt === false) {
|
||||
logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
|
||||
}
|
||||
return $db->q($stmt);
|
||||
}
|
||||
|
||||
|
|
@ -300,34 +312,33 @@ function q($sql) {
|
|||
|
||||
}}
|
||||
|
||||
/**
|
||||
*
|
||||
* Raw db query, no arguments
|
||||
*
|
||||
*/
|
||||
|
||||
if (! function_exists('dbq')) {
|
||||
/**
|
||||
* Raw db query, no arguments
|
||||
*/
|
||||
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);
|
||||
}
|
||||
}}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,8 +3812,10 @@ 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.
|
||||
/*
|
||||
* 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))
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ 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'))) {
|
||||
q("OPTIMIZE TABLE `item`");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once("include/dba.php");
|
||||
require_once "include/dba.php";
|
||||
|
||||
if (! function_exists('get_browser_language')) {
|
||||
/**
|
||||
|
|
@ -63,8 +63,9 @@ function push_lang($language) {
|
|||
|
||||
$a->langsave = $lang;
|
||||
|
||||
if($language === $lang)
|
||||
if ($language === $lang) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isset($a->strings) && count($a->strings)) {
|
||||
$a->stringsave = $a->strings;
|
||||
|
|
@ -77,13 +78,15 @@ function push_lang($language) {
|
|||
function pop_lang() {
|
||||
global $lang, $a;
|
||||
|
||||
if($lang === $a->langsave)
|
||||
if ($lang === $a->langsave) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(isset($a->stringsave))
|
||||
if (isset($a->stringsave)) {
|
||||
$a->strings = $a->stringsave;
|
||||
else
|
||||
} else {
|
||||
$a->strings = array();
|
||||
}
|
||||
|
||||
$lang = $a->langsave;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -525,12 +525,14 @@ function service_class_fetch($uid,$property) {
|
|||
|
||||
function upgrade_link($bbcode = false) {
|
||||
$l = get_config('service_class','upgrade_link');
|
||||
if(! $l)
|
||||
if (! $l) {
|
||||
return '';
|
||||
if($bbcode)
|
||||
}
|
||||
if ($bbcode) {
|
||||
$t = sprintf('[url=%s]' . t('Click here to upgrade.') . '[/url]', $l);
|
||||
else
|
||||
} else {
|
||||
$t = sprintf('<a href="%s">' . t('Click here to upgrade.') . '</div>', $l);
|
||||
}
|
||||
return $t;
|
||||
}
|
||||
|
||||
|
|
@ -557,13 +559,15 @@ function upgrade_bool_message($bbcode = false) {
|
|||
*/
|
||||
function theme_include($file, $root = '') {
|
||||
// Make sure $root ends with a slash / if it's not blank
|
||||
if($root !== '' && $root[strlen($root)-1] !== '/')
|
||||
if ($root !== '' && $root[strlen($root)-1] !== '/') {
|
||||
$root = $root . '/';
|
||||
}
|
||||
$theme_info = $a->theme_info;
|
||||
if(is_array($theme_info) AND array_key_exists('extends',$theme_info))
|
||||
if (is_array($theme_info) AND array_key_exists('extends',$theme_info)) {
|
||||
$parent = $theme_info['extends'];
|
||||
else
|
||||
} else {
|
||||
$parent = 'NOPATH';
|
||||
}
|
||||
$theme = current_theme();
|
||||
$thname = $theme;
|
||||
$ext = substr($file,strrpos($file,'.')+1);
|
||||
|
|
@ -574,10 +578,11 @@ function theme_include($file, $root = '') {
|
|||
);
|
||||
foreach ($paths as $p) {
|
||||
// strpos() is faster than strstr when checking if one string is in another (http://php.net/manual/en/function.strstr.php)
|
||||
if(strpos($p,'NOPATH') !== false)
|
||||
if (strpos($p,'NOPATH') !== false) {
|
||||
continue;
|
||||
if(file_exists($p))
|
||||
} elseif (file_exists($p)) {
|
||||
return $p;
|
||||
}
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -378,8 +378,9 @@ function poller_kill_stale_workers() {
|
|||
// Kill long running processes
|
||||
|
||||
// Check if the priority is in a valid range
|
||||
if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE)))
|
||||
if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) {
|
||||
$pid["priority"] = PRIORITY_MEDIUM;
|
||||
}
|
||||
|
||||
// Define the maximum durations
|
||||
$max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360);
|
||||
|
|
|
|||
|
|
@ -30,9 +30,10 @@ function handle_pubsubhubbub($id) {
|
|||
global $a;
|
||||
|
||||
$r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
|
||||
if (!$r)
|
||||
if (!dbm::is_result($r)) {
|
||||
return;
|
||||
else
|
||||
}
|
||||
|
||||
$rr = $r[0];
|
||||
|
||||
/// @todo Check server status with poco_check_server()
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@ function queue_run(&$argv, &$argc){
|
|||
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
|
||||
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
|
||||
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
|
||||
if ($r) {
|
||||
|
||||
if (dbm::is_result($r)) {
|
||||
foreach ($r as $rr) {
|
||||
logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
|
||||
logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
|
||||
|
|
|
|||
|
|
@ -49,12 +49,14 @@ function was_recently_delayed($cid) {
|
|||
function add_to_queue($cid,$network,$msg,$batch = false) {
|
||||
|
||||
$max_queue = get_config('system','max_contact_queue');
|
||||
if($max_queue < 1)
|
||||
if ($max_queue < 1) {
|
||||
$max_queue = 500;
|
||||
}
|
||||
|
||||
$batch_queue = get_config('system','max_batch_queue');
|
||||
if($batch_queue < 1)
|
||||
if ($batch_queue < 1) {
|
||||
$batch_queue = 1000;
|
||||
}
|
||||
|
||||
$r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
|
||||
WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
|
||||
|
|
@ -64,8 +66,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
|
|||
if ($batch && ($r[0]['total'] > $batch_queue)) {
|
||||
logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
|
||||
return;
|
||||
}
|
||||
elseif((! $batch) && ($r[0]['total'] > $max_queue)) {
|
||||
} elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
|
||||
logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user