Changeset 130 for branches/2.0singleton/bin/module_maker/skel

Timestamp:

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

Author:

scdev

Message:

finished updating DB:: to $db->

Location:

branches/2.0singleton/bin/module_maker/skel

Files:

• admin.php (modified) (12 diffs)
• public.php (modified) (6 diffs)

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%