X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=3fa615d903dc078cfa541afb4589af22105ad6c1;hb=ccef8995779d8b97e0bd9965eee5c592101969de;hp=9e44db5fbb85188e4bcbf589f34e3c6192b61704;hpb=1a1f9b296c163af850d68babfb844e617f154875;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index 9e44db5fbb..3fa615d903 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,23 +1,61 @@
 <?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  $mysqli = true;
+	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();    
+
+		$server = trim($server);
+		$user = trim($user);
+		$pass = trim($pass);
+		$db = trim($db);
+
+		if($install) {
+			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
+				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
+					notice( sprintf( t('Cannot locate DNS info for database server \'%s\''), $server));
+					$this->connected = false;
+					$this->db = null;
+					return;
+				}
+			}
+		}
+
+		if(class_exists('mysqli')) {
+			$this->db = @new mysqli($server,$user,$pass,$db);
+			if(! mysqli_connect_errno()) {
+				$this->connected = true;
+			}
+		}
+		else {
+			$this->mysqli = false;
+			$this->db = mysql_connect($server,$user,$pass);
+			if($this->db && mysql_select_db($db,$this->db)) {
+				$this->connected = true;
+			}
+		}
+		if(! $this->connected) {
+			$this->db = null;
+			if(! $install)
+				system_unavailable();
+		}
 	}
 
 	public function getdb() {
@@ -25,36 +63,51 @@ class dba {
 	}
 
 	public function q($sql) {
-		global $debug_text;
 		
-		if(! $this->db )
+		if((! $this->db) || (! $this->connected))
 			return false;
 		
-		$result = @$this->db->query($sql);
+		if($this->mysqli)
+			$result = @$this->db->query($sql);
+		else
+			$result = @mysql_query($sql,$this->db);
 
 		if($this->debug) {
 
 			$mesg = '';
 
-			if($this->db->mysqli->errno)
-				$debug_text .=  $this->db->mysqli->error . EOL;
+			if($this->mysqli && $this->db->errno)
+				logger('dba: ' . $this->db->error);
+			else
+				logger('dba: ' . mysql_error($this->db));
 
 			if($result === false)
 				$mesg = 'false';
 			elseif($result === true)
 				$mesg = 'true';
-			else
-				$mesg = $result->num_rows.' results' . EOL;
-        
+			else {
+				if($this->mysqli)
+					$mesg = $result->num_rows . ' results' . EOL;
+    			else
+					$mesg = mysql_num_rows($result) . ' results' . EOL;
+			}
+    
 			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
 
-			switch($this->debug) {
-				case 3:
-					echo $str;
-					break;
-				default:
-					$debug_text .= $str;
-					break;
+			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);
 			}
 		}
 
@@ -62,17 +115,24 @@ class dba {
 			return $result;
 
 		$r = array();
-		if($result->num_rows) {
-			while($x = $result->fetch_array(MYSQL_ASSOC))
-				$r[] = $x;
-			$result->free_result();
+		if($this->mysqli) {
+			if($result->num_rows) {
+				while($x = $result->fetch_array(MYSQL_ASSOC))
+					$r[] = $x;
+				$result->free_result();
+			}
+		}
+		else {
+			if(mysql_num_rows($result)) {
+				while($x = mysql_fetch_array($result, MYSQL_ASSOC))
+					$r[] = $x;
+				mysql_free_result($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);
 	}
 
@@ -81,11 +141,19 @@ class dba {
 	}
 
 	public function escape($str) {
-		return @$this->db->real_escape_string($str);
+		if($this->db && $this->connected) {
+			if($this->mysqli)
+				return @$this->db->real_escape_string($str);
+			else
+				return @mysql_real_escape_string($str,$this->db);
+		}
 	}
 
 	function __destruct() {
-		@$this->db->close();
+		if($this->mysqli)
+			@$this->db->close();
+		else
+			@mysql_close($this->db);
 	}
 }}
 
@@ -102,13 +170,17 @@ function printable($s) {
 if(! function_exists('dbg')) { 
 function dbg($state) {
 	global $db;
+	if($db)
 	$db->dbg($state);
 }}
 
 if(! function_exists('dbesc')) { 
 function dbesc($str) {
 	global $db;
-	return($db->escape($str));
+	if($db && $db->connected)
+		return($db->escape($str));
+	else
+		return(str_replace("'","\\'",$str));
 }}
 
 
@@ -123,7 +195,38 @@ function q($sql) {
 	global $db;
 	$args = func_get_args();
 	unset($args[0]);
-	$ret = $db->q(vsprintf($sql,$args));
+
+	if($db && $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 && $db->connected)
+		$ret = $db->q($sql);
+	else
+		$ret = false;
 	return $ret;
 }}
 
@@ -146,4 +249,6 @@ function dbesc_array(&$arr) {
 	if(is_array($arr) && count($arr)) {
 		array_walk($arr,'dbesc_array_cb');
 	}
-}}		
\ No newline at end of file
+}}		
+
+