friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move q errno check inside db existence check

Browse source 
- Remove if ! function_exists
- Fix formatting
This commit is contained in:
Hypolite Petovan 2017-05-11 23:29:56 -04:00
parent 7eada3d4da
commit 4ea1211ea8
1 changed files with 53 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
include/dba.php
View file

@ -16,7 +16,8 @@ class dba
public function __construct($server, $user, $pass, $db, $install = false) public function __construct($server, $user, $pass, $db, $install = false)
{ {
$this->db = @new mysqli($server, $user, $pass, $db); $this->db = @new mysqli($server, $user, $pass, $db);
if ((mysqli_connect_errno()) && (! install)) {
if (mysqli_connect_errno() && ! $install) {
system_unavailable(); system_unavailable();
} }
} }
@ -40,7 +41,7 @@ class dba
$mesg = ''; $mesg = '';
if ($this->db->mysqli->errno) { if ($this->db->mysqli->errno) {
$debug_text .= $this->db->mysqli->error . EOL; $debug_text .= $this->db->mysqli->error . EOL;
} }
if ($result === false) { if ($result === false) {
@ -48,19 +49,19 @@ class dba
} elseif ($result === true) { } elseif ($result === true) {
$mesg = 'true'; $mesg = 'true';
} else { } else {
$mesg = $result->num_rows.' results' . EOL; $mesg = $result->num_rows . ' results' . EOL;
} }
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL; $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
switch ($this->debug) { switch ($this->debug) {
case 3: case 3:
echo $str; echo $str;
break; break;
default: default:
$debug_text .= $str; $debug_text .= $str;
break; break;
} }
} }
if (($result === true) || ($result === false)) { if (($result === true) || ($result === false)) {
@ -76,9 +77,9 @@ class dba
} }
if ($this->debug == 2) { if ($this->debug == 2) {
$debug_text .= printable(print_r($r, true). EOL); $debug_text .= printable(print_r($r, true) . EOL);
} elseif ($this->debug == 3) { } elseif ($this->debug == 3) {
echo printable(print_r($r, true) . EOL) ; echo printable(print_r($r, true) . EOL);
} }
return $r; return $r;
@ -100,93 +101,73 @@ class dba
} }
} }
if (! function_exists('printable')) { function printable($s)
function printable($s) {
{ $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~", ".", $s);
$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~", ".", $s); $s = str_replace("\x00", '.', $s);
$s = str_replace("\x00", '.', $s); if (x($_SERVER, 'SERVER_NAME')) {
if (x($_SERVER, 'SERVER_NAME')) { $s = escape_tags($s);
$s = escape_tags($s);
}
return $s;
} }
return $s;
} }
// Procedural functions // Procedural functions
if (! function_exists('dbg')) { function dbg($state)
function dbg($state) {
{ global $db;
global $db; $db->dbg($state);
$db->dbg($state);
}
} }
if (! function_exists('dbesc')) { function dbesc($str)
function dbesc($str) {
{ global $db;
global $db; if ($db) {
if ($db) { return($db->escape($str));
return($db->escape($str));
}
} }
} }
// Function: q($sql,$args); // Function: q($sql,$args);
// Description: execute SQL query with printf style args. // Description: execute SQL query with printf style args.
// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
// 'user', 1); // 'user', 1);
if (! function_exists('q')) { function q($sql)
function q($sql) {
{ global $db;
global $db; $args = func_get_args();
$args = func_get_args(); unset($args[0]);
unset($args[0]);
if ($db) { if ($db) {
$ret = $db->q(vsprintf($sql, $args)); $ret = $db->q(vsprintf($sql, $args));
}
if ($db->db->errno) { if ($db->db->errno) {
logger('dba: ' . $db->db->error); logger('dba: ' . $db->db->error);
} }
return $ret;
} }
}
return $ret;
}
// Caller is responsible for ensuring that any integer arguments to // Caller is responsible for ensuring that any integer arguments to
// dbesc_array are actually integers and not malformed strings containing // dbesc_array are actually integers and not malformed strings containing
// SQL injection vectors. All integer array elements should be specifically // SQL injection vectors. All integer array elements should be specifically
// cast to int to avoid trouble. // cast to int to avoid trouble.
function dbesc_array_cb(&$item, $key)
{
if (! function_exists('dbesc_array_cb')) { if (is_string($item)) {
function dbesc_array_cb(&$item, $key) $item = dbesc($item);
{
if (is_string($item)) {
$item = dbesc($item);
}
} }
} }
function dbesc_array(&$arr)
if (! function_exists('dbesc_array')) { {
function dbesc_array(&$arr) if (is_array($arr) && count($arr)) {
{ array_walk($arr, 'dbesc_array_cb');
if (is_array($arr) && count($arr)) {
array_walk($arr, 'dbesc_array_cb');
}
} }
} }
function closedb()
if (! function_exists('closedb')) { {
function closedb() global $db;
{ // $db->close();
global $db;
// $db->close();
}
} }