Changeset 130 for branches/2.0singleton/lib

Timestamp:

May 30, 2006 9:30:35 PM (18 years ago)

Author:

scdev

Message:

finished updating DB:: to $db->

Location:

branches/2.0singleton/lib

Files:

• Auth_SQL.inc.php (modified) (24 diffs)
• Hierarchy.inc.php (modified) (21 diffs)
• PageNumbers.inc.php (modified) (1 diff)
• RecordLock.inc.php (modified) (15 diffs)
• RecordVersion.inc.php (modified) (18 diffs)
• SortOrder.inc.php (modified) (2 diffs)
• TemplateGlue.inc.php (modified) (5 diffs)
• Utilities.inc.php (modified) (1 diff)

branches/2.0singleton/lib/Auth_SQL.inc.php

@@ -118 +118 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
+    
     
         static $_db_tested = false;
@@ -125 +127 @@
             // User table.
             if ($recreate_db) {
-                DB::query("DROP TABLE IF EXISTS " . $this->getParam('db_table'));
+                $db->query("DROP TABLE IF EXISTS " . $this->getParam('db_table'));
                 $app->logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_table')), LOG_DEBUG, __FILE__, __LINE__);
             }
 
             // The minimal columns for a table compatable with the Auth_SQL class.
-            DB::query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_table') . " (
+            $db->query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_table') . " (
                 " . $this->getParam('db_primary_key') . " smallint(11) NOT NULL auto_increment,
                 " . $this->getParam('db_username_column') . " varchar(255) NOT NULL default '',
@@ -156 +158 @@
             )");
 
