Merge branch 'pull'

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index fd403b56097c63908d0fab2abdc918ce0aeb153e..70c27515c4499d268327285c7809183cc65a5890 100644 (file)
--- 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() {
@@ -28,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);
@@ -47,7 +70,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;
 
@@ -55,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.
@@ -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
+}}             
+
+