X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=d3da8eae055471b656142dad8ee6b63fb0944740;hb=377f991ac5b1e8c3c679fbbc5e138256bc24715b;hp=48dcc12a985eb1f6c173422dbc96d270a871569f;hpb=8d0ba934364fbb65e66edf1b2cda24ebd8afb96b;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index 48dcc12a98..d3da8eae05 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,27 +1,38 @@
 <?php
 
-// MySQL database class
-//
-// For debugging, insert 'dbg(x);' anywhere in the program flow.
-// x = 1: display db success/failure following content
-// 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.
+/**
+ *
+ * MySQL database class
+ *
+ * For debugging, insert 'dbg(1);' anywhere in the program flow.
+ * dbg(0); will turn it off. Logging is performed at LOGGER_DATA level.
+ * When logging, all binary info is converted to text and html entities are escaped so that 
+ * the debugging stream is safe to view within both terminals and web pages.
+ *
+ */
  
 if(! class_exists('dba')) { 
 class dba {
 
 	private $debug = 0;
 	private $db;
+	public  $connected = false;
 
 	function __construct($server,$user,$pass,$db,$install = false) {
 		$this->db = @new mysqli($server,$user,$pass,$db);
-		if((mysqli_connect_errno()) && (! install))
-			system_unavailable();    
+		if((mysqli_connect_errno()) && (! $install)) {
+			$this->db = null;
+			system_unavailable();
+		}
+		else
+			$this->connected = true;    
+	}
+
+	public function getdb() {
+		return $this->db;
 	}
 
 	public function q($sql) {
-		global $debug_text;
 		
 		if(! $this->db )
 			return false;
@@ -32,25 +43,32 @@ 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';
 			elseif($result === true)
 				$mesg = 'true';
 			else
-				$mesg = $result->num_rows.' results' . EOL;
+				$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 dbfail.out exists, we will write any failed calls directly to it,
+			 * regardless of any logging that may or may nor be in effect.
+			 * These usually indicate SQL syntax errors that need to be resolved.
+			 */
+
+			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 +82,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);
 	}
 
@@ -88,7 +103,10 @@ class dba {
 if(! function_exists('printable')) {
 function printable($s) {
 	$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
-	return(escape_tags(str_replace("\x00",'.',$s)));
+	$s = str_replace("\x00",'.',$s);
+	if(x($_SERVER,'SERVER_NAME'))
+		$s = escape_tags($s);
+	return $s;
 }}
 
 // Procedural functions
@@ -101,7 +119,10 @@ function dbg($state) {
 if(! function_exists('dbesc')) { 
 function dbesc($str) {
 	global $db;
-	return($db->escape($str));
+	if($db->connected)
+		return($db->escape($str));
+	else
+		return(str_replace("'","\\'",$str));
 }}
 
 
@@ -116,7 +137,38 @@ function q($sql) {
 	global $db;
 	$args = func_get_args();
 	unset($args[0]);
-	$ret = $db->q(vsprintf($sql,$args));
+
+	if($db->connected) {
+		$ret = $db->q(vsprintf($sql,$args));
+		return $ret;
+	}
+
+	/**
+	 *
+	 * This will happen occasionally trying to store the 
+	 * session data after abnormal program termination 
+	 *
+	 */
+
+	logger('dba: no database: ' . print_r($args,true));
+	return false; 
+
+}}
+
+/**
+ *
+ * Raw db query, no arguments
+ *
+ */
+
+if(! function_exists('dbq')) { 
+function dbq($sql) {
+
+	global $db;
+	if($db->connected)
+		$ret = $db->q($sql);
+	else
+		$ret = false;
 	return $ret;
 }}