Merge branch 'pull'

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
old mode 100644 (file)
new mode 100755 (executable)
index 3fa615d..76cc0bc
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/datetime.php');
+
 /**
  *
  * MySQL database class
@@ -18,7 +20,7 @@ class dba {
        private $db;
        public  $mysqli = true;
        public  $connected = false;
-
+       public  $error = false;
 
        function __construct($server,$user,$pass,$db,$install = false) {
 
@@ -27,10 +29,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;
@@ -76,9 +84,11 @@ class dba {
 
                        $mesg = '';
 
-                       if($this->mysqli && $this->db->errno)
-                               logger('dba: ' . $this->db->error);
-                       else
+                       if($this->mysqli) {
+                               if($this->db->errno)
+                                       logger('dba: ' . $this->db->error);
+                       }
+                       elseif(mysql_errno($this->db))
                                logger('dba: ' . mysql_error($this->db));
 
                        if($result === false)
@@ -96,19 +106,17 @@ class dba {
 
                        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 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'))
-                                       file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
-                       }
+               if($result === false) {
+                       logger('dba: ' . printable($sql) . ' returned false.');
+                       if(file_exists('dbfail.out'))
+                               file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND);
                }
 
                if(($result === true) || ($result === false))
@@ -117,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();
                        }
@@ -132,7 +140,7 @@ class dba {
 
     
                if($this->debug)
-                       logger('dba: ' . printable(print_r($r, true)), LOGGER_DATA);
+                       logger('dba: ' . printable(print_r($r, true)));
                return($r);
        }
 
@@ -150,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);
        }
 }}
 
@@ -184,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",
@@ -197,8 +207,10 @@ function q($sql) {
        unset($args[0]);
 
        if($db && $db->connected) {
-               $ret = $db->q(vsprintf($sql,$args));
-               return $ret;
+               $stmt = vsprintf($sql,$args);
+               if($stmt === false)
+                       logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+               return $db->q($stmt);
        }
 
        /**
@@ -207,7 +219,6 @@ function q($sql) {
         * session data after abnormal program termination 
         *
         */
-
        logger('dba: no database: ' . print_r($args,true));
        return false;