X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=7455b6b3ee2c8053a1f45937e2196062554104d5;hb=1f074cb44c5deda5b480f5ff814ff3640ec843d0;hp=b89cf53766feb474d64f2288930f014164b69b98;hpb=034038849cfa710f8b65bc5ab0121cc4865b8b28;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
old mode 100644
new mode 100755
index b89cf53766..7455b6b3ee
--- a/include/dba.php
+++ b/include/dba.php
@@ -18,7 +18,7 @@ class dba {
 	private $db;
 	public  $mysqli = true;
 	public  $connected = false;
-
+	public  $error = false;
 
 	function __construct($server,$user,$pass,$db,$install = false) {
 
@@ -27,10 +27,16 @@ class dba {
 		$pass = trim($pass);
 		$db = trim($db);
 
+		if (!(strlen($server) && strlen($user))){
+			$this->connected = false;
+			$this->db = null;
+			return;			
+		}
+		
 		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->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
 					$this->connected = false;
 					$this->db = null;
 					return;
@@ -119,7 +125,7 @@ class dba {
 		$r = array();
 		if($this->mysqli) {
 			if($result->num_rows) {
-				while($x = $result->fetch_array(MYSQL_ASSOC))
+				while($x = $result->fetch_array(MYSQLI_ASSOC))
 					$r[] = $x;
 				$result->free_result();
 			}
@@ -152,10 +158,11 @@ class dba {
 	}
 
 	function __destruct() {
-		if($this->mysqli)
-			@$this->db->close();
-		else
-			@mysql_close($this->db);
+		if ($this->db) 
+			if($this->mysqli)
+				$this->db->close();
+			else
+				mysql_close($this->db);
 	}
 }}
 
@@ -186,6 +193,7 @@ function dbesc($str) {
 }}
 
 
+
 // Function: q($sql,$args);
 // Description: execute SQL query with printf style args.
 // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
@@ -209,7 +217,6 @@ function q($sql) {
 	 * session data after abnormal program termination 
 	 *
 	 */
-
 	logger('dba: no database: ' . print_r($args,true));
 	return false;