X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=70c27515c4499d268327285c7809183cc65a5890;hb=f5c9de19d506ebadf09059f1c72d190ff98a9cdf;hp=54084d8358ea12602b794c7068ee857b97bec0d5;hpb=f7c0480f1b69c44d5daf47d343aaba44ebd26ec2;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index 54084d8358..70c27515c4 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,23 +1,50 @@
 <?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) {
+
+		$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;
+				}
+			}
+		}
+
 		$this->db = @new mysqli($server,$user,$pass,$db);
-		if((mysqli_connect_errno()) && (! $install))
-			system_unavailable();    
+		if(! mysqli_connect_errno()) {
+			$this->connected = true;
+		}
+		else {
+			$this->db = null;
+			if(! $install)
+				system_unavailable();
+		}
 	}
 
 	public function getdb() {
@@ -25,9 +52,8 @@ class dba {
 	}
 
 	public function q($sql) {
-		global $debug_text;
 		
-		if(! $this->db )
+		if((! $this->db) || (! $this->connected))
 			return false;
 		
 		$result = @$this->db->query($sql);
@@ -37,27 +63,27 @@ class dba {
 			$mesg = '';
 
 			if($this->db->errno)
-				$debug_text .=  $this->db->error . EOL;
+				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 = ' . 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'))
@@ -75,11 +101,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 +111,8 @@ class dba {
 	}
 
 	public function escape($str) {
-		return @$this->db->real_escape_string($str);
+		if($this->db && $this->connected)
+			return @$this->db->real_escape_string($str);
 	}
 
 	function __destruct() {
@@ -109,13 +133,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));
 }}
 
 
@@ -130,17 +158,38 @@ function q($sql) {
 	global $db;
 	$args = func_get_args();
 	unset($args[0]);
-	$ret = $db->q(vsprintf($sql,$args));
-	return $ret;
+
+	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
+/**
+ *
+ * Raw db query, no arguments
+ *
+ */
 
 if(! function_exists('dbq')) { 
 function dbq($sql) {
 
 	global $db;
-	$ret = $db->q($sql);
+	if($db && $db->connected)
+		$ret = $db->q($sql);
+	else
+		$ret = false;
 	return $ret;
 }}
 
@@ -163,4 +212,6 @@ function dbesc_array(&$arr) {
 	if(is_array($arr) && count($arr)) {
 		array_walk($arr,'dbesc_array_cb');
 	}
-}}		
\ No newline at end of file
+}}		
+
+