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

diff --git a/include/dba.php b/include/dba.php
index fd403b5609..d3da8eae05 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -16,11 +16,16 @@ 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() {
@@ -28,7 +33,6 @@ class dba {
 	}
 
 	public function q($sql) {
-		global $debug_text;
 		
 		if(! $this->db )
 			return false;
@@ -47,7 +51,7 @@ class dba {
 			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;
 
@@ -115,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));
 }}
 
 
@@ -130,17 +137,38 @@ function q($sql) {
 	global $db;
 	$args = func_get_args();
 	unset($args[0]);
-	$ret = $db->q(vsprintf($sql,$args));
-	return $ret;
+
+	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
+/**
+ *
+ * Raw db query, no arguments
+ *
+ */
 
 if(! function_exists('dbq')) { 
 function dbq($sql) {
 
 	global $db;
-	$ret = $db->q($sql);
+	if($db->connected)
+		$ret = $db->q($sql);
+	else
+		$ret = false;
 	return $ret;
 }}