-            if (!DB::columnExists($this->getParam('db_table'), array(
+            if (!$db->columnExists($this->getParam('db_table'), array(
                 $this->getParam('db_primary_key'),
                 $this->getParam('db_username_column'),
@@ -184 +186 @@
             if ($this->getParam('abuse_detection')) {
                 if ($recreate_db) {
-                    DB::query("DROP TABLE IF EXISTS " . $this->getParam('db_login_table'));
+                    $db->query("DROP TABLE IF EXISTS " . $this->getParam('db_login_table'));
                     $app->logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_login_table')), LOG_DEBUG, __FILE__, __LINE__);
                 }
-                DB::query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_login_table') . " (
+                $db->query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_login_table') . " (
                     " . $this->getParam('db_primary_key') . " smallint(11) NOT NULL default '0',
                     login_datetime datetime NOT NULL default '0000-00-00 00:00:00',
@@ -196 +198 @@
                 )");
 
-                if (!DB::columnExists($this->getParam('db_login_table'), array(
+                if (!$db->columnExists($this->getParam('db_login_table'), array(
                     $this->getParam('db_primary_key'),
                     'login_datetime',
@@ -249 +251 @@
     function clearAuth()
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
-        DB::query("
+        $db->query("
             UPDATE " . $this->_params['db_table'] . " SET
             seconds_online = seconds_online + (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_access_datetime)),
@@ -305 +309 @@
     {
         $app =& App::getInstance();
-    
+        $db =& DB::getInstance();
+
         $this->initDB();
 
         // Query DB for user matching credentials.
         // FIXME: Cannot compare crypt style passwords this way.
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT *, " . $this->_params['db_primary_key'] . " AS user_id
             FROM " . $this->_params['db_table'] . "
-            WHERE " . $this->_params['db_username_column'] . " = '" . DB::escapeString($username) . "'
-            AND BINARY userpass = '" . DB::escapeString($this->encryptPassword($password)) . "'
+            WHERE " . $this->_params['db_username_column'] . " = '" . $db->escapeString($username) . "'
+            AND BINARY userpass = '" . $db->escapeString($this->encryptPassword($password)) . "'
         ");
 
@@ -338 +343 @@
     {
         $app =& App::getInstance();
-    
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
@@ -390 +396 @@
         **/
         if ($this->getParam('abuse_detection') && !$this->getVal('login_abuse_exempt')) {
-            $qid = DB::query("
+            $qid = $db->query("
                 SELECT COUNT(DISTINCT LEFT(remote_ip_binary, " . $this->_params['login_abuse_ip_bitmask'] . "))
                 FROM " . $this->_params['db_login_table'] . "
@@ -410 +416 @@
                 }
                 // Increment user's warning level.
-                DB::query("UPDATE " . $this->_params['db_table'] . " SET abuse_warning_level = abuse_warning_level + 1 WHERE " . $this->_params['db_primary_key'] . " = '" . $this->getVal('user_id') . "'");
+                $db->query("UPDATE " . $this->_params['db_table'] . " SET abuse_warning_level = abuse_warning_level + 1 WHERE " . $this->_params['db_primary_key'] . " = '" . $this->getVal('user_id') . "'");
                 // Reset the login counter for this user.
-                DB::query("DELETE FROM " . $this->_params['db_login_table'] . " WHERE " . $this->_params['db_primary_key'] . " = '" . $this->getVal('user_id') . "'");
+                $db->query("DELETE FROM " . $this->_params['db_login_table'] . " WHERE " . $this->_params['db_primary_key'] . " = '" . $this->getVal('user_id') . "'");
                 // No login: reset password because of account abuse!
                 $this->clearAuth();
@@ -419 +425 @@
 
             // Update the login counter table with this login access. Convert IP to binary.
-            DB::query("
+            $db->query("
                 INSERT INTO " . $this->_params['db_login_table'] . " (
                     " . $this->_params['db_primary_key'] . ",
@@ -433 +439 @@
 
         // Update user table with this login.
-        DB::query("
+        $db->query("
             UPDATE " . $this->_params['db_table'] . " SET
                 last_login_datetime = '" . $this->getVal('login_datetime') . "',
@@ -458 +464 @@
     {
         $app =& App::getInstance();
-    
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
         if (isset($user_id)) {
             // Check the login status of a specific user.
-            $qid = DB::query("
+            $qid = $db->query("
                 SELECT 1 FROM " . $this->_params['db_table'] . "
-                WHERE " . $this->_params['db_primary_key'] . " = '" . DB::escapeString($user_id) . "'
+                WHERE " . $this->_params['db_primary_key'] . " = '" . $db->escapeString($user_id) . "'
                 AND DATE_ADD(last_login_datetime, INTERVAL '" . $this->_params['login_timeout'] . "' SECOND) > NOW()
                 AND DATE_ADD(last_access_datetime, INTERVAL '" . $this->_params['idle_timeout'] . "' SECOND) > NOW()
@@ -510 +517 @@
 
             // Update the DB with the last_access_datetime and increment the seconds_online.
-            DB::query("
+            $db->query("
                 UPDATE " . $this->_params['db_table'] . " SET
                 seconds_online = seconds_online + (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_access_datetime)) + 1,
@@ -516 +523 @@
                 WHERE " . $this->_params['db_primary_key'] . " = '" . $this->getVal('user_id') . "'
             ");
-            if (mysql_affected_rows(DB::getDBH()) > 0) {
+            if (mysql_affected_rows($db->getDBH()) > 0) {
                 // User record still exists in DB. Do this to ensure user was not delete from DB between accesses. Notice "+ 1" in SQL above to ensure record is modified.
                 return true;
@@ -584 +591 @@
     {
         $app =& App::getInstance();
-    
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
         if ($this->getParam('blocking')) {
-            if (strlen(DB::escapeString($reason)) > 255) {
+            if (strlen($db->escapeString($reason)) > 255) {
                 // blocked_reason field is varchar(255).
                 $app->logMsg(sprintf('Blocked reason provided is greater than 255 characters: %s', $reason), LOG_WARNING, __FILE__, __LINE__);
@@ -595 +603 @@
             // Get user_id if specified.
             $user_id = isset($user_id) ? $user_id : $this->getVal('user_id');
-            DB::query("
+            $db->query("
                 UPDATE " . $this->_params['db_table'] . " SET
                 blocked = 'true',
-                blocked_reason = '" . DB::escapeString($reason) . "'
-                WHERE " . $this->_params['db_primary_key'] . " = '" . DB::escapeString($user_id) . "'
+                blocked_reason = '" . $db->escapeString($reason) . "'
+                WHERE " . $this->_params['db_primary_key'] . " = '" . $db->escapeString($user_id) . "'
             ");
         }
@@ -609 +617 @@
     function unblockAccount($user_id=null)
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
-
+    
         if ($this->getParam('blocking')) {
             // Get user_id if specified.
             $user_id = isset($user_id) ? $user_id : $this->getVal('user_id');
-            DB::query("
+            $db->query("
                 UPDATE " . $this->_params['db_table'] . " SET
                 blocked = '',
                 blocked_reason = ''
-                WHERE " . $this->_params['db_primary_key'] . " = '" . DB::escapeString($user_id) . "'
+                WHERE " . $this->_params['db_primary_key'] . " = '" . $db->escapeString($user_id) . "'
             ");
         }
@@ -631 +641 @@
     function usernameExists($username)
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT 1
             FROM " . $this->_params['db_table'] . "
-            WHERE " . $this->_params['db_username_column'] . " = '" . DB::escapeString($username) . "'
+            WHERE " . $this->_params['db_username_column'] . " = '" . $db->escapeString($username) . "'
         ");
         return (mysql_num_rows($qid) > 0);
@@ -649 +661 @@
     function getUsername($user_id)
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT " . $this->_params['db_username_column'] . "
             FROM " . $this->_params['db_table'] . "
-            WHERE " . $this->_params['db_primary_key'] . " = '" . DB::escapeString($user_id) . "'
+            WHERE " . $this->_params['db_primary_key'] . " = '" . $db->escapeString($user_id) . "'
         ");
         if (list($username) = mysql_fetch_row($qid)) {
@@ -726 +740 @@
     {
         $app =& App::getInstance();
-    
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
@@ -733 +748 @@
 
         // Issue the password change query.
-        DB::query("
+        $db->query("
             UPDATE " . $this->_params['db_table'] . "
-            SET userpass = '" . DB::escapeString($this->encryptPassword($password)) . "'
-            WHERE " . $this->_params['db_primary_key'] . " = '" . DB::escapeString($user_id) . "'
+            SET userpass = '" . $db->escapeString($this->encryptPassword($password)) . "'
+            WHERE " . $this->_params['db_primary_key'] . " = '" . $db->escapeString($user_id) . "'
         ");
         
-        if (mysql_affected_rows(DB::getDBH()) != 1) {
+        if (mysql_affected_rows($db->getDBH()) != 1) {
             $app->logMsg(sprintf('setPassword failed to update password for user %s', $user_id), LOG_NOTICE, __FILE__, __LINE__);
         }
@@ -754 +769 @@
     {
         $app =& App::getInstance();
-    
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
@@ -761 +777 @@
 
         // Reset password of a specific user.
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT * FROM " . $this->_params['db_table'] . "
-            WHERE " . $this->_params['db_primary_key'] . " = '" . DB::escapeString($user_id) . "'
+            WHERE " . $this->_params['db_primary_key'] . " = '" . $db->escapeString($user_id) . "'
         ");
         if (!$user_data = mysql_fetch_assoc($qid)) {

branches/2.0singleton/lib/Hierarchy.inc.php

@@ -152 +152 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
     
         if (!isset($child_type) || !isset($child_id)) {
@@ -194 +195 @@
         foreach ($parents as $parent_string) {
             $parent = $this->toArrayID($parent_string);
-            DB::query("
+            $db->query("
                 INSERT INTO node_tbl (
                     parent_type,
@@ -203 +204 @@
                     title
                 ) VALUES (
-                    '" . DB::escapeString($parent['node_type']) . "',
-                    '" . DB::escapeString($parent['node_id']) . "',
-                    '" . DB::escapeString($child_type) . "',
-                    '" . DB::escapeString($child_id) . "',
-                    " . (is_null($relationship_type) ? "NULL" : "'" . DB::escapeString($relationship_type) . "'") . ",
-                    '" . DB::escapeString($title) . "'
+                    '" . $db->escapeString($parent['node_type']) . "',
+                    '" . $db->escapeString($parent['node_id']) . "',
+                    '" . $db->escapeString($child_type) . "',
+                    '" . $db->escapeString($child_id) . "',
+                    " . (is_null($relationship_type) ? "NULL" : "'" . $db->escapeString($relationship_type) . "'") . ",
+                    '" . $db->escapeString($title) . "'
                 )
             ");
@@ -230 +231 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
     
         if (!isset($child_type) || !isset($child_id)) {
@@ -251 +253 @@
         }
 
-        DB::query("
+        $db->query("
             DELETE FROM node_tbl
-            WHERE child_type = '" . DB::escapeString($child_type) . "'
-            AND child_id = '" . DB::escapeString($child_id) . "'
+            WHERE child_type = '" . $db->escapeString($child_type) . "'
+            AND child_id = '" . $db->escapeString($child_id) . "'
         ");
         $app->logMsg(sprintf('deleteNode: Deleted node %s %s.', $child_type, $child_id), LOG_DEBUG, __FILE__, __LINE__);
@@ -279 +281 @@
     {
             $app =& App::getInstance();
-    
+            $db =& DB::getInstance();
+
             if (!isset($child_type) || !isset($child_id)) {
             if ($this->node_init) {
@@ -319 +322 @@
         if (empty($title)) {
             // Select the title of the node we are moving, so we can add it again with the same info.
-            $qid = DB::query("
+            $qid = $db->query("
                 SELECT title FROM node_tbl
-                WHERE child_type = '" . DB::escapeString($child_type) . "'
-                AND child_id = '" . DB::escapeString($child_id) . "'
-                AND relationship_type " . (is_null($relationship_type) ? "IS NULL" : "= '" . DB::escapeString($relationship_type) . "'") . "
+                WHERE child_type = '" . $db->escapeString($child_type) . "'
+                AND child_id = '" . $db->escapeString($child_id) . "'
+                AND relationship_type " . (is_null($relationship_type) ? "IS NULL" : "= '" . $db->escapeString($relationship_type) . "'") . "
             ");
             list($title) = mysql_fetch_row($qid);
@@ -329 +332 @@
 
         // Delete the nodes with the old parents.
-        DB::query("
+        $db->query("
             DELETE FROM node_tbl
-            WHERE child_type = '" . DB::escapeString($child_type) . "'
-            AND child_id = '" . DB::escapeString($child_id) . "'
-            AND relationship_type " . (is_null($relationship_type) ? "IS NULL" : "= '" . DB::escapeString($relationship_type) . "'") . "
+            WHERE child_type = '" . $db->escapeString($child_type) . "'
+            AND child_id = '" . $db->escapeString($child_id) . "'
+            AND relationship_type " . (is_null($relationship_type) ? "IS NULL" : "= '" . $db->escapeString($relationship_type) . "'") . "
         ");
         $app->logMsg(sprintf('moveNode: Deleted node %s %s.', $child_type, $child_id), LOG_DEBUG, __FILE__, __LINE__);
@@ -355 +358 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
     
         if (!isset($child_type) || !isset($child_id)) {
@@ -374 +378 @@
         }
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT parent_type, parent_id
             FROM node_tbl
-            WHERE child_type = '" . DB::escapeString($child_type) . "'
-            AND child_id = '" . DB::escapeString($child_id) . "'
+            WHERE child_type = '" . $db->escapeString($child_type) . "'
+            AND child_id = '" . $db->escapeString($child_id) . "'
             $in_clause
-            " . DB::escapeString($order) . "
+            " . $db->escapeString($order) . "
         ");
 
@@ -405 +409 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
     
         if (!isset($child_type) || !isset($child_id)) {
@@ -416 +421 @@
         }
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT child_type, child_id, title, subnode_quantity
             FROM node_tbl
-            WHERE child_type = '" . DB::escapeString($child_type) . "'
-            AND child_id = '" . DB::escapeString($child_id) . "'
+            WHERE child_type = '" . $db->escapeString($child_type) . "'
+            AND child_id = '" . $db->escapeString($child_id) . "'
         ");
 
@@ -448 +453 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
     
         if (!isset($child_type) || !isset($child_id)) {
@@ -467 +473 @@
         }
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT *
             FROM node_tbl
-            WHERE parent_type = '" . DB::escapeString($child_type) . "'
-            AND parent_id = '" . DB::escapeString($child_id) . "'
+            WHERE parent_type = '" . $db->escapeString($child_type) . "'
+            AND parent_id = '" . $db->escapeString($child_id) . "'
             $in_clause
-            " . DB::escapeString($order) . "
+            " . $db->escapeString($order) . "
         ");
 
@@ -499 +505 @@
     {
         $app =& App::getInstance();
-    
+        $db =& DB::getInstance();
+
         if (!isset($child_type) || !isset($child_id)) {
             if ($this->node_init) {
@@ -518 +525 @@
         }
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT COUNT(*)
             FROM node_tbl
-            WHERE parent_type = '" . DB::escapeString($child_type) . "'
-            AND parent_id = '" . DB::escapeString($child_id) . "'
+            WHERE parent_type = '" . $db->escapeString($child_type) . "'
+            AND parent_id = '" . $db->escapeString($child_id) . "'
             $in_clause
         ");
@@ -599 +606 @@
     function getAllAncestors($child_type, $child_id, $go_linear=false, $_return_flag=true)
     {
+        $db =& DB::getInstance();
+    
         static $output = array();
         static $return_flag;
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT parent_type, parent_id, child_type, child_id, title, subnode_quantity
             FROM node_tbl
-            WHERE child_type = '" . DB::escapeString($child_type) . "'
-            AND child_id = '" . DB::escapeString($child_id) . "'
+            WHERE child_type = '" . $db->escapeString($child_type) . "'
+            AND child_id = '" . $db->escapeString($child_id) . "'
         ");
         while ($row = mysql_fetch_assoc($qid)) {
@@ -652 +661 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
     
         if (!isset($child_type) || !isset($child_id)) {
@@ -664 +674 @@
 
         if (isset($parent_type) && isset($parent_id)) {
-            $qid = DB::query("
+            $qid = $db->query("
                 SELECT 1 FROM node_tbl
-                WHERE parent_type = '" . DB::escapeString($parent_type) . "'
-                AND parent_id = '" . DB::escapeString($parent_id) . "'
-                AND child_type = '" . DB::escapeString($child_type) . "'
-                AND child_id = '" . DB::escapeString($child_id) . "'
-                AND relationship_type " . (is_null($relationship_type) ? "IS NULL" : "= '" . DB::escapeString($relationship_type) . "'") . "
+                WHERE parent_type = '" . $db->escapeString($parent_type) . "'
+                AND parent_id = '" . $db->escapeString($parent_id) . "'
+                AND child_type = '" . $db->escapeString($child_type) . "'
+                AND child_id = '" . $db->escapeString($child_id) . "'
+                AND relationship_type " . (is_null($relationship_type) ? "IS NULL" : "= '" . $db->escapeString($relationship_type) . "'") . "
             ");
         } else {
-            $qid = DB::query("
+            $qid = $db->query("
                 SELECT 1 FROM node_tbl
-                WHERE child_type = '" . DB::escapeString($child_type) . "'
-                AND child_id = '" . DB::escapeString($child_id) . "'
+                WHERE child_type = '" . $db->escapeString($child_type) . "'
+                AND child_id = '" . $db->escapeString($child_id) . "'
             ");
         }
@@ -775 +785 @@
     function rebuildSubnodeQty($type_constraint=null)
     {
+        $db =& DB::getInstance();
+    
         // Reset all the category counters to zero.
-        DB::query("UPDATE node_tbl SET subnode_quantity = 0");
+        $db->query("UPDATE node_tbl SET subnode_quantity = 0");
 
         // Get all the nodes.
-        $qid = DB::query("SELECT DISTINCT child_type, child_id FROM node_tbl");
+        $qid = $db->query("SELECT DISTINCT child_type, child_id FROM node_tbl");
 
         // For each node count the number of children...
@@ -797 +809 @@
     function setSubnodeQtyToParents($child_type, $child_id, $num_children)
     {
-        DB::query("
+        $db =& DB::getInstance();
+    
+        $db->query("
             UPDATE node_tbl
-            SET subnode_quantity = subnode_quantity + '" . DB::escapeString($num_children) . "'
-            WHERE child_type = '" . DB::escapeString($child_type) . "'
-            AND child_id = '" . DB::escapeString($child_id) . "'
+            SET subnode_quantity = subnode_quantity + '" . $db->escapeString($num_children) . "'
+            WHERE child_type = '" . $db->escapeString($child_type) . "'
+            AND child_id = '" . $db->escapeString($child_id) . "'
         ",false);
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT parent_type, parent_id
             FROM node_tbl
-            WHERE child_type = '" . DB::escapeString($child_type) . "'
-            AND child_id = '" . DB::escapeString($child_id) . "'
+            WHERE child_type = '" . $db->escapeString($child_type) . "'
+            AND child_id = '" . $db->escapeString($child_id) . "'
         ",false);
         while ((list($parent_type, $parent_id) = mysql_fetch_row($qid)) && $parent_id > 0) {

branches/2.0singleton/lib/PageNumbers.inc.php

@@ -192 +192 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         if (is_numeric($this->first_item) && is_numeric($this->_per_page)) {
-            return ' LIMIT ' . DB::escapeString($this->first_item) . ', ' . DB::escapeString($this->_per_page) . ' ';
+            return ' LIMIT ' . $db->escapeString($this->first_item) . ', ' . $db->escapeString($this->_per_page) . ' ';
         } else {
             $app->logMsg(sprintf('Could not find SQL to LIMIT by %s %s.', $this->first_item, $this->_per_page), LOG_WARNING, __FILE__, __LINE__);

branches/2.0singleton/lib/RecordLock.inc.php

@@ -72 +72 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         static $_db_tested = false;
@@ -77 +78 @@
         if ($recreate_db || !$_db_tested && $this->getParam('create_table')) {
             if ($recreate_db) {
-                DB::query("DROP TABLE IF EXISTS " . $this->getParam('db_table'));
+                $db->query("DROP TABLE IF EXISTS " . $this->getParam('db_table'));
                 $app->logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_table')), LOG_DEBUG, __FILE__, __LINE__);
             }
-            DB::query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_table') . " (
+            $db->query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_table') . " (
                 lock_id int NOT NULL auto_increment,
                 record_table varchar(255) NOT NULL default '',
@@ -94 +95 @@
             )");
 
-            if (!DB::columnExists($this->getParam('db_table'), array(
+            if (!$db->columnExists($this->getParam('db_table'), array(
                 'lock_id',
                 'record_table',
@@ -154 +155 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         $this->initDB();
@@ -162 +164 @@
         if (is_numeric($record_table_or_lock_id) && !isset($record_key) && !isset($record_val)) {
             // Get lock data by lock_id.
-            $qid = DB::query("
+            $qid = $db->query("
                 SELECT * FROM " . $this->getParam('db_table') . "
-                WHERE lock_id = '" . DB::escapeString($record_table_or_lock_id) . "'
+                WHERE lock_id = '" . $db->escapeString($record_table_or_lock_id) . "'
             ");
         } else {
             // Get lock data by record specs
-            $qid = DB::query("
+            $qid = $db->query("
                 SELECT * FROM " . $this->getParam('db_table') . "
-                WHERE record_table = '" . DB::escapeString($record_table_or_lock_id) . "'
-                AND record_key = '" . DB::escapeString($record_key) . "'
-                AND record_val = '" . DB::escapeString($record_val) . "'
+                WHERE record_table = '" . $db->escapeString($record_table_or_lock_id) . "'
+                AND record_key = '" . $db->escapeString($record_key) . "'
+                AND record_val = '" . $db->escapeString($record_val) . "'
             ");
         }
@@ -204 +206 @@
     function isMine()
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
         if (isset($this->data['lock_id'])) {
-            $qid = DB::query("SELECT * FROM " . $this->getParam('db_table') . " WHERE lock_id = '" . DB::escapeString($this->data['lock_id']) . "'");
+            $qid = $db->query("SELECT * FROM " . $this->getParam('db_table') . " WHERE lock_id = '" . $db->escapeString($this->data['lock_id']) . "'");
             if ($lock = mysql_fetch_assoc($qid)) {
                 return ($lock['set_by_admin_id'] == $this->_auth->getVal('user_id'));
@@ -230 +234 @@
     function set($record_table, $record_key, $record_val, $title='')
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
@@ -236 +242 @@
 
         // Remove previous locks if exist. Is this better than using a REPLACE INTO?
-        DB::query("
+        $db->query("
             DELETE FROM " . $this->getParam('db_table') . "
-            WHERE record_table = '" . DB::escapeString($record_table) . "'
-            AND record_key = '" . DB::escapeString($record_key) . "'
-            AND record_val = '" . DB::escapeString($record_val) . "'
+            WHERE record_table = '" . $db->escapeString($record_table) . "'
+            AND record_key = '" . $db->escapeString($record_key) . "'
+            AND record_val = '" . $db->escapeString($record_val) . "'
         ");
 
         // Set new lock.
-        DB::query("
+        $db->query("
             INSERT INTO " . $this->getParam('db_table') . " (
                 record_table,
@@ -253 +259 @@
                 lock_datetime
             ) VALUES (
-                '" . DB::escapeString($record_table) . "',
-                '" . DB::escapeString($record_key) . "',
-                '" . DB::escapeString($record_val) . "',
-                '" . DB::escapeString($title) . "',
-                '" . DB::escapeString($this->_auth->getVal('user_id')) . "',
+                '" . $db->escapeString($record_table) . "',
+                '" . $db->escapeString($record_key) . "',
+                '" . $db->escapeString($record_val) . "',
+                '" . $db->escapeString($title) . "',
+                '" . $db->escapeString($this->_auth->getVal('user_id')) . "',
                 NOW()
             )
         ");
-        $lock_id = mysql_insert_id(DB::getDBH());
+        $lock_id = mysql_insert_id($db->getDBH());
 
         // Must register this locked record as the current.
@@ -275 +281 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         $this->initDB();
@@ -282 +289 @@
 
         // Delete a specific lock.
-        DB::query("
+        $db->query("
             DELETE FROM " . $this->getParam('db_table') . "
-            WHERE lock_id = '" . DB::escapeString($this->data['lock_id']) . "'
+            WHERE lock_id = '" . $db->escapeString($this->data['lock_id']) . "'
         ");
 
@@ -296 +303 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         $this->initDB();
@@ -304 +312 @@
         if (isset($user_id)) {
             // Delete specific user's locks.
-            DB::query("DELETE FROM " . $this->getParam('db_table') . " WHERE set_by_admin_id = '" . DB::escapeString($user_id) . "'");
+            $db->query("DELETE FROM " . $this->getParam('db_table') . " WHERE set_by_admin_id = '" . $db->escapeString($user_id) . "'");
             $app->logMsg(sprintf('Record locks owned by %s %s have been deleted', $this->_auth->getVal('auth_name'), $this->_auth->getUsername($user_id)), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             // Delete ALL locks.
-            DB::query("DELETE FROM " . $this->getParam('db_table') . "");
+            $db->query("DELETE FROM " . $this->getParam('db_table') . "");
             $app->logMsg(sprintf('All record locks deleted by %s %s', $this->_auth->getVal('auth_name'), $this->_auth->getVal('username')), LOG_DEBUG, __FILE__, __LINE__);
         }
@@ -318 +326 @@
     function _auto_timeout()
     {
+        $db =& DB::getInstance();
+    
         static $_timeout_run = false;
 
@@ -324 +334 @@
         if (!$_timeout_run) {
             // Delete all old locks.
-            DB::query("
+            $db->query("
                 DELETE FROM " . $this->getParam('db_table') . "
                 WHERE DATE_ADD(lock_datetime, INTERVAL '" . $this->getParam('auto_timeout') . "' SECOND) < NOW()

branches/2.0singleton/lib/RecordVersion.inc.php

@@ -79 +79 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         static $_db_tested = false;
@@ -84 +85 @@
         if ($recreate_db || !$_db_tested && $this->getParam('create_table')) {
             if ($recreate_db) {
-                DB::query("DROP TABLE IF EXISTS " . $this->getParam('db_table'));
+                $db->query("DROP TABLE IF EXISTS " . $this->getParam('db_table'));
                 $app->logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_table')), LOG_DEBUG, __FILE__, __LINE__);
             }
-            DB::query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_table') . " (
+            $db->query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_table') . " (
                 version_id int NOT NULL auto_increment,
                 record_table varchar(255) NOT NULL default '',
@@ -103 +104 @@
             )");
 
-            if (!DB::columnExists($this->getParam('db_table'), array(
+            if (!$db->columnExists($this->getParam('db_table'), array(
                 'version_id',
                 'record_table',
@@ -166 +167 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         $this->initDB();
@@ -179 +181 @@
 
         // Save as new version.
-        DB::query("
+        $db->query("
             INSERT INTO " . $this->getParam('db_table') . " (
                 record_table,
@@ -190 +192 @@
                 version_datetime
             ) VALUES (
-                '" . DB::escapeString($record_table) . "',
-                '" . DB::escapeString($record_key) . "',
-                '" . DB::escapeString($record_val) . "',
-                '" . DB::escapeString(gzcompress(serialize($record), 9)) . "',
-                '" . DB::escapeString($title) . "',
-                '" . DB::escapeString($notes) . "',
-                '" . DB::escapeString($this->_auth->getVal('user_id')) . "',
+                '" . $db->escapeString($record_table) . "',
+                '" . $db->escapeString($record_key) . "',
+                '" . $db->escapeString($record_val) . "',
+                '" . $db->escapeString(gzcompress(serialize($record), 9)) . "',
+                '" . $db->escapeString($title) . "',
+                '" . $db->escapeString($notes) . "',
+                '" . $db->escapeString($this->_auth->getVal('user_id')) . "',
                 NOW()
             )
         ");
 
-        return mysql_insert_id(DB::getDBH());
+        return mysql_insert_id($db->getDBH());
     }
 
@@ -214 +216 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         $this->initDB();
 
         // Get version data.
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT * FROM " . $this->getParam('db_table') . "
-            WHERE version_id = '" . DB::escapeString($version_id) . "'
+            WHERE version_id = '" . $db->escapeString($version_id) . "'
         ");
         if (!$record = mysql_fetch_assoc($qid)) {
@@ -230 +233 @@
 
         // Ensure saved db columns match current table schema.
-        if (!DB::columnExists($record['record_table'], array_keys($data), $this->getParam('db_schema_strict'))) {
+        if (!$db->columnExists($record['record_table'], array_keys($data), $this->getParam('db_schema_strict'))) {
             $app->raiseMsg(sprintf(_("Version ID %s%s is not compatible with the current database table."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')')), MSG_ERR, __FILE__, __LINE__);
             $app->logMsg(sprintf(_("Version ID %s%s restoration failed, DB schema does not match for table %s."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')'), $record['record_table']), LOG_ALERT, __FILE__, __LINE__);
@@ -243 +246 @@
         $comma = '';
         foreach ($data as $v) {
-            $replace_values .= is_null($v) ? "$comma\nNULL" : "$comma\n'" . DB::escapeString($v) . "'";
+            $replace_values .= is_null($v) ? "$comma\nNULL" : "$comma\n'" . $db->escapeString($v) . "'";
             $comma = ',';
         }
 
         // Replace current record with specified versioned record.
-        DB::query("
+        $db->query("
             REPLACE INTO " . $record['record_table'] . " (
                 $replace_keys
@@ -273 +276 @@
     function deleteOld($record_table, $record_key, $record_val)
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
         // Get total number of versions for this record.
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT COUNT(*) FROM " . $this->getParam('db_table') . "
-            WHERE record_table = '" . DB::escapeString($record_table) . "'
-            AND record_key = '" . DB::escapeString($record_key) . "'
-            AND record_val = '" . DB::escapeString($record_val) . "'
+            WHERE record_table = '" . $db->escapeString($record_table) . "'
+            AND record_key = '" . $db->escapeString($record_key) . "'
+            AND record_val = '" . $db->escapeString($record_val) . "'
         ");
         list($v_count) = mysql_fetch_row($qid);
@@ -288 +293 @@
                 // To prevent a record bomb, limit max number of versions to max_qty.
                 // First query for oldest records, selecting enough to bring total number down to min_qty.
-                $qid = DB::query("
+                $qid = $db->query("
                     SELECT version_id FROM " . $this->getParam('db_table') . "
-                    WHERE record_table = '" . DB::escapeString($record_table) . "'
-                    AND record_key = '" . DB::escapeString($record_key) . "'
-                    AND record_val = '" . DB::escapeString($record_val) . "'
+                    WHERE record_table = '" . $db->escapeString($record_table) . "'
+                    AND record_key = '" . $db->escapeString($record_key) . "'
+                    AND record_val = '" . $db->escapeString($record_val) . "'
                     ORDER BY version_datetime ASC
                     LIMIT " . ($v_count - $this->getParam('min_qty')) . "
@@ -299 +304 @@
                     $old_versions[] = $old_id;
                 }
-                DB::query("
+                $db->query("
                     DELETE FROM " . $this->getParam('db_table') . "
                     WHERE version_id IN ('" . join("','", $old_versions) . "')
@@ -305 +310 @@
             } else {
                 // Delete versions older than min_days, while still keeping min_qty.
-                $qid = DB::query("
+                $qid = $db->query("
                     SELECT version_id FROM " . $this->getParam('db_table') . "
-                    WHERE record_table = '" . DB::escapeString($record_table) . "'
-                    AND record_key = '" . DB::escapeString($record_key) . "'
-                    AND record_val = '" . DB::escapeString($record_val) . "'
+                    WHERE record_table = '" . $db->escapeString($record_table) . "'
+                    AND record_key = '" . $db->escapeString($record_key) . "'
+                    AND record_val = '" . $db->escapeString($record_val) . "'
                     AND DATE_ADD(version_datetime, INTERVAL '" . $this->getParam('min_days') . "' DAY) < NOW()
                     ORDER BY version_datetime ASC
@@ -318 +323 @@
                 }
                 if (sizeof($old_versions) > 0) {
-                    DB::query("
+                    $db->query("
                         DELETE FROM " . $this->getParam('db_table') . "
                         WHERE version_id IN ('" . join("','", $old_versions) . "')
@@ -338 +343 @@
     function getList($record_table, $record_key, $record_val)
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
         // Get versions of this record.
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT version_id, saved_by_admin_id, version_datetime, version_title
             FROM " . $this->getParam('db_table') . "
-            WHERE record_table = '" . DB::escapeString($record_table) . "'
-            AND record_key = '" . DB::escapeString($record_key) . "'
-            AND record_val = '" . DB::escapeString($record_val) . "'
+            WHERE record_table = '" . $db->escapeString($record_table) . "'
+            AND record_key = '" . $db->escapeString($record_key) . "'
+            AND record_val = '" . $db->escapeString($record_val) . "'
             ORDER BY version_datetime DESC
         ");
@@ -367 +374 @@
     function getVerson($version_id)
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
         // Get version data.
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT * FROM " . $this->getParam('db_table') . "
-            WHERE version_id = '" . DB::escapeString($version_id) . "'
+            WHERE version_id = '" . $db->escapeString($version_id) . "'
         ");
         return mysql_fetch_assoc($qid);
@@ -386 +395 @@
     function getData($version_id)
     {
+        $db =& DB::getInstance();
+    
         $this->initDB();
 
         // Get version data.
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT * FROM " . $this->getParam('db_table') . "
-            WHERE version_id = '" . DB::escapeString($version_id) . "'
+            WHERE version_id = '" . $db->escapeString($version_id) . "'
         ");
         $record = mysql_fetch_assoc($qid);
@@ -410 +421 @@
     function getCurrent($record_table, $record_key, $record_val)
     {
-        $this->initDB();
-
-        $qid = DB::query("
-            SELECT * FROM " . DB::escapeString($record_table) . "
-            WHERE " . DB::escapeString($record_key) . " = '" . DB::escapeString($record_val) . "'
+        $db =& DB::getInstance();
+    
+        $this->initDB();
+
+        $qid = $db->query("
+            SELECT * FROM " . $db->escapeString($record_table) . "
+            WHERE " . $db->escapeString($record_key) . " = '" . $db->escapeString($record_val) . "'
         ");
         if ($record = mysql_fetch_assoc($qid)) {

branches/2.0singleton/lib/SortOrder.inc.php

@@ -129 +129 @@
     {
         $app =& App::getInstance();
+        $db =& DB::getInstance();
 
         if (!isset($this->_columns[strtolower($this->sort_by)])) {
@@ -139 +140 @@
 
         if (!empty($this->_columns[strtolower($this->sort_by)][strtolower($this->order)])) {
-            return sprintf(' ORDER BY %s ', DB::escapeString($this->_columns[strtolower($this->sort_by)][strtolower($this->order)]));
+            return sprintf(' ORDER BY %s ', $db->escapeString($this->_columns[strtolower($this->sort_by)][strtolower($this->order)]));
         } else {
             $app->logMsg(sprintf('Could not find SQL to sort by %s %s.', $this->sort_by, $this->order), LOG_WARNING, __FILE__, __LINE__);

branches/2.0singleton/lib/TemplateGlue.inc.php

@@ -67 +67 @@
 {
     $app =& App::getInstance();
-
-    $qid = DB::query("SHOW COLUMNS FROM " . DB::escapeString($db_table) . " LIKE '" . DB::escapeString($db_col) . "'",false);
+    $db =& DB::getInstance();
+    
+    $qid = $db->query("SHOW COLUMNS FROM " . $db->escapeString($db_table) . " LIKE '" . $db->escapeString($db_col) . "'",false);
 
     $row = mysql_fetch_row($qid);
@@ -296 +297 @@
 function printSelectForm($db_table, $key_column, $val_column, $preselected, $blank=false, $extra_clause='')
 {
+    $db =& DB::getInstance();
+    
     // Sometimes preselected comes as a comma list.
     if (!is_array($preselected)) {
@@ -316 +319 @@
         }
     }
-    $qid = DB::query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
+    $qid = $db->query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
     while ($row = mysql_fetch_assoc($qid)) {
         $selected = in_array($row[$val_column], $preselected) ? ' selected="selected"' : '';
@@ -337 +340 @@
 function printDBCheckboxes($db_table, $key_column, $val_column, $preselected, $columns=1, $extra_clause='', $vert_columns=false)
 {
+    $db =& DB::getInstance();
+    
     // Sometimes preselected comes as a comma list.
     if (!is_array($preselected)) {
@@ -350 +355 @@
     }
 
-    $qid = DB::query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
+    $qid = $db->query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
     while ($row = mysql_fetch_assoc($qid)) {
         $values[] = $row;

branches/2.0singleton/lib/Utilities.inc.php

@@ -476 +476 @@
 function escapedList($in)
 {
+    $db =& DB::getInstance();
+    
     if (is_array($in) && !empty($in)) {
         return "'" . join("', '", array_map(array('DB', 'escapeString'), $in)) . "'";
     } else {
-        return DB::escapeString($in);
+        return $db->escapeString($in);
     }
 }