From 4ea1211ea8507cd035fc94560127c1200cfad8aa Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 11 May 2017 23:29:56 -0400
Subject: [PATCH] Move q errno check inside db existence check

- Remove if ! function_exists
- Fix formatting
---
 include/dba.php | 125 ++++++++++++++++++++----------------------------
 1 file changed, 53 insertions(+), 72 deletions(-)

diff --git a/include/dba.php b/include/dba.php
index 877f6cd3..37e1e173 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -16,7 +16,8 @@ class dba
 	public function __construct($server, $user, $pass, $db, $install = false)
 	{
 		$this->db = @new mysqli($server, $user, $pass, $db);
-		if ((mysqli_connect_errno()) && (! install)) {
+
+		if (mysqli_connect_errno() && ! $install) {
 			system_unavailable();
 		}
 	}
@@ -40,7 +41,7 @@ class dba
 			$mesg = '';
 
 			if ($this->db->mysqli->errno) {
-				$debug_text .=  $this->db->mysqli->error . EOL;
+				$debug_text .= $this->db->mysqli->error . EOL;
 			}
 
 			if ($result === false) {
@@ -48,19 +49,19 @@ class dba
 			} elseif ($result === true) {
 				$mesg = 'true';
 			} 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) {
-			case 3:
-				echo $str;
-				break;
-			default:
-				$debug_text .= $str;
-				break;
-		}
+				case 3:
+					echo $str;
+					break;
+				default:
+					$debug_text .= $str;
+					break;
+			}
 		}
 
 		if (($result === true) || ($result === false)) {
@@ -76,9 +77,9 @@ class dba
 		}
 
 		if ($this->debug == 2) {
-			$debug_text .= printable(print_r($r, true). EOL);
+			$debug_text .= printable(print_r($r, true) . EOL);
 		} elseif ($this->debug == 3) {
-			echo printable(print_r($r, true) . EOL) ;
+			echo printable(print_r($r, true) . EOL);
 		}
 
 		return $r;
@@ -100,93 +101,73 @@ class dba
 	}
 }
 
-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;
+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);
-	}
+function dbg($state)
+{
+	global $db;
+	$db->dbg($state);
 }
 
-if (! function_exists('dbesc')) {
-	function dbesc($str)
-	{
-		global $db;
-		if ($db) {
-			return($db->escape($str));
-		}
+function dbesc($str)
+{
+	global $db;
+	if ($db) {
+		return($db->escape($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)
-	{
-		global $db;
-		$args = func_get_args();
-		unset($args[0]);
-		if ($db) {
-			$ret = $db->q(vsprintf($sql, $args));
-		}
+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
 // 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)) {
-			$item = dbesc($item);
-		}
+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');
-		}
+function dbesc_array(&$arr)
+{
+	if (is_array($arr) && count($arr)) {
+		array_walk($arr, 'dbesc_array_cb');
 	}
 }
 
-
-if (! function_exists('closedb')) {
-	function closedb()
-	{
-		global $db;
-//	$db->close();
-	}
+function closedb()
+{
+	global $db;
+	//	$db->close();
 }