Changeset 130

Timestamp:

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

Author:

scdev

Message:

finished updating DB:: to $db->

Location:

branches/2.0singleton

Files:

• bin/file_importer.php (modified) (3 diffs)
• bin/module_maker/form_template.cli.php (modified) (2 diffs)
• bin/module_maker/list_template.cli.php (modified) (2 diffs)
• bin/module_maker/module.cli.php (modified) (2 diffs)
• bin/module_maker/skel/admin.php (modified) (12 diffs)
• bin/module_maker/skel/public.php (modified) (6 diffs)
• bin/module_maker/sql.cli.php (modified) (9 diffs)
• bin/module_maker/validation.cli.php (modified) (2 diffs)
• docs/coding_standards.txt (modified) (1 diff)
• lib/Auth_SQL.inc.php (modified) (24 diffs)
• lib/Hierarchy.inc.php (modified) (21 diffs)
• lib/PageNumbers.inc.php (modified) (1 diff)
• lib/RecordLock.inc.php (modified) (15 diffs)
• lib/RecordVersion.inc.php (modified) (18 diffs)
• lib/SortOrder.inc.php (modified) (2 diffs)
• lib/TemplateGlue.inc.php (modified) (5 diffs)
• lib/Utilities.inc.php (modified) (1 diff)
• services/admins.php (modified) (15 diffs)
• tests/AppTest.php (modified) (1 diff)
• tests/Auth_SQLTest.php (modified) (6 diffs)
• tests/RecordLockTest.php (modified) (3 diffs)
• tests/RecordVersionTest.php (modified) (3 diffs)

branches/2.0singleton/bin/file_importer.php

@@ -9 +9 @@
 
 $app =& App::getInstance();
+$db =& DB::getInstance();
+    
 
 // Test arguments.
@@ -33 +35 @@
             preg_match('/BALANCE:\s*\$([\.\d]+)/', $file_text, $amt);
             $file_date = date('Y-m-d', strtotime(preg_replace('|[^_]*_|', '', basename($file))));
-//             DB::query("
+//             $db->query("
 //                 INSERT INTO invoice_tbl (
 //                     client_id,
@@ -45 +47 @@
 //                     added_datetime
 //                 ) VALUES (
-//                     '" . DB::escapeString(0) . "',
-//                     '" . DB::escapeString('hosting') . "',
-//                     '" . DB::escapeString($file_date) . "',
-//                     '" . DB::escapeString($amt[1]) . "',
-//                     '" . DB::escapeString('Paid') . "',
-//                     '" . DB::escapeString('') . "',
-//                     '" . DB::escapeString($file_text) . "',
-//                     '" . DB::escapeString($file_date) . "',
+//                     '" . $db->escapeString(0) . "',
+//                     '" . $db->escapeString('hosting') . "',
+//                     '" . $db->escapeString($file_date) . "',
+//                     '" . $db->escapeString($amt[1]) . "',
+//                     '" . $db->escapeString('Paid') . "',
+//                     '" . $db->escapeString('') . "',
+//                     '" . $db->escapeString($file_text) . "',
+//                     '" . $db->escapeString($file_date) . "',
 //                     NOW()
 //                 )

branches/2.0singleton/bin/module_maker/form_template.cli.php

@@ -17 +17 @@
 
 // Get DB tables.
