X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=881097f30c399598e3d6fc4f95739c8ec9b4c2bf;hb=ec83a62f709b93beb81b8c9d2b6323ea85eb1a64;hp=138e82b58bf1e7431c965d78a7fc1224f78215a6;hpb=3ee529d095ac7e83ae1e71d86cbe6d443885d54e;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
old mode 100755
new mode 100644
index 138e82b58b..881097f30c
--- a/include/dba.php
+++ b/include/dba.php
@@ -32,9 +32,9 @@ class dba {
 		if (!(strlen($server) && strlen($user))){
 			$this->connected = false;
 			$this->db = null;
-			return;			
+			return;
 		}
-		
+
 		if($install) {
 			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
@@ -71,26 +71,38 @@ class dba {
 	}
 
 	public function q($sql) {
-		
+
 		if((! $this->db) || (! $this->connected))
 			return false;
-		
+
+		$this->error = '';
+
+		//if (get_config("system", "db_log") != "")
+		//	@file_put_contents(get_config("system", "db_log"), datetime_convert().':'.session_id(). ' Start '.$sql."\n", FILE_APPEND);
+
 		if($this->mysqli)
 			$result = @$this->db->query($sql);
 		else
 			$result = @mysql_query($sql,$this->db);
 
+		//if (get_config("system", "db_log") != "")
+		//	@file_put_contents(get_config("system", "db_log"), datetime_convert().':'.session_id(). ' Stop '."\n", FILE_APPEND);
+
+		if($this->mysqli) {
+			if($this->db->errno)
+				$this->error = $this->db->error;
+		}
+		elseif(mysql_errno($this->db))
+				$this->error = mysql_error($this->db);
+
+		if(strlen($this->error)) {
+			logger('dba: ' . $this->error);
+		}
+
 		if($this->debug) {
 
 			$mesg = '';
 
-			if($this->mysqli) {
-				if($this->db->errno)
-					logger('dba: ' . $this->db->error);
-			}
-			elseif(mysql_errno($this->db))
-				logger('dba: ' . mysql_error($this->db));
-
 			if($result === false)
 				$mesg = 'false';
 			elseif($result === true)
@@ -101,8 +113,10 @@ class dba {
     			else
 					$mesg = mysql_num_rows($result) . ' results' . EOL;
 			}
-    
-			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
+
+			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
+				. (($this->error) ? ' error: ' . $this->error : '')
+				. EOL;
 
 			logger('dba: ' . $str );
 		}
@@ -114,9 +128,9 @@ class dba {
 		 */
 
 		if($result === false) {
-			logger('dba: ' . printable($sql) . ' returned false.');
+			logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
 			if(file_exists('dbfail.out'))
-				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND);
+				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
 		}
 
 		if(($result === true) || ($result === false))
@@ -138,7 +152,7 @@ class dba {
 			}
 		}
 
-    
+
 		if($this->debug)
 			logger('dba: ' . printable(print_r($r, true)));
 		return($r);
@@ -209,9 +223,8 @@ function q($sql) {
 	if($db && $db->connected) {
 		$stmt = vsprintf($sql,$args);
 		if($stmt === false)
-			logger('dba: vsprintf error: ' . print_r(debug_bracktrace(),true));
-		$ret = $db->q($stmt);
-		return $ret;
+			logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+		return $db->q($stmt);
 	}
 
 	/**
@@ -261,6 +274,4 @@ function dbesc_array(&$arr) {
 	if(is_array($arr) && count($arr)) {
 		array_walk($arr,'dbesc_array_cb');
 	}
-}}		
-
-
+}}