compatibility: version discovery

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 4e3f11f7befbfbfa15666dafc698a88912ef9c9c..e58abb1a1210e29e3450fe3c5c2ca995ecffdce6 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,12 +1,15 @@
 <?php
 
-// MySQL database class
-//
-// For debugging, insert 'dbg(x);' anywhere in the program flow.
-// x = 1: display db success/failure following content
-// x = 2: display full queries following content
-// x = 3: display full queries using echo; which will mess up display
-//        really bad but will return output in stubborn cases.
+/**
+ *
+ * MySQL database class
+ *
+ * For debugging, insert 'dbg(1);' anywhere in the program flow.
+ * dbg(0); will turn it off. Logging is performed at LOGGER_DATA level.
+ * When logging, all binary info is converted to text and html entities are escaped so that 
+ * the debugging stream is safe to view within both terminals and web pages.
+ *
+ */
  
 if(! class_exists('dba')) { 
 class dba {
@@ -25,7 +28,6 @@ class dba {
        }
 
        public function q($sql) {
-               global $debug_text;
                
                if(! $this->db )
                        return false;
@@ -44,13 +46,20 @@ 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;
 
                        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($result === false) {
                                logger('dba: ' . printable($sql) . ' returned false.');
                                if(file_exists('dbfail.out'))
@@ -105,7 +114,10 @@ function dbg($state) {
 if(! function_exists('dbesc')) { 
 function dbesc($str) {
        global $db;
-       return($db->escape($str));
+       if($db)
+               return($db->escape($str));
+       else
+               return(str_replace("'","\\'",$str));
 }}
 
 
@@ -120,11 +132,29 @@ function q($sql) {
        global $db;
        $args = func_get_args();
        unset($args[0]);
-       $ret = $db->q(vsprintf($sql,$args));
-       return $ret;
+
+       if($db) {
+               $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) {