-$qid = DB::query("SHOW TABLES");
+$qid = $db->query("SHOW TABLES");
 while (list($row) = mysql_fetch_row($qid)) {
     $tables[] = $row;
@@ -28 +28 @@
 
 // Get DB table column info.
-$qid = DB::query("DESCRIBE " . DB::escapeString($db_tbl));
+$qid = $db->query("DESCRIBE " . $db->escapeString($db_tbl));
 while ($row = mysql_fetch_row($qid)) {
     $cols[] = $row;

branches/2.0singleton/bin/module_maker/list_template.cli.php

@@ -30 +30 @@
 
 // Get DB tables.
-$qid = DB::query("SHOW TABLES");
+$qid = $db->query("SHOW TABLES");
 while (list($row) = mysql_fetch_row($qid)) {
     $tables[] = $row;
@@ -41 +41 @@
 
 // Get DB table column info.
-$qid = DB::query("DESCRIBE " . DB::escapeString($db_tbl));
+$qid = $db->query("DESCRIBE " . $db->escapeString($db_tbl));
 while ($row = mysql_fetch_row($qid)) {
     $cols[] = $row;

branches/2.0singleton/bin/module_maker/module.cli.php

@@ -129 +129 @@
 
 // Get DB tables.
-$qid = DB::query("SHOW TABLES");
+$qid = $db->query("SHOW TABLES");
 while (list($row) = mysql_fetch_row($qid)) {
     $tables[] = $row;
@@ -141 +141 @@
 // Ensure requested table contains columns.
 // Get DB table column info.
-$qid = DB::query("DESCRIBE " . DB::escapeString($db_tbl));
+$qid = $db->query("DESCRIBE " . $db->escapeString($db_tbl));
 while ($row = mysql_fetch_row($qid)) {
     $cols[] = $row;

branches/2.0singleton/bin/module_maker/skel/admin.php

@@ -146 +146 @@
         if (getFormdata('repeat', false)) {
             // Display edit function with next available ID.
-            $qid = DB::query("SELECT %PRIMARY_KEY% FROM %DB_TBL% WHERE %PRIMARY_KEY% > '" . DB::escapeString(getFormData('%PRIMARY_KEY%')) . "' ORDER BY %PRIMARY_KEY% ASC LIMIT 1");
+            $qid = $db->query("SELECT %PRIMARY_KEY% FROM %DB_TBL% WHERE %PRIMARY_KEY% > '" . $db->escapeString(getFormData('%PRIMARY_KEY%')) . "' ORDER BY %PRIMARY_KEY% ASC LIMIT 1");
             if (list($next_id) = mysql_fetch_row($qid)) {
                 $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . $next_id);
@@ -207 +207 @@
 {
     global $lock;
-
+    $db =& DB::getInstance();
+    
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -214 +215 @@
 
     // Get the information for the form.
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT *
         FROM %DB_TBL%
-        WHERE %PRIMARY_KEY% = '" . DB::escapeString($id) . "'
+        WHERE %PRIMARY_KEY% = '" . $db->escapeString($id) . "'
     ");
     if (!$frm = mysql_fetch_assoc($qid)) {
@@ -246 +247 @@
 {
     global $lock;
-
+    $db =& DB::getInstance();
+    
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -256 +258 @@
 
     // Get the information for this object.
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT <##>
         FROM %DB_TBL%
-        WHERE %PRIMARY_KEY% = '" . DB::escapeString($id) . "'
+        WHERE %PRIMARY_KEY% = '" . $db->escapeString($id) . "'
     ");
     if (! list($name) = mysql_fetch_row($qid)) {
@@ -268 +270 @@
 
     // Delete the record.
-    DB::query("DELETE FROM %DB_TBL% WHERE %PRIMARY_KEY% = '" . DB::escapeString($id) . "'");
+    $db->query("DELETE FROM %DB_TBL% WHERE %PRIMARY_KEY% = '" . $db->escapeString($id) . "'");
 
     $app->raiseMsg(sprintf(_("The %ITEM_TITLE% <strong>%s</strong> has been deleted."), $name), MSG_SUCCESS, __FILE__, __LINE__);
@@ -279 +281 @@
 {
     global $auth;
-
+    $db =& DB::getInstance();
+    
     // Break the cache because we are changing the list data.
     SessionCache::breakCache($_SERVER['PHP_SELF']);
 
 %INSERT%
-    $last_insert_id = mysql_insert_id(DB::getDBH());
+    $last_insert_id = mysql_insert_id($db->getDBH());
 
     // Create version.
@@ -323 +326 @@
     global $page;
     global $so;
-
+    $db =& DB::getInstance();
+    
     $where_clause = '';
 
@@ -336 +340 @@
     if (getFormData('filter_<##>', false)) {
         // Limit by filter.
-        $where_clause .= (empty($where_clause) ? 'WHERE' : 'AND') . " <##> = '" . DB::escapeString(getFormData('filter_<##>')) . "'";
+        $where_clause .= (empty($where_clause) ? 'WHERE' : 'AND') . " <##> = '" . $db->escapeString(getFormData('filter_<##>')) . "'";
     }
 
     // Count the total number of records so we can do something about the page numbers.
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT COUNT(*)
         FROM %DB_TBL%
@@ -381 +385 @@
     } else {
         // If the list is not already cached, query now.
-        $qid = DB::query($sql);
+        $qid = $db->query($sql);
         // Fill an array with the items for this page.
         while ($row = mysql_fetch_assoc($qid)) {
@@ -398 +402 @@
 function updateRank($ranks)
 {
+    $db =& DB::getInstance();
+    
     if (!is_array($ranks)) {
         $app->logMsg('Saving rank failed, data posted is not an array: ' . $ranks, LOG_ERR, __FILE__, __LINE__);
@@ -416 +422 @@
             $unspecified_counter++;
         }
-        DB::query("
+        $db->query("
             UPDATE %DB_TBL% SET
-                rank = '" . DB::escapeString($new_rank) . "'
-            WHERE %PRIMARY_KEY% = '" . DB::escapeString($id) . "'
+                rank = '" . $db->escapeString($new_rank) . "'
+            WHERE %PRIMARY_KEY% = '" . $db->escapeString($id) . "'
         ");
     }

branches/2.0singleton/bin/module_maker/skel/public.php

@@ -34 +34 @@
 
     // Get requested record.
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT * FROM %DB_TBL%
-        WHERE %PRIMARY_KEY% = '" . DB::escapeString(getFormData('%PRIMARY_KEY%')) . "'
+        WHERE %PRIMARY_KEY% = '" . $db->escapeString(getFormData('%PRIMARY_KEY%')) . "'
         AND publish = 'true'
         <##>AND (publish_date <= CURDATE() OR publish_date = '0000-00-00')
@@ -47 +47 @@
 
     // Update the hit counter for this record.
-    DB::query("
+    $db->query("
         UPDATE %DB_TBL%
         SET hit_count = hit_count + 1
-        WHERE %PRIMARY_KEY% = '" . DB::escapeString(getFormData('%PRIMARY_KEY%')) . "'
+        WHERE %PRIMARY_KEY% = '" . $db->escapeString(getFormData('%PRIMARY_KEY%')) . "'
     ");
 
@@ -61 +61 @@
     // Get the DEFAULT list.
     $%NAME_SINGULAR%_list = array();
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT *
         FROM %DB_TBL%
@@ -79 +79 @@
     // Get the FEATURED list.
     $featured_list = array();
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT *
         FROM %DB_TBL%
@@ -92 +92 @@
     // Get the POPULAR list.
     $popular_list = array();
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT *
         FROM %DB_TBL%
@@ -104 +104 @@
     // Get the RECENT list.
     $recent_list = array();
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT *
         FROM %DB_TBL%

branches/2.0singleton/bin/module_maker/sql.cli.php

@@ -30 +30 @@
 
 // Get DB tables.
-$qid = DB::query("SHOW TABLES");
+$qid = $db->query("SHOW TABLES");
 while (list($row) = mysql_fetch_row($qid)) {
     $tables[] = $row;
@@ -46 +46 @@
 
 // Get DB table column info.
-$qid = DB::query("DESCRIBE " . DB::escapeString($db_tbl));
+$qid = $db->query("DESCRIBE " . $db->escapeString($db_tbl));
 while ($row = mysql_fetch_row($qid)) {
     $cols[] = $row;
@@ -76 +76 @@
         } else if ('added_by_user_id' == $field || 'modified_by_user_id' == $field) {
             // Toggle types.
-            $c[$field] = "'\" . DB::escapeString(\$auth->getVal('user_id')) . \"'";
+            $c[$field] = "'\" . \$db->escapeString(\$auth->getVal('user_id')) . \"'";
         } else if ('added_datetime' == $field || 'modified_datetime' == $field) {
             // DB record insertion datetime.
@@ -82 +82 @@
         } else {
             // Default. Just insert data.
-            $c[$field] = "'\" . DB::escapeString(\$frm['$field']) . \"'";
+            $c[$field] = "'\" . \$db->escapeString(\$frm['$field']) . \"'";
         }
     }
@@ -107 +107 @@
 echo <<<E_O_F
     // Insert record data.
-    DB::query("
+    \$db->query("
         INSERT INTO $db_tbl (
             $db_keys
@@ -133 +133 @@
 echo <<<E_O_F
     // Update record data.
-    DB::query("
+    \$db->query("
         UPDATE $db_tbl SET$key_eq_val
-        WHERE $primary_key = '" . DB::escapeString(\$frm['$primary_key']) . "'
+        WHERE $primary_key = '" . \$db->escapeString(\$frm['$primary_key']) . "'
     ");
 E_O_F;
@@ -148 +148 @@
 $delim = 'WHERE';
 if (!empty($primary_key)) {
-    $where_clause = "            $delim $primary_key = '\" . DB::escapeString(\$frm['$primary_key']) . \"'\n";
+    $where_clause = "            $delim $primary_key = '\" . \$db->escapeString(\$frm['$primary_key']) . \"'\n";
     $delim = 'AND';
 }
@@ -155 +155 @@
         continue;
     }
-    $where_clause .= "            $delim $k = '\" . DB::escapeString(\$frm['$k']) . \"'\n";
+    $where_clause .= "            $delim $k = '\" . \$db->escapeString(\$frm['$k']) . \"'\n";
     $delim = 'AND';
 }
 echo <<<E_O_F
         // Delete record data.
-        DB::query("
+        \$db->query("
             DELETE FROM $db_tbl
 $where_clause        ");
@@ -183 +183 @@
 if (!isset($op) || 'search' == $op) {
 $search_skip_columns = array('added_datetime', 'added_by_user_id', 'modified_datetime', 'modified_by_user_id', 'publish', 'featured');
-$search_columns = $db_tbl . '.' . join(" LIKE '%\" . DB::escapeString(\$qry_words[\$i]) . \"%'\n                    OR $db_tbl.", array_diff(array_keys($c), $search_skip_columns));
+$search_columns = $db_tbl . '.' . join(" LIKE '%\" . \$db->escapeString(\$qry_words[\$i]) . \"%'\n                    OR $db_tbl.", array_diff(array_keys($c), $search_skip_columns));
 echo <<<E_O_F
             \$where_clause .= (empty(\$where_clause) ? 'WHERE' : 'AND') . "
                 (
-                    $search_columns LIKE '%" . DB::escapeString(\$qry_words[\$i]) . "%'
+                    $search_columns LIKE '%" . \$db->escapeString(\$qry_words[\$i]) . "%'
                 )
             ";

branches/2.0singleton/bin/module_maker/validation.cli.php

@@ -17 +17 @@
 
 // Get DB tables.
-$qid = DB::query("SHOW TABLES");
+$qid = $db->query("SHOW TABLES");
 while (list($row) = mysql_fetch_row($qid)) {
     $tables[] = $row;
@@ -28 +28 @@
 
 // Get DB table column info.
-$qid = DB::query("DESCRIBE " . DB::escapeString($db_tbl));
+$qid = $db->query("DESCRIBE " . $db->escapeString($db_tbl));
 while ($row = mysql_fetch_row($qid)) {
     $cols[] = $row;

branches/2.0singleton/docs/coding_standards.txt

@@ -214 +214 @@
     function getSetEnumFieldValues()
     {
-        $qid = DB::query("SHOW COLUMNS FROM $db_table LIKE '$db_col'",false);
+        $db =& DB::getInstance();
+        
+        $qid = $db->query("SHOW COLUMNS FROM $db_table LIKE '$db_col'",false);
 
         $row = mysql_fetch_row($qid);

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);
     }
 }

branches/2.0singleton/services/admins.php

@@ -154 +154 @@
         if (getFormdata('repeat', false)) {
             // Display edit function with next available ID.
-            $qid = DB::query("SELECT admin_id FROM admin_tbl WHERE admin_id > '" . DB::escapeString(getFormData('admin_id')) . "' ORDER BY admin_id ASC LIMIT 1");
+            $qid = $db->query("SELECT admin_id FROM admin_tbl WHERE admin_id > '" . $db->escapeString(getFormData('admin_id')) . "' ORDER BY admin_id ASC LIMIT 1");
             if (list($next_id) = mysql_fetch_row($qid)) {
                 $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $next_id);
@@ -259 +259 @@
     global $lock;
     $app =& App::getInstance();
-
+    $db =& DB::getInstance();
+    
     $lock->select('admin_tbl', 'admin_id', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -266 +267 @@
 
     // Get the information for the form.
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT *
         FROM admin_tbl
-        WHERE admin_id = '" . DB::escapeString($id) . "'
+        WHERE admin_id = '" . $db->escapeString($id) . "'
     ");
     if (!$frm = mysql_fetch_assoc($qid)) {
@@ -315 +316 @@
     global $auth, $lock;
     $app =& App::getInstance();
-
+    $db =& DB::getInstance();
+    
     $lock->select('admin_tbl', 'admin_id', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -325 +327 @@
 
     // Get the information for this object.
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT username, user_type from admin_tbl
-        WHERE admin_id = '" . DB::escapeString($id) . "'
+        WHERE admin_id = '" . $db->escapeString($id) . "'
     ");
     if (! list($name, $user_type) = mysql_fetch_row($qid)) {
@@ -336 +338 @@
 
     // Get the information for this object.
-    $qid = DB::query("SELECT COUNT(*) from admin_tbl");
+    $qid = $db->query("SELECT COUNT(*) from admin_tbl");
     list($num_admins) = mysql_fetch_row($qid);
     if ('root' == $user_type && 'root' != $auth->getVal('user_type')) {
@@ -349 +351 @@
     } else {
         // Delete the record.
-        DB::query("DELETE FROM admin_tbl WHERE admin_id = '" . DB::escapeString($id) . "'");
+        $db->query("DELETE FROM admin_tbl WHERE admin_id = '" . $db->escapeString($id) . "'");
         $app->raiseMsg(sprintf(_("The admin <strong>%s</strong> has been deleted."), $name), MSG_SUCCESS, __FILE__, __LINE__);
     }
@@ -361 +363 @@
     global $auth;
     $app =& App::getInstance();
-
+    $db =& DB::getInstance();
+    
     // Break the cache because we are changing the list data.
     SessionCache::breakCache($_SERVER['PHP_SELF']);
 
     // Insert record data.
-    DB::query("
+    $db->query("
         INSERT INTO admin_tbl (
             username,
@@ -376 +379 @@
             added_datetime
         ) VALUES (
-            '" . DB::escapeString($frm['username']) . "',
-            '" . DB::escapeString($frm['first_name']) . "',
-            '" . DB::escapeString($frm['last_name']) . "',
-            '" . DB::escapeString($frm['email']) . "',
-            '" . DB::escapeString($frm['user_type']) . "',
-            '" . DB::escapeString($auth->getVal('user_id')) . "',
+            '" . $db->escapeString($frm['username']) . "',
+            '" . $db->escapeString($frm['first_name']) . "',
+            '" . $db->escapeString($frm['last_name']) . "',
+            '" . $db->escapeString($frm['email']) . "',
+            '" . $db->escapeString($frm['user_type']) . "',
+            '" . $db->escapeString($auth->getVal('user_id')) . "',
             NOW()
         )
     ");
-    $last_insert_id = mysql_insert_id(DB::getDBH());
+    $last_insert_id = mysql_insert_id($db->getDBH());
 
     // Set admin password.
@@ -403 +406 @@
     global $auth, $lock;
     $app =& App::getInstance();
-
+    $db =& DB::getInstance();
+    
     $lock->select('admin_tbl', 'admin_id', $frm['admin_id']);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -419 +423 @@
 
     // Update record data.
-    DB::query("
+    $db->query("
         UPDATE admin_tbl SET
-            username = '" . DB::escapeString($frm['username']) . "',
-            first_name = '" . DB::escapeString($frm['first_name']) . "',
-            last_name = '" . DB::escapeString($frm['last_name']) . "',
-            email = '" . DB::escapeString($frm['email']) . "',
-            user_type = '" . DB::escapeString($frm['user_type']) . "',
-            modified_by_user_id = '" . DB::escapeString($auth->getVal('user_id')) . "',
+            username = '" . $db->escapeString($frm['username']) . "',
+            first_name = '" . $db->escapeString($frm['first_name']) . "',
+            last_name = '" . $db->escapeString($frm['last_name']) . "',
+            email = '" . $db->escapeString($frm['email']) . "',
+            user_type = '" . $db->escapeString($frm['user_type']) . "',
+            modified_by_user_id = '" . $db->escapeString($auth->getVal('user_id')) . "',
             modified_datetime = NOW()
-        WHERE admin_id = '" . DB::escapeString($frm['admin_id']) . "'
+        WHERE admin_id = '" . $db->escapeString($frm['admin_id']) . "'
     ");
 
@@ -445 +449 @@
     global $page;
     global $so;
+    $db =& DB::getInstance();
+    
 
     $where_clause = '';
@@ -454 +460 @@
             $where_clause .= (empty($where_clause) ? 'WHERE' : 'AND') . "
                 (
-                    admin_tbl.username LIKE '%" . DB::escapeString($qry_words[$i]) . "%'
-                    OR admin_tbl.first_name LIKE '%" . DB::escapeString($qry_words[$i]) . "%'
-                    OR admin_tbl.last_name LIKE '%" . DB::escapeString($qry_words[$i]) . "%'
-                    OR admin_tbl.email LIKE '%" . DB::escapeString($qry_words[$i]) . "%'
+                    admin_tbl.username LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
+                    OR admin_tbl.first_name LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
+                    OR admin_tbl.last_name LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
+                    OR admin_tbl.email LIKE '%" . $db->escapeString($qry_words[$i]) . "%'
                 )
             ";
@@ -464 +470 @@
 
     // Count the total number of records so we can do something about the page numbers.
-    $qid = DB::query("
+    $qid = $db->query("
         SELECT COUNT(*)
         FROM admin_tbl
@@ -505 +511 @@
     } else {
         // If the list is not already cached, query now.
-        $qid = DB::query($sql);
+        $qid = $db->query($sql);
         // Fill an array with the items for this page.
         while ($row = mysql_fetch_assoc($qid)) {

branches/2.0singleton/tests/AppTest.php

@@ -71 +71 @@
     function test_dbquery()
     {
-        $qid = DB::query("SELECT 2 + 2");
+        $db =& DB::getInstance();
+    
+        $qid = $db->query("SELECT 2 + 2");
         list($result) = mysql_fetch_row($qid);
         $this->assertEquals('4', $result);

branches/2.0singleton/tests/Auth_SQLTest.php

@@ -21 +21 @@
     function setUp()
     {
-        require dirname(__FILE__) . '/_config.inc.php';
+        $db =& DB::getInstance();
+    
+        require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/Auth_SQL.inc.php';
         $this->Auth_SQL =& new Auth_SQL('testauth');
@@ -36 +38 @@
 
         // Insert test data.
-        DB::query("
+        $db->query("
             INSERT INTO test_user_tbl (
                 username,
@@ -58 +60 @@
     function tearDown()
     {
-        unset($this->Auth_SQL);
-        DB::query("DROP TABLE IF EXISTS test_user_tbl");
-        DB::query("DROP TABLE IF EXISTS test_login_tbl");
+        $db =& DB::getInstance();
+    
+        unset($this->Auth_SQL);
+        $db->query("DROP TABLE IF EXISTS test_user_tbl");
+        $db->query("DROP TABLE IF EXISTS test_login_tbl");
     }
 
@@ -140 +144 @@
     function test_blockaccount()
     {
+        $db =& DB::getInstance();
+    
         $this->Auth_SQL->login('testuser', 'testpass');
         $this->Auth_SQL->blockaccount(null, 'blocktestuser');
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT blocked_reason
             FROM test_user_tbl
@@ -152 +158 @@
     function test_unblockaccount()
     {
-        DB::query("
+        $db =& DB::getInstance();
+    
+        $db->query("
             UPDATE test_user_tbl SET blocked_reason = 'blocktestuser'
         ");
         $this->Auth_SQL->unblockaccount();
 
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT blocked_reason
             FROM test_user_tbl
@@ -191 +199 @@
     function test_setpassword()
     {
+        $db =& DB::getInstance();
+    
         $this->Auth_SQL->setpassword(null, '123');
-        $qid = DB::query("
+        $qid = $db->query("
             SELECT userpass
             FROM test_user_tbl

branches/2.0singleton/tests/RecordLockTest.php

@@ -22 +22 @@
     function setUp()
     {
+        $db =& DB::getInstance();
+    
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/RecordLock.inc.php';
@@ -39 +41 @@
 
         // Insert test data.
-        DB::query("
+        $db->query("
             INSERT INTO test_user_tbl (
                 username,
@@ -67 +69 @@
     function tearDown()
     {
+        $db =& DB::getInstance();
+    
         unset($this->RecordLock);
         unset($this->Auth_SQL);
-        DB::query("DROP TABLE IF EXISTS test_user_tbl");
-        DB::query("DROP TABLE IF EXISTS test_login_tbl");
-        DB::query("DROP TABLE IF EXISTS test_lock_tbl");
+        $db->query("DROP TABLE IF EXISTS test_user_tbl");
+        $db->query("DROP TABLE IF EXISTS test_login_tbl");
+        $db->query("DROP TABLE IF EXISTS test_lock_tbl");
     }
 

branches/2.0singleton/tests/RecordVersionTest.php

@@ -22 +22 @@
     function setUp()
     {
+        $db =& DB::getInstance();
+    
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/RecordVersion.inc.php';
@@ -39 +41 @@
 
         // Insert test data.
-        DB::query("
+        $db->query("
             INSERT INTO test_user_tbl (
                 username,
@@ -68 +70 @@
     function tearDown()
     {
+        $db =& DB::getInstance();
+    
         unset($this->RecordVersion);
         unset($this->Auth_SQL);
-        DB::query("DROP TABLE IF EXISTS test_user_tbl");
-        DB::query("DROP TABLE IF EXISTS test_login_tbl");
-        DB::query("DROP TABLE IF EXISTS test_version_tbl");
+        $db->query("DROP TABLE IF EXISTS test_user_tbl");
+        $db->query("DROP TABLE IF EXISTS test_login_tbl");
+        $db->query("DROP TABLE IF EXISTS test_version_tbl");
     }