Changeset 42 for trunk/lib/DB.inc.php

Timestamp:

Dec 18, 2005 12:16:03 AM (18 years ago)

Author:

scdev

Message:

detabbed all files ;P

File:

• trunk/lib/DB.inc.php (modified) (22 diffs)

trunk/lib/DB.inc.php

@@ -9 +9 @@
  * @version 1.0.1
  */
- 
+
 class DB {
 
@@ -35 +35 @@
         'db_die_on_failure' => false, // TRUE = script stops on db error.
     );
-    
+
     // Translate between HTML and MySQL character set names.
     var $mysql_character_sets = array(
@@ -41 +41 @@
         'iso-8859-1' => 'latin1',
     );
-    
+
     // Caches.
     var $existing_tables;
     var $table_columns;
-    
+
     /**
      * This method enforces the singleton pattern for this class.
@@ -63 +63 @@
         return $instance;
     }
-    
+
     /**
      * Constructor.
@@ -119 +119 @@
         }
     }
-    
+
     /**
      * Connect to database with credentials in params.
@@ -132 +132 @@
             $this =& DB::getInstance();
         }
-        
+
         if (!$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass')) {
             App::logMsg('Database credentials missing.', LOG_EMERG, __FILE__, __LINE__);
             return false;
         }
-        
+
         // Connect to database. Always create a new link to the server.
-        if ($this->dbh = mysql_connect($this->getParam('db_server'), $this->getParam('db_user'), $this->getParam('db_pass'), true)) {    
+        if ($this->dbh = mysql_connect($this->getParam('db_server'), $this->getParam('db_user'), $this->getParam('db_pass'), true)) {
             // Select database
             mysql_select_db($this->getParam('db_name'), $this->dbh);
         }
-        
+
         // Test for connection errors.
         if (!$this->dbh || mysql_error($this->dbh)) {
@@ -164 +164 @@
             }
         }
-        
+
         // DB connection success!
         $this->_connected = true;
@@ -173 +173 @@
         return true;
     }
-    
+
     /**
      * Close db connection.
@@ -186 +186 @@
             $this =& DB::getInstance();
         }
-        
-        if (!$this->_connected) {
-            return false;
-        }
-
-        mysql_close($this->dbh);        
-    }
-    
+
+        if (!$this->_connected) {
+            return false;
+        }
+
+        mysql_close($this->dbh);
+    }
+
     /**
      * Return the current database handler.
@@ -207 +207 @@
             $this =& DB::getInstance();
         }
-        
+
         if (!$this->_connected) {
             return false;
@@ -214 +214 @@
         return $this->dbh;
     }
-    
+
     /**
      * Returns connection status
@@ -226 +226 @@
         return $this->_connected;
     }
-    
+
     /**
      * A wrapper for mysql_query. Allows us to set the database link_identifier,
@@ -238 +238 @@
     {
         static $_query_count = 0;
-        
-        if (!isset($this) || !is_a($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-        
+
+        if (!isset($this) || !is_a($this, 'DB')) {
+            $this =& DB::getInstance();
+        }
+
         if (!$this->_connected) {
            return false;
@@ -252 +252 @@
             echo "<!-- ----------------- Query $_query_count ---------------------\n$debugqry\n-->\n";
         }
-        
+
         // Execute!
         $qid = mysql_query($query, $this->dbh);
-    
+
         // Error checking.
         if (!$qid || mysql_error($this->dbh)) {
@@ -269 +269 @@
             }
         }
-    
+
         return $qid;
     }
 
     /**
-     * Loads a list of tables in the current database into an array, and returns 
+     * Loads a list of tables in the current database into an array, and returns
      * true if the requested table is found. Use this function to enable/disable
-     * funtionality based upon the current available db tables or to dynamically 
+     * funtionality based upon the current available db tables or to dynamically
      * create tables if missing.
      *
@@ -284 +284 @@
      */
     function tableExists($table, $use_cached_results=true)
-    {   
-        if (!isset($this) || !is_a($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-        
+    {
+        if (!isset($this) || !is_a($this, 'DB')) {
+            $this =& DB::getInstance();
+        }
+
         if (!$this->_connected) {
             return false;
@@ -307 +307 @@
         }
     }
-    
+
     /**
      * Tests if the given array of columns exists in the specified table.
@@ -318 +318 @@
      */
     function columnExists($table, $columns, $strict=true, $use_cached_results=true)
-    {   
-        if (!isset($this) || !is_a($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-        
+    {
+        if (!isset($this) || !is_a($this, 'DB')) {
+            $this =& DB::getInstance();
+        }
+
         if (!$this->_connected) {
             return false;
@@ -331 +331 @@
             return false;
         }
-        
+
         // For single-value columns.
         if (!is_array($columns)) {
             $columns = array($columns);
         }
-        
+
         if (!isset($this->table_columns[$table]) || !$use_cached_results) {
             // Populate and cache array of current columns for this table.
@@ -345 +345 @@
             }
         }
-    
+
         if ($strict) {
             // Do an exact comparison of table schemas.
@@ -359 +359 @@
         }
     }
-    
+
     /**
      * Reset cached items.
@@ -372 +372 @@
         $this->table_columns = null;
     }
-    
+
 } // End.