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

Enforce coding standards in include/dba.php

Browse source
This commit is contained in:
Hypolite Petovan 2017-04-20 19:59:57 -04:00
parent 5fb56281d0
commit 750f081078
1 changed files with 118 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

208
include/dba.php
View file

@ -7,111 +7,130 @@
// x = 2: display full queries following content // x = 2: display full queries following content
// x = 3: display full queries using echo; which will mess up display // x = 3: display full queries using echo; which will mess up display
// really bad but will return output in stubborn cases. // really bad but will return output in stubborn cases.
if(! class_exists('dba')) {
class dba {
class dba
{
private $debug = 0; private $debug = 0;
public $db; public $db;
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); {
if((mysqli_connect_errno()) && (! install)) $this->db = @new mysqli($server, $user, $pass, $db);
system_unavailable(); if ((mysqli_connect_errno()) && (! install)) {
system_unavailable();
}
} }
public function getdb() { public function getdb()
{
return $this->db; return $this->db;
} }
public function q($sql) { public function q($sql)
{
global $debug_text; global $debug_text;
if(! $this->db ) if (! $this->db) {
return false; return false;
}
$result = @$this->db->query($sql); $result = @$this->db->query($sql);
if($this->debug) { if ($this->debug) {
$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) {
$mesg = 'false'; $mesg = 'false';
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)) {
return $result; return $result;
}
$r = array(); $r = array();
if($result->num_rows) { if ($result->num_rows) {
while($x = $result->fetch_array(MYSQL_ASSOC)) while ($x = $result->fetch_array(MYSQL_ASSOC)) {
$r[] = $x; $r[] = $x;
}
$result->free_result(); $result->free_result();
} }
if($this->debug == 2)
$debug_text .= printable(print_r($r, true). EOL);
elseif($this->debug == 3)
echo printable(print_r($r, true) . EOL) ;
return($r); if ($this->debug == 2) {
$debug_text .= printable(print_r($r, true). EOL);
} elseif ($this->debug == 3) {
echo printable(print_r($r, true) . EOL) ;
}
return $r;
} }
public function dbg($dbg) { public function dbg($dbg)
{
$this->debug = $dbg; $this->debug = $dbg;
} }
public function escape($str) { public function escape($str)
{
return @$this->db->real_escape_string($str); return @$this->db->real_escape_string($str);
} }
function __destruct() { public function __destruct()
{
@$this->db->close(); @$this->db->close();
} }
}} }
if(! function_exists('printable')) { if (! function_exists('printable')) {
function printable($s) { function printable($s)
$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); {
$s = str_replace("\x00",'.',$s); $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~", ".", $s);
if(x($_SERVER,'SERVER_NAME')) $s = str_replace("\x00", '.', $s);
$s = escape_tags($s); if (x($_SERVER, 'SERVER_NAME')) {
return $s; $s = escape_tags($s);
}} }
return $s;
}
}
// Procedural functions // Procedural functions
if(! function_exists('dbg')) { if (! function_exists('dbg')) {
function dbg($state) { function dbg($state)
global $db; {
$db->dbg($state); global $db;
}} $db->dbg($state);
}
}
if(! function_exists('dbesc')) { if (! function_exists('dbesc')) {
function dbesc($str) { function dbesc($str)
global $db; {
if($db) global $db;
return($db->escape($str)); if ($db) {
}} return($db->escape($str));
}
}
}
// Function: q($sql,$args); // Function: q($sql,$args);
@ -119,46 +138,55 @@ function dbesc($str) {
// 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')) { 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) }
logger('dba: ' . $db->db->error); if ($db->db->errno) {
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.
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)) {
$item = dbesc($item); if (is_string($item)) {
}} $item = dbesc($item);
}
}
}
if(! function_exists('dbesc_array')) { if (! function_exists('dbesc_array')) {
function dbesc_array(&$arr) { 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');
}} }
}
}
if(! function_exists('closedb')) { if (! function_exists('closedb')) {
function closedb() { function closedb()
global $db; {
global $db;
// $db->close(); // $db->close();
}} }
}