From 750f081078bc84c34855f9f3c969db6956b8302b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 20 Apr 2017 19:59:57 -0400 Subject: [PATCH] Enforce coding standards in include/dba.php --- include/dba.php | 208 +++++++++++++++++++++++++++--------------------- 1 file changed, 118 insertions(+), 90 deletions(-) diff --git a/include/dba.php b/include/dba.php index a79477cf..d6573506 100755 --- a/include/dba.php +++ b/include/dba.php @@ -7,111 +7,130 @@ // x = 2: display full queries following content // x = 3: display full queries using echo; which will mess up display // really bad but will return output in stubborn cases. - -if(! class_exists('dba')) { -class dba { +class dba +{ private $debug = 0; public $db; - function __construct($server,$user,$pass,$db,$install = false) { - $this->db = @new mysqli($server,$user,$pass,$db); - if((mysqli_connect_errno()) && (! install)) - system_unavailable(); + public function __construct($server, $user, $pass, $db, $install = false) + { + $this->db = @new mysqli($server, $user, $pass, $db); + if ((mysqli_connect_errno()) && (! install)) { + system_unavailable(); + } } - public function getdb() { + public function getdb() + { return $this->db; } - public function q($sql) { + public function q($sql) + { global $debug_text; - - if(! $this->db ) + + if (! $this->db) { return false; - + } + $result = @$this->db->query($sql); - if($this->debug) { - + if ($this->debug) { $mesg = ''; - if($this->db->mysqli->errno) + if ($this->db->mysqli->errno) { $debug_text .= $this->db->mysqli->error . EOL; + } - if($result === false) + if ($result === false) { $mesg = 'false'; - elseif($result === true) + } elseif ($result === true) { $mesg = 'true'; - else + } else { $mesg = $result->num_rows.' results' . EOL; - + } + $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL; - switch($this->debug) { - case 3: - echo $str; - break; - default: - $debug_text .= $str; - break; - } + switch ($this->debug) { + case 3: + echo $str; + break; + default: + $debug_text .= $str; + break; + } } - if(($result === true) || ($result === false)) + if (($result === true) || ($result === false)) { return $result; + } $r = array(); - if($result->num_rows) { - while($x = $result->fetch_array(MYSQL_ASSOC)) + if ($result->num_rows) { + while ($x = $result->fetch_array(MYSQL_ASSOC)) { $r[] = $x; + } $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; } - public function escape($str) { + public function escape($str) + { return @$this->db->real_escape_string($str); } - function __destruct() { + public function __destruct() + { @$this->db->close(); } -}} +} -if(! function_exists('printable')) { -function printable($s) { - $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); - $s = str_replace("\x00",'.',$s); - if(x($_SERVER,'SERVER_NAME')) - $s = escape_tags($s); - return $s; -}} +if (! function_exists('printable')) { + function printable($s) + { + $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~", ".", $s); + $s = str_replace("\x00", '.', $s); + if (x($_SERVER, 'SERVER_NAME')) { + $s = escape_tags($s); + } + return $s; + } +} // Procedural functions -if(! function_exists('dbg')) { -function dbg($state) { - global $db; - $db->dbg($state); -}} +if (! function_exists('dbg')) { + function dbg($state) + { + global $db; + $db->dbg($state); + } +} -if(! function_exists('dbesc')) { -function dbesc($str) { - global $db; - if($db) - return($db->escape($str)); -}} +if (! function_exists('dbesc')) { + function dbesc($str) + { + global $db; + if ($db) { + return($db->escape($str)); + } + } +} // Function: q($sql,$args); @@ -119,46 +138,55 @@ function dbesc($str) { // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // 'user', 1); -if(! function_exists('q')) { -function q($sql) { - - global $db; - $args = func_get_args(); - unset($args[0]); - if($db) - $ret = $db->q(vsprintf($sql,$args)); - if($db->db->errno) - logger('dba: ' . $db->db->error); +if (! function_exists('q')) { + function q($sql) + { + global $db; + $args = func_get_args(); + unset($args[0]); + if ($db) { + $ret = $db->q(vsprintf($sql, $args)); + } + 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 -// SQL injection vectors. All integer array elements should be specifically -// 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')) { -function dbesc_array_cb(&$item, $key) { - if(is_string($item)) - $item = dbesc($item); -}} +if (! function_exists('dbesc_array_cb')) { + function dbesc_array_cb(&$item, $key) + { + if (is_string($item)) { + $item = dbesc($item); + } + } +} -if(! function_exists('dbesc_array')) { -function dbesc_array(&$arr) { - if(is_array($arr) && count($arr)) { - array_walk($arr,'dbesc_array_cb'); - } -}} +if (! function_exists('dbesc_array')) { + function dbesc_array(&$arr) + { + if (is_array($arr) && count($arr)) { + array_walk($arr, 'dbesc_array_cb'); + } + } +} -if(! function_exists('closedb')) { -function closedb() { - global $db; +if (! function_exists('closedb')) { + function closedb() + { + global $db; // $db->close(); -}} - + } +}