--- banner.module	Wed Oct 22 10:26:16 2003
+++ banner.module_new	Thu Mar  4 16:51:04 2004
@@ -56,11 +56,11 @@
 
       // display each banner in its own box
       if (user_access("administer banners") && (arg(2) == "all")) {
-        $result = db_query("SELECT * FROM banner", $user->uid);
+        $result = db_query("SELECT * FROM {banner}", $user->uid);
       }
       else {
         // TODO: allow for banner groups, displaying a group per box
-        $result = db_query("SELECT * FROM banner WHERE uid = '%d'", $user->uid);
+        $result = db_query("SELECT * FROM {banner} WHERE uid = '%d'", $user->uid);
       }
       while ($banner = db_fetch_object($result)) {
         theme("box", "$banner->title", banner_user_edit($banner));
@@ -79,7 +79,7 @@
         theme("box", t("Status"), banner_user_save($edit));
 
         # display each banner in its own box
-        $result = db_query("SELECT * FROM banner WHERE uid = '%d'", $user->uid);
+        $result = db_query("SELECT * FROM {banner} WHERE uid = '%d'", $user->uid);
         while ($banner = db_fetch_object($result)) {
           theme("box", "$banner->title", banner_user_edit($banner));
         }
@@ -96,12 +96,12 @@
   else {
     $id = arg(1);
 
-    $banner = db_fetch_object(db_query("SELECT * FROM banner WHERE id = %d", $id));
+    $banner = db_fetch_object(db_query("SELECT * FROM {banner} WHERE id = %d", $id));
     if ($banner) {
-      db_query("UPDATE banner SET clicks = clicks + 1, day_clicks = day_clicks + 1, week_clicks = week_clicks + 1 WHERE id = %d", $id);
+      db_query("UPDATE {banner} SET clicks = clicks + 1, day_clicks = day_clicks + 1, week_clicks = week_clicks + 1 WHERE id = %d", $id);
       if ($banner->max_clicks > 0 && ($banner->clicks + 1) == $banner->max_clicks) {
           watchdog("special", t("banner: '%banner' %status, reached max of %clicks clicks.", array("%banner" => l("$banner->title", "admin/banner/edit/$banner->id"), "%status" => ($status_array[3]), "%clicks" => "$banner->max_clicks")));
-        db_query("UPDATE banner SET status = 3 WHERE id = %d", $id);
+        db_query("UPDATE {banner} SET status = 3 WHERE id = %d", $id);
         _banner_refresh_cache();
       }
       drupal_goto("$banner->url");
@@ -213,33 +213,33 @@
   if ($edit) {
     $status_array = _banner_status_array();
     // user has updated banner configuration...
-    $result = db_query("SELECT id, status, title, day_max_views, week_max_views, day_notify, week_notify FROM banner WHERE uid = '%d'", $user->uid);
+    $result = db_query("SELECT id, status, title, day_max_views, week_max_views, day_notify, week_notify FROM {banner} WHERE uid = '%d'", $user->uid);
     $string = "";
     while ($banner = db_fetch_object($result)) {
       // update banner status
       if ((isset($edit["status$banner->id"])) && ($edit["status$banner->id"] != $banner->status) && (($banner->status == 1) || ($banner->status == 2) || ($banner->status == 5) || ($banner->status == 6))) {
         watchdog("special", t("banner: '%banner' %status.", array("%banner" => l("$banner->title", "admin/banner/edit/$banner->id"), "%status" => ($status_array[$edit["status$banner->id"]]))));
-        db_query("UPDATE banner SET status = '%d' where id = '%d'", $edit["status$banner->id"], $banner->id);
+        db_query("UPDATE {banner} SET status = '%d' where id = '%d'", $edit["status$banner->id"], $banner->id);
       }
       // update daily notification status
       if (isset($edit["day_notify$banner->id"]) && ($edit["day_notify$banner->id"] != $banner->day_notify)) {
         watchdog("special", t("banner: '%banner' daily notification %status.", array("%banner" => l("$banner->title", "admin/banner/edit/$banner->id"), "%status" => ($edit["day_notify$banner->id"] ? t("enabled") : t("disabled")))));
-        db_query("UPDATE banner SET day_notify = '%d' where id = '%d'", $edit["day_notify$banner->id"], $banner->id);
+        db_query("UPDATE {banner} SET day_notify = '%d' where id = '%d'", $edit["day_notify$banner->id"], $banner->id);
       }
       // update weekly notification status
       if (isset($edit["week_notify$banner->id"]) && ($edit["week_notify$banner->id"] != $banner->week_notify)) {
         watchdog("special", t("banner: '%banner' weekly notification %status.", array("%banner" => l("$banner->title", "admin/banner/edit/$banner->id"), "%status" => ($edit["week_notify$banner->id"] ? t("enabled") : t("disabled")))));
-        db_query("UPDATE banner SET week_notify = '%d' where id = '%d'", $edit["week_notify$banner->id"], $banner->id);
+        db_query("UPDATE {banner} SET week_notify = '%d' where id = '%d'", $edit["week_notify$banner->id"], $banner->id);
       }
       // update day_max_views
       if (isset($edit["dailyviews$banner->id"]) && ($edit["dailyviews$banner->id"] != $banner->day_max_views)) {
         watchdog("special", t("banner: '%banner' day_max_views set to '%day_max_views'.", array("%banner" => l("$banner->title", "admin/banner/edit/$banner->id"), "%day_max_views" => $edit["dailyviews$banner->id"])));
-        db_query("UPDATE banner SET day_max_views = '%d' where id = '%d'", $edit["dailyviews$banner->id"], $banner->id);
+        db_query("UPDATE {banner} SET day_max_views = '%d' where id = '%d'", $edit["dailyviews$banner->id"], $banner->id);
       }
       // update week_max_views
       if (isset($edit["weeklyviews$banner->id"]) && ($edit["weeklyviews$banner->id"] != $banner->week_max_views)) {
         watchdog("special", t("banner: '%banner' week_max_views set to '%week_max_views'.", array("%banner" => l("$banner->title", "admin/banner/edit/$banner->id"), "%week_max_views" => $edit["weeklyviews$banner->id"])));
-        db_query("UPDATE banner SET week_max_views = '%d' where id = '%d'", $edit["weeklyviews$banner->id"], $banner->id);
+        db_query("UPDATE {banner} SET week_max_views = '%d' where id = '%d'", $edit["weeklyviews$banner->id"], $banner->id);
         $string .= t("Banner '%banner' updated successfully.<br />", array("%banner" => "$banner->title"));
       }
     }
@@ -292,7 +292,7 @@
     $values[] = (string)check_query($edit[$field]);
   }
 
-  db_query("INSERT INTO banner (" .implode(", ", $fields). ") VALUES ('" .implode("', '", $values). "')");
+  db_query("INSERT INTO {banner} (" .implode(", ", $fields). ") VALUES ('" .implode("', '", $values). "')");
 
   $string = t("Your new banner has been uploaded.  Please check back later to see if it has been approved.");
 
@@ -310,7 +310,7 @@
     $param[reset_day_counters] = 1;
 
     // add notification emails to the queue
-    $result = db_query("SELECT title, day_views, week_views, views, day_clicks, week_clicks, clicks, uid, failed_notify, id FROM banner WHERE day_notify = 1");
+    $result = db_query("SELECT title, day_views, week_views, views, day_clicks, week_clicks, clicks, uid, failed_notify, id FROM {banner} WHERE day_notify = 1");
     while ($banner = db_fetch_object($result)) {
       $notification['subject'][] = variable_get("site_name", "drupal") . t(": '%banner' banner daily notification", array("%banner" => "$banner->title"));
       $notification['message'][] = variable_get("daily_notify_message_text", _banner_mail_text("daily_notify"));
@@ -324,7 +324,7 @@
     $param[reset_week_counters] = 1;
 
     // add notification emails to the queue
-    $result = db_query("SELECT title, day_views, week_views, views, day_clicks, week_clicks, clicks, uid, id FROM banner WHERE week_notify = 1");
+    $result = db_query("SELECT title, day_views, week_views, views, day_clicks, week_clicks, clicks, uid, id FROM {banner} WHERE week_notify = 1");
     while ($banner = db_fetch_object($result)) {
       $notification['subject'][] = variable_get("site_name", "drupal") . t(": '%banner' banner weekly notification", array("%banner" => "$banner->title"));
       $notification['message'][] = variable_get("weekly_notify_message_text", _banner_mail_text("weekly_notify"));
@@ -337,15 +337,15 @@
     variable_set("banner_timestamp_gc", time());
     $param[refresh_cache] = true;
 
-    $result = db_query("SELECT title, unpublish_date, publish_date, id FROM banner");
+    $result = db_query("SELECT title, unpublish_date, publish_date, id FROM {banner}");
     while ($banner = db_fetch_object($result)) {
       if (($banner->unpublish_date) && ($banner->unpublish_date < time())) {
         watchdog("special", t("banner: '%banner' automatically unpublished.", array("%banner" => l("$banner->title", "admin/banner/edit/$banner->id"))));
-        db_query("UPDATE banner SET unpublish_date = 0, status = 3 WHERE id = ". $banner->id);
+        db_query("UPDATE {banner} SET unpublish_date = 0, status = 3 WHERE id = ". $banner->id);
       }
       else if (($banner->publish_date) && ($banner->publish_date < time())) {
         watchdog("special", t("banner: '%banner' automatically published.", array("%banner" => l("$banner->title", "admin/banner/edit/$banner->id"))));
-        db_query("UPDATE banner SET publish_date = 0, status = 1 WHERE id = ". $banner->id);
+        db_query("UPDATE {banner} SET publish_date = 0, status = 1 WHERE id = ". $banner->id);
       }
     }
   }
@@ -376,16 +376,16 @@
     $failed_notify = variable_get("banner_failed_notify", 5);
     if (($failed_notify) && (($banner->failed_notify + 1) > $failed_notify)) {
       // too many notifications failures, disabling user's notification
-      db_query("UPDATE banner SET daily_notify = 0, weekly_notify = 0 WHERE banner = %d", $banner->id);
+      db_query("UPDATE {banner} SET daily_notify = 0, weekly_notify = 0 WHERE banner = %d", $banner->id);
     }
     else {
       // incrementing notification failures counter
-      db_query("UPDATE banner SET failed_notify = failed_notify + 1 WHERE banner = %d", $banner->id);
+      db_query("UPDATE {banner} SET failed_notify = failed_notify + 1 WHERE banner = %d", $banner->id);
     }
   }
   elseif ($banner->failed_notify) {
     // mail notification succeeded, zero out previous failed attempts counter
-    db_query("UPDATE banner SET failed_notify = 0 WHERE uid = %d", $user->uid);
+    db_query("UPDATE {banner} SET failed_notify = 0 WHERE uid = %d", $user->uid);
   }
 }
 
@@ -404,7 +404,7 @@
         return banner_form();
         break;
       case "edit":
-        return banner_form(db_fetch_array(db_query("SELECT * FROM banner WHERE id = %d", $id)));
+        return banner_form(db_fetch_array(db_query("SELECT * FROM {banner} WHERE id = %d", $id)));
         break;
       case t("Save"):
         $output = banner_save($edit);
@@ -501,7 +501,7 @@
       $update[] = "$field = '" .check_query($edit[$field]). "'";
     }
     
-    db_query("UPDATE banner SET " .implode(", ", $update). " WHERE id = %d", $edit["id"]);
+    db_query("UPDATE {banner} SET " .implode(", ", $update). " WHERE id = %d", $edit["id"]);
 
     $string = t("banner updated.");
   }
