Enforce coding standards in include/dba.php

include/dba.php

@@ -8,47 +8,52 @@
 // 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) {
+	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);
+		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) {
+			switch ($this->debug) {
 			case 3:
 				echo $str;
 				break;
@@ -58,60 +63,74 @@ class dba {
 		}
 		}
 
-		if(($result === true) || ($result === false))
+		if (($result === true) || ($result === false)) {
 			return $result;
+		}
 
 		$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;
+			}
 			$result->free_result();
 		}
 
-		if($this->debug == 2)
+		if ($this->debug == 2) {
 			$debug_text .= printable(print_r($r, true). EOL);
-		elseif($this->debug == 3)
+		} elseif ($this->debug == 3) {
 			echo printable(print_r($r, true) . EOL) ;
-
-		return($r);
 		}
 
-	public function dbg($dbg) {
+		return $r;
+	}
+
+	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')) {
+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);
+        if (x($_SERVER, 'SERVER_NAME')) {
             $s = escape_tags($s);
+        }
         return $s;
-}}
+    }
+}
 
 
 // Procedural functions
-if(! function_exists('dbg')) { 
+if (! function_exists('dbg')) {
-function dbg($state) {
+    function 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)
+        if ($db) {
             return($db->escape($str));
-}}
+        }
+    }
+}
 
 
 // Function: q($sql,$args);
@@ -119,20 +138,23 @@ function dbesc($str) {
 // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
 //                   'user', 1);
 
-if(! function_exists('q')) { 
+if (! function_exists('q')) {
-function q($sql) {
+    function q($sql)
-
+    {
         global $db;
         $args = func_get_args();
         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);
+        }
 
 
         return $ret;
-}}
+    }
+}
 
 
 // Caller is responsible for ensuring that any integer arguments to
@@ -141,24 +163,30 @@ function q($sql) {
 // 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))
+    {
+        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('closedb')) {
+if (! function_exists('dbesc_array')) {
-function closedb() {
+    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();
-}}
+    }
-
+}