X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=4e3f11f7befbfbfa15666dafc698a88912ef9c9c;hb=875b31fb8efb5fbd5e6682321ac6a6a055cd8e4d;hp=07142dbadfd5cd84ac71d79acb6cdf0277bbc605;hpb=51f6671466afa72eef7d28aa6f00db406876a1cd;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index 07142dbadf..4e3f11f7be 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -16,10 +16,14 @@ class dba {
 
 	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();    
 	}
 
+	public function getdb() {
+		return $this->db;
+	}
+
 	public function q($sql) {
 		global $debug_text;
 		
@@ -32,8 +36,8 @@ class dba {
 
 			$mesg = '';
 
-			if($this->db->mysqli->errno)
-				$debug_text .=  $this->db->mysqli->error . EOL;
+			if($this->db->errno)
+				logger('dba: ' . $this->db->error);
 
 			if($result === false)
 				$mesg = 'false';
@@ -42,15 +46,15 @@ class dba {
 			else
 				$mesg = $result->num_rows.' results' . EOL;
         
-			$str =  'SQL = ' . $sql . EOL . 'SQL returned ' . $mesg . EOL;
-
-			switch($this->debug) {
-				case 3:
-					echo $str;
-					break;
-				default:
-					$debug_text .= $str;
-					break;
+			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
+
+			logger('dba: ' . $str );
+		}
+		else {
+			if($result === false) {
+				logger('dba: ' . printable($sql) . ' returned false.');
+				if(file_exists('dbfail.out'))
+					file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
 			}
 		}
 
@@ -64,11 +68,8 @@ class dba {
 			$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) ;
-
+		if($this->debug)
+			logger('dba: ' . printable(print_r($r, true)), LOGGER_DATA);
 		return($r);
 	}
 
@@ -123,6 +124,16 @@ function q($sql) {
 	return $ret;
 }}
 
+// raw db query, no arguments
+
+if(! function_exists('dbq')) { 
+function dbq($sql) {
+
+	global $db;
+	$ret = $db->q($sql);
+	return $ret;
+}}
+
 
 // Caller is responsible for ensuring that any integer arguments to 
 // dbesc_array are actually integers and not malformed strings containing