@@ -514,7 +514,7 @@
       $values[] = (string)check_query($edit[$field]);
     }
 
-    db_query("INSERT INTO banner (" .implode(", ", $fields). ") VALUES ('" .implode("', '", $values). "')");
+    db_query("INSERT INTO {banner} (" .implode(", ", $fields). ") VALUES ('" .implode("', '", $values). "')");
 
     $string = t("banner added.");
   }
@@ -524,17 +524,17 @@
 }
 
 function banner_delete($edit) {
-  fs_remove(db_result(db_query("SELECT fid FROM banner WHERE id = %d", $edit["id"])));
+  fs_remove(db_result(db_query("SELECT fid FROM {banner} WHERE id = %d", $edit["id"])));
 
   watchdog("special", t("banner: '%banner' deleted.", array("%banner" => l("$edit[title]", "admin/banner/edit/$edit[id]"))));
-  db_query("DELETE FROM banner WHERE id = %d", $edit["id"]);
+  db_query("DELETE FROM {banner} WHERE id = %d", $edit["id"]);
   _banner_refresh_cache();
   return status(t("banner deleted."));
 }
 
 function banner_overview() {
   // show banners with: url, views, clicks, %, status, publish and unpublish date, max views and clicks
-  $result = db_query("SELECT * FROM banner");
+  $result = db_query("SELECT * FROM {banner}");
 
   $headers = array(t("title"), t("url"), t("status"), t("owner"), t("position"), t("views"), t("clicks"), "%", t("pub"), t("unpub"), t("chance"), t("max views"), t("max clicks"), t("link"));
 
@@ -623,7 +623,7 @@
     $struct = unserialize($contents);
     if ($struct) {
       foreach ($struct[1] as $id => $banner) {
-        db_query("UPDATE banner SET views = %d, day_views = %d, week_views = %d WHERE id = %d", $banner->views, $banner->day_views, $banner->week_views, $id);
+        db_query("UPDATE {banner} SET views = %d, day_views = %d, week_views = %d WHERE id = %d", $banner->views, $banner->day_views, $banner->week_views, $id);
       }
     }
 
@@ -646,7 +646,7 @@
 }
 
 function _banner_get_struct() {
-  $result = db_query("SELECT * FROM banner WHERE status = 1");
+  $result = db_query("SELECT * FROM {banner} WHERE status = 1");
   while ($banner = db_fetch_object($result)) {
     for ($n=0; $n<$banner->chance; $n++) {
       $ballot[$banner->position][] = $banner->id;
@@ -693,14 +693,14 @@
 
 function _banner_reset_counters( $param = array() ) {
   if ($param[reset_day_counters]) {
-    db_query("UPDATE banner SET day_views = 0, day_clicks = 0");
+    db_query("UPDATE {banner} SET day_views = 0, day_clicks = 0");
     // TODO: Watchdog entry
-    db_query("UPDATE banner SET status = 1 where status = 5");
+    db_query("UPDATE {banner} SET status = 1 where status = 5");
   }
   if ($param[reset_week_counters]) {
-    db_query("UPDATE banner SET week_views = 0, week_clicks = 0");
+    db_query("UPDATE {banner} SET week_views = 0, week_clicks = 0");
     // TODO: Watchdog entry
-    db_query("UPDATE banner SET status = 1 where status = 6");
+    db_query("UPDATE {banner} SET status = 1 where status = 6");
   }
 }
 
@@ -723,7 +723,7 @@
 
 function banner_fs($fid) {
   // am I using this file?
-  $banner = db_fetch_object(db_query("SELECT * FROM banner WHERE fid = '%s'", $fid));
+  $banner = db_fetch_object(db_query("SELECT * FROM {banner} WHERE fid = '%s'", $fid));
 
   if ($banner) {
     return "banner ". l($banner->title, "admin/banner/edit/". $banner->id);