Changeset 558

Timestamp:

11/25/2003 12:46:52 AM (20 years ago)

Author:

mikelittle

Message:

Missing querycount

Location:

trunk

Files:

• b2-include/b2functions.php (modified) (5 diffs)
• b2-include/b2template.functions.php (modified) (12 diffs)
• b2comments.php (modified) (1 diff)
• b2comments.post.php (modified) (3 diffs)
• b2commentspopup.php (modified) (1 diff)
• b2login.php (modified) (2 diffs)
• b2mail.php (modified) (1 diff)
• b2register.php (modified) (1 diff)
• b2trackback.php (modified) (2 diffs)
• blog.header.php (modified) (1 diff)
• wp-admin/b2team.php (modified) (2 diffs)
• wp-admin/b2verifauth.php (modified) (2 diffs)
• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/import-b2.php (modified) (3 diffs)
• wp-admin/import-blogger.php (modified) (3 diffs)
• wp-admin/import-greymatter.php (modified) (3 diffs)
• wp-admin/import-textpattern.php (modified) (2 diffs)
• wp-admin/linkcategories.php (modified) (2 diffs)
• wp-admin/linkmanager.php (modified) (7 diffs)
• wp-admin/links.import.php (modified) (1 diff)
• wp-admin/optionhandler.php (modified) (2 diffs)
• wp-admin/wp-edit.showposts.php (modified) (1 diff)
• wp-commentsrss2.php (modified) (2 diffs)
• wp-rdf.php (modified) (1 diff)
• wp-rss.php (modified) (1 diff)
• wp-rss2.php (modified) (1 diff)

trunk/b2-include/b2functions.php

@@ -479 +479 @@
 // determine the post ID it represents.
 function url_to_postid($url = '') {
-    global $wpdb, $tableposts, $siteurl;
+    global $wpdb, $querycount, $tableposts, $siteurl;
 
     // Take a link like 'http://example.com/blog/something'
@@ -537 +537 @@
 
     // Run the query to get the post ID:
-    return intval($wpdb->get_var("SELECT ID FROM $tableposts WHERE 1 = 1 " . $where));
+    ++$querycount;
+    return intval($wpdb->get_var("SELECT ID FROM $tableposts WHERE 1 = 1 " . $where));
 }
 
@@ -682 +683 @@
         $default = $postdata["Category"];
     }
