X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=70c27515c4499d268327285c7809183cc65a5890;hb=90870d4872dbc8ff408183a79fd005b905aa86c2;hp=e58abb1a1210e29e3450fe3c5c2ca995ecffdce6;hpb=e972375403bd019c58478c687443b8c8c68e55d9;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index e58abb1a12..70c27515c4 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -16,11 +16,35 @@ 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() {
@@ -29,7 +53,7 @@ class dba {
 
 	public function q($sql) {
 		
-		if(! $this->db )
+		if((! $this->db) || (! $this->connected))
 			return false;
 		
 		$result = @$this->db->query($sql);
@@ -54,7 +78,7 @@ class dba {
 		}
 		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.
@@ -87,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() {
@@ -108,13 +133,14 @@ 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;
-	if($db)
+	if($db && $db->connected)
 		return($db->escape($str));
 	else
 		return(str_replace("'","\\'",$str));
@@ -133,7 +159,7 @@ function q($sql) {
 	$args = func_get_args();
 	unset($args[0]);
 
-	if($db) {
+	if($db && $db->connected) {
 		$ret = $db->q(vsprintf($sql,$args));
 		return $ret;
 	}
@@ -160,7 +186,10 @@ 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;
 }}
 
@@ -183,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
+}}		
+
+