+    ++$querycount;
     foreach($results as $post) {
         echo "<option value=\"".$post->cat_ID."\"";
@@ -1440 +1442 @@
  */
 function wp_get_comment_status($comment_id) {
-    global $wpdb, $tablecomments;
+    global $wpdb, $querycount, $tablecomments;
     
     $result = $wpdb->get_var("SELECT comment_approved FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
+    ++$querycount;
     if ($result == NULL) {
-    return "deleted";
+        return "deleted";
     } else if ($result == "1") {
-    return "approved";
+        return "approved";
     } else if ($result == "0") {
-    return "unapproved";
+        return "unapproved";
     } else {
-    return false;
+        return false;
     }
 }
 
 function wp_notify_postauthor($comment_id, $comment_type) {
-    global $wpdb, $tablecomments, $tableposts, $tableusers;
+    global $wpdb, $querycount, $tablecomments, $tableposts, $tableusers;
     global $querystring_start, $querystring_equal, $querystring_separator;
     global $blogfilename, $blogname, $siteurl;
     
     $comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
+    ++$querycount;
     $post = $wpdb->get_row("SELECT * FROM $tableposts WHERE ID='$comment->comment_post_ID' LIMIT 1");
+    ++$querycount;
     $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE ID='$post->post_author' LIMIT 1");
+    ++$querycount;
 
     if ('' == $user->user_email) return false; // If there's no email to send the comment to
@@ -1512 +1518 @@
  */
 function wp_notify_moderator($comment_id) {
-    global $wpdb, $tablecomments, $tableposts, $tableusers;
+    global $wpdb, $querycount, $tablecomments, $tableposts, $tableusers;
     global $querystring_start, $querystring_equal, $querystring_separator;
     global $blogfilename, $blogname, $siteurl;
     
     $comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
+    ++$querycount;
     $post = $wpdb->get_row("SELECT * FROM $tableposts WHERE ID='$comment->comment_post_ID' LIMIT 1");
+    ++$querycount;
     $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE ID='$post->post_author' LIMIT 1");
+    ++$querycount;
 
     $comment_author_domain = gethostbyaddr($comment->comment_author_IP);
     $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $tablecomments WHERE comment_approved = '0'");
+    ++$querycount;
 
     $notify_message  = "A new comment on the post #$comment->comment_post_ID \"".stripslashes($post->post_title)."\" is waiting for your approval\r\n\r\n";

trunk/b2-include/b2template.functions.php

@@ -233 +233 @@
 
 function get_calendar($daylength = 1) {
-    global $wpdb, $HTTP_GET_VARS, $m, $monthnum, $year, $timedifference, $month, $weekday, $tableposts, $posts;
+    global $wpdb, $HTTP_GET_VARS, $m, $monthnum, $year, $timedifference, $month, $weekday, $tableposts, $posts, $querycount;
 
     // Quick check. If we have no posts at all, abort!
     if (!$posts) {
         $gotsome = $wpdb->get_var("SELECT ID from $tableposts WHERE post_status = 'publish' AND post_category > 0 ORDER BY post_date DESC LIMIT 1");
+        ++$querycount;
         if (!$gotsome)
             return;
@@ -254 +255 @@
         $d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's
         $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('${thisyear}0101', INTERVAL $d DAY) ), '%m')");
+        ++$querycount;
     } elseif (!empty($m)) {
         $calendar = substr($m, 0, 6);
@@ -276 +278 @@
                               ORDER BY post_date DESC
                               LIMIT 1");
+    ++$querycount;
     $next = $wpdb->get_row("SELECT  DISTINCT MONTH( post_date ) AS month, YEAR( post_date ) AS year
             FROM $tableposts
@@ -283 +286 @@
                               ORDER  BY post_date ASC
                               LIMIT 1");
+    ++$querycount;
 
     echo '<table id="wp-calendar">
@@ -330 +334 @@
             AND post_status = 'publish'
             AND post_date < '" . date("Y-m-d H:i:s", (time() + ($time_difference * 3600)))."'", ARRAY_N);
-
+    ++$querycount;
     if ($dayswithposts) {
         foreach ($dayswithposts as $daywith) {
@@ -356 +360 @@
                                          ."AND post_status = 'publish'"
                                         );
+    ++$querycount;
     if ($ak_post_titles) {
         foreach ($ak_post_titles as $ak_post_title) {
@@ -406 +411 @@
 function get_permalink($id=false) {
     global $post, $wpdb, $tableposts;
-    global $siteurl, $blogfilename, $querystring_start, $querystring_equal;
+    global $siteurl, $blogfilename, $querystring_start, $querystring_equal, $querycount;
+
     $rewritecode = array(
         '%year%',
@@ -428 +434 @@
     } else { // if an ID is given
         $idpost = $wpdb->get_row("SELECT post_date, post_name FROM $tableposts WHERE ID = $id");
+        ++$querycount;
         if ('' != get_settings('permalink_structure')) {
             $unixtime = strtotime($idpost->post_date);
@@ -1351 +1358 @@
 
     $categories = $wpdb->get_results($query);
-
+    ++$querycount;
     if (!$categories) {
         if ($list) {
@@ -1360 +1367 @@
         return;
     }
-    ++$querycount;
     if (intval($optionall) == 1) {
         $all = apply_filters('list_cats', $all);
@@ -1406 +1412 @@
 function comments_number($zero='No Comments', $one='1 Comment', $more='% Comments', $include_unapproved = false) {
     global $id, $comment, $tablecomments, $querycount, $wpdb;
-    $query = "SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = '$id'";
+    $query = "SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id";
     if (false == $include_unapproved) {
         $query .= " AND comment_approved = '1'";
     }
     $number = $wpdb->get_var($query);
+    ++$querycount;
     if ($number == 0) {
         $blah = $zero;
@@ -1439 +1446 @@
 
 function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
-    global $id, $b2commentspopupfile, $b2commentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
+    global $id, $b2commentspopupfile, $b2commentsjavascript, $post, $wpdb, $querycount, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
     global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
     $number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1'");
+    ++$querycount;
     if (0 == $number && 'closed' == $post->comment_status) {
         echo $none;

trunk/b2comments.php

@@ -16 +16 @@
 
         $comments = $wpdb->get_results("SELECT * FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1' ORDER BY comment_date");
+        ++$querycount;
 ?>
 

trunk/b2comments.post.php

@@ -40 +40 @@
 
 $commentstatus = $wpdb->get_var("SELECT comment_status FROM $tableposts WHERE ID = $comment_post_ID");
-
+++$querycount;
 if ('closed' == $commentstatus)
     die('Sorry, comments are closed for this item.');
@@ -69 +69 @@
 /* Flood-protection */
 $lasttime = $wpdb->get_var("SELECT comment_date FROM $tablecomments WHERE comment_author_IP = '$user_ip' ORDER BY comment_date DESC LIMIT 1");
+++$querycount;
 $ok = true;
 if (!empty($lasttime)) {
@@ -101 +102 @@
 
     $comment_ID = $wpdb->get_var('SELECT last_insert_id()');
+    ++$querycount;
 
     if (($moderation_notify) && (!$approved)) {

trunk/b2commentspopup.php

@@ -31 +31 @@
 // this line is WordPress' motor, do not delete it.
 $comments = $wpdb->get_results("SELECT * FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1' ORDER BY comment_date");
+++$querycount;
 $commentstatus = $wpdb->get_row("SELECT comment_status, post_password FROM $tableposts WHERE ID = $id");
+++$querycount;
 if (!empty($commentstatus->post_password) && $HTTP_COOKIE_VARS['wp-postpass_'.$cookiehash] != $commentstatus->post_password) {  // and it doesn't match the cookie
     echo(get_the_password_form());

trunk/b2login.php

@@ -67 +67 @@
         $redirect_to = $HTTP_POST_VARS["redirect_to"];
     }
-    
+
     function login() {
         global $wpdb, $log, $pwd, $error, $user_ID;
@@ -87 +87 @@
             $password = substr($password, 4, strlen($password));
             $query = "SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' AND MD5(user_pass) = '$password'";
+            ++$querycount;
         } else {
             $pass_is_md5 = 0;
             $query = "SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' AND user_pass = '$password'";
+            ++$querycount;
         }
         $login = $wpdb->get_row($query);

trunk/b2mail.php

@@ -205 +205 @@
         $sql = "SELECT ID, user_level FROM $tableusers WHERE user_login='$user_login' AND user_pass='$user_pass' ORDER BY ID DESC LIMIT 1";
         $result = $wpdb->get_row($sql);
+        ++$querycount;
 
         if (!$result) {

trunk/b2register.php

@@ -81 +81 @@
     /* checking the login isn't already used by another user */
     $result = $wpdb->get_results("SELECT user_login FROM $tableusers WHERE user_login = '$user_login'");
-    if (count($result) >= 1) {
+    ++$querycount;
+    if (count($result) >= 1) {
         die ('<strong>ERROR</strong>: This login is already registered, please choose another one.');
     }

trunk/b2trackback.php

@@ -32 +32 @@
 
     $pingstatus = $wpdb->get_var("SELECT ping_status FROM $tableposts WHERE ID = $tb_id");
+    ++$querycount;
 
     if ('closed' == $pingstatus)
@@ -87 +88 @@
     } else {
         $comment_ID = $wpdb->get_var('SELECT last_insert_id()');
+        ++$querycount;
         if ($comments_notify)
             wp_notify_postauthor($comment_ID, 'trackback');

trunk/blog.header.php

@@ -305 +305 @@
 // echo $request;
 $posts = $wpdb->get_results($request);
-
+++$querycount;
 if (1 == count($posts)) {
     if ($p || $name) {

trunk/wp-admin/b2team.php

@@ -104 +104 @@
     <?php
     $users = $wpdb->get_results("SELECT ID FROM $tableusers WHERE user_level>0 ORDER BY ID");
+    ++$querycount;
     foreach ($users as $user) {
         $user_data = get_userdata($user->ID);
@@ -139 +140 @@
 <?php
     $users = $wpdb->get_results("SELECT * FROM $tableusers WHERE user_level=0 ORDER BY ID");
+    ++$querycount;
     if ($users) {
 ?>

trunk/wp-admin/b2verifauth.php

@@ -6 +6 @@
 function veriflog() {
     global $HTTP_COOKIE_VARS,$cookiehash;
-    global $tableusers, $wpdb;
+    global $tableusers, $wpdb, $querycount;
 
     if (!empty($HTTP_COOKIE_VARS["wordpressuser_".$cookiehash])) {
@@ -21 +21 @@
 
     $login = $wpdb->get_row("SELECT user_login, user_pass FROM $tableusers WHERE user_login = '$user_login'");
+    ++$querycount;
 
     if (!$login) {

trunk/wp-admin/edit-comments.php

@@ -137 +137 @@
                                     LIMIT $commentstart, $commentend"
                                   );
+    ++$querycount;
 
 // need to account for offet, etc.

trunk/wp-admin/edit.php

@@ -269 +269 @@
 
                     $comments = $wpdb->get_results("SELECT * FROM $tablecomments WHERE comment_post_ID = $id ORDER BY comment_date");
+                    ++$querycount;
                     if ($comments) {
                     ?>

trunk/wp-admin/import-b2.php

@@ -140 +140 @@
     $query = "SELECT link_updated FROM $tablelinks LIMIT 1";
     $q = @mysql_query($query);
+    ++$querycount;
     if ($q != false) {
         if ($row = mysql_fetch_object($q)) {
@@ -151 +152 @@
     echo "<p>Looking for column link_rel...</p>\n";
     $query = "SELECT link_rel FROM $tablelinks LIMIT 1";
+    ++$querycount;
     $q = @mysql_query($query);
     if ($q != false) {
@@ -167 +169 @@
     echo "<p>Looking for category 1...</p>\n";
     $sql = "SELECT * FROM $tablelinkcategories WHERE cat_id=1 ";
+    ++$querycount;
     $result = mysql_query($sql) or print ("Can't query '$tablelinkcategories'.<br />" . $sql . "<br />" . mysql_error());
     if ($result != false) {

trunk/wp-admin/import-blogger.php

@@ -70 +70 @@
             // we'll check the author is registered already
             $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE user_login = '$post_author'");
+            ++$querycount;
             if (!$user) { // seems s/he's not, so let's register
                 $user_ip = '127.0.0.1';
@@ -112 +113 @@
 
             $post_author_ID = $wpdb->get_var("SELECT ID FROM $tableusers WHERE user_login = '$post_author'");
+            ++$querycount;
 
             $post_date = explode(' ', $post_date);
@@ -135 +137 @@
             // Quick-n-dirty check for dups:
             $dupcheck = $wpdb->get_results("SELECT ID,post_date,post_title FROM $tableposts WHERE post_date='$post_date' AND post_title='$post_title' LIMIT 1",ARRAY_A);
+            ++$querycount;
             if ($dupcheck[0]['ID']) {
                 print "<br />\nSkipping duplicate post, ID = '" . $dupcheck[0]['ID'] . "'<br />\n";

trunk/wp-admin/import-greymatter.php

@@ -140 +140 @@
             $sql = "SELECT * FROM $tableusers WHERE user_login = '$post_author'";
             $result = mysql_query($sql);
+            ++$querycount;
             if (!mysql_num_rows($result)) { // if deleted from GM, we register the author as a level 0 user in b2
                 $user_ip="127.0.0.1";
@@ -160 +161 @@
 
             $sql = "SELECT * FROM $tableusers WHERE user_login = '$post_author'";
+            ++$querycount;
             $result = mysql_query($sql);
             $myrow = mysql_fetch_array($result);
@@ -196 +198 @@
             
             $sql2 = "SELECT * FROM $tableposts WHERE 1=1 ORDER BY ID DESC LIMIT 1";
+            ++$querycount;
             $result2 = mysql_query($sql2);
             $myrow2 = mysql_fetch_array($result2);

trunk/wp-admin/import-textpattern.php

@@ -81 +81 @@
 // For now we're going to give everything the same author and same category
 $author = $wpdb->get_var("SELECT ID FROM $tableusers WHERE user_level = 10 LIMIT 1");
+++$querycount;
 $category = $wpdb->get_var("SELECT cat_ID FROM $tablecategories LIMIT 1");
+++$querycount;
 
 $posts = mysql_query('SELECT * FROM textpattern', $connection);
+++$querycount;
 
 while ($post = mysql_fetch_array($posts)) {
@@ -109 +112 @@
     // Get wordpress post id
     $wp_post_ID = $wpdb->get_var("SELECT ID FROM $tableposts ORDER BY ID DESC LIMIT 1");
+    ++$querycount;
     
     // Now let's insert comments if there are any for the TP post
     $tp_id = $post['ID'];
     $comments = mysql_query("SELECT * FROM txp_Discuss WHERE parentid = $tp_id");
+    ++$querycount;
     if ($comments) {
         while($comment = mysql_fetch_object($comments)) {

trunk/wp-admin/linkcategories.php

@@ -135 +135 @@
          . " show_rating, show_updated, sort_order, sort_desc, text_before_link, text_after_link, "
          . " text_after_all, list_limit FROM $tablelinkcategories WHERE cat_id=$cat_id");
+    ++$querycount;
     if ($row) {
         if ($row->list_limit == -1) {
@@ -325 +326 @@
          . " show_rating, show_updated, sort_order, sort_desc, text_before_link, text_after_link, "
          . " text_after_all, list_limit FROM $tablelinkcategories ORDER BY cat_id");
-    foreach ($results as $row) {
-        if ($row->list_limit == -1) {
-            $row->list_limit = 'none';
-        }
-        $style = ($i % 2) ? ' class="alternate"' : '';
+++$querycount;
+foreach ($results as $row) {
+    if ($row->list_limit == -1) {
+        $row->list_limit = 'none';
+    }
+    $style = ($i % 2) ? ' class="alternate"' : '';
 ?>
               <tr valign="middle" <?php echo $style ?>>

trunk/wp-admin/linkmanager.php

@@ -34 +34 @@
 
 function category_dropdown($fieldname, $selected = 0) {
-    global $wpdb, $tablelinkcategories;
+    global $wpdb, $querycount, $tablelinkcategories;
 
     $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $tablelinkcategories ORDER BY cat_id");
+    ++$querycount;
     echo '        <select name="'.$fieldname.'" size="1">'."\n";
     foreach ($results as $row) {
@@ -110 +111 @@
     $all_links = join(',', $linkcheck);
     $results = $wpdb->get_results("SELECT link_id, link_owner, user_level FROM $tablelinks LEFT JOIN $tableusers ON link_owner = ID WHERE link_id in ($all_links)");
+    ++$querycount;
     foreach ($results as $row) {
       if (!get_settings('links_use_adminlevels') || ($user_level >= $row->user_level)) { // ok to proceed
@@ -139 +141 @@
     $all_links = join(',', $linkcheck);
     $results = $wpdb->get_results("SELECT link_id, link_visible FROM $tablelinks WHERE link_id in ($all_links)");
+    ++$querycount;
     foreach ($results as $row) {
         if ($row->link_visible == 'Y') { // ok to proceed
@@ -305 +308 @@
       " FROM $tablelinks " .
       " WHERE link_id = $link_id");
+    ++$querycount;
 
     if ($row) {
@@ -499 +503 @@
 <?php
     $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $tablelinkcategories ORDER BY cat_id");
+    ++$querycount;
     echo "        <select name=\"cat_id\">\n";
     echo "          <option value=\"All\"";
@@ -561 +566 @@
             LEFT JOIN $tablelinkcategories ON $tablelinks.link_category = $tablelinkcategories.cat_id
             LEFT JOIN $tableusers ON $tableusers.ID = $tablelinks.link_owner ";
+    ++$querycount;
 
     if (isset($cat_id) && ($cat_id != 'All')) {
@@ -631 +637 @@
 <?php
     $results = $wpdb->get_results("SELECT ID, user_login FROM $tableusers WHERE user_level > 0 ORDER BY ID");
+    ++$querycount;
     echo "          <select name=\"newowner\" size=\"1\">\n";
     foreach ($results as $row) {

trunk/wp-admin/links.import.php

@@ -74 +74 @@
 <?php
     $categories = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $tablelinkcategories ORDER BY cat_id");
+    ++$querycount;
     foreach ($categories as $category) {
 ?>

trunk/wp-admin/optionhandler.php

@@ -51 +51 @@
                                          ."WHERE option_id = $option_result->option_id "
                                          ."ORDER BY optionvalue_seq");
+            ++$querycount;
             if ($select) {
                 foreach($select as $option) {
@@ -68 +69 @@
             // first get the sql to run
             $sql = $wpdb->get_var("SELECT optionvalue FROM $tableoptionvalues WHERE option_id = $option_result->option_id");
+            ++$querycount;
             if (!$sql) {
                 return $option_result->option_name . $editable;

trunk/wp-admin/wp-edit.showposts.php

@@ -272 +272 @@
 
                     $comments = $wpdb->get_results("SELECT * FROM $tablecomments WHERE comment_post_ID = $id ORDER BY comment_date");
+                    ++$querycount;
                     if ($comments) {
                     ?>

trunk/wp-commentsrss2.php

@@ -60 +60 @@
                                             ORDER BY comment_date 
                                             LIMIT $posts_per_rss");
+            ++$querycount;
         }
         else { // if no post id passed in, we'll just ue the last 10 comments.
@@ -79 +80 @@
                                             ORDER BY comment_date DESC
                                             LIMIT $posts_per_rss");
+            ++$querycount;
         }
     // this line is WordPress' motor, do not delete it.

trunk/wp-rdf.php

@@ -12 +12 @@
 
 $maxdate = $wpdb->get_var($sql);
-
+++$querycount;
 $unixtime = strtotime($maxdate);
 

trunk/wp-rss.php

@@ -12 +12 @@
 
 $maxdate = $wpdb->get_var($sql);
-
+++$querycount;
 $unixtime = strtotime($maxdate);
 

trunk/wp-rss2.php

@@ -12 +12 @@
 
 $maxdate = $wpdb->get_var($sql);
+++$querycount;
 
 $unixtime = strtotime($maxdate);