Changeset 948

Timestamp:

09/24/2007 06:07:29 PM (19 years ago)

Author:

mdawaffe

Message:

revert bb_pull_cols stuff since get_cols won't actually change. Fixes #728 #744

Location:

trunk/bb-includes

Files:

• bozo.php (modified) (4 diffs)
• deprecated.php (modified) (1 diff)
• functions.php (modified) (3 diffs)

trunk/bb-includes/bozo.php

@@ -77 +77 @@
         $old = (array) $bbdb->get_col("SELECT topic_id FROM $bbdb->topicmeta WHERE meta_key = 'bozos'");
         $old = array_flip($old);
-        if ( $topics = (array) $bbdb->get_results("SELECT topic_id, poster_id, COUNT(post_id) AS count FROM $bbdb->posts WHERE post_status > 1 GROUP BY topic_id, poster_id") ) :
-            list($topic_ids, $poster_ids, $counts) = bb_pull_cols( $topics, 'topic_id', 'poster_id', 'count' );
+        if ( $topics = (array) $bbdb->get_col("SELECT topic_id, poster_id, COUNT(post_id) FROM $bbdb->posts WHERE post_status > 1 GROUP BY topic_id, poster_id") ) :
             echo "\t\t" . __("Counting bozo posts...") . "<br />\n";
-            $unique_topics = array_unique($topic_ids);
+            $unique_topics = array_unique($topics);
+            $posters = (array) $bbdb->get_col('', 1);
+            $counts = (array) $bbdb->get_col('', 2);
             foreach ($unique_topics as $i):
                 $bozos = array();
-                $indices = array_keys($topic_ids, $i);
+                $indices = array_keys($topics, $i);
                 foreach ( $indices as $index )
-                    $bozos[(int) $poster_ids[$index]] = (int) $counts[$index]; 
+                    $bozos[(int) $posters[$index]] = (int) $counts[$index]; 
                 if ( $bozos ) :
                     bb_update_topicmeta( $i, 'bozos', $bozos );
@@ -91 +92 @@
                 endif;
             endforeach;
-            unset($topics, $topic_ids, $poster_ids, $counts, $unique_topics, $i, $bozos);
+            unset($topics, $t, $i, $counts, $posters, $bozos);
         endif;
         if ( $old ) :
@@ -112 +113 @@
                 $topics_replied = (int) $bbdb->get_var("SELECT COUNT(DISTINCT topic_id) FROM $bbdb->posts WHERE post_status = 0 AND poster_id = '$user'");
                 bb_update_usermeta( $user, $bb_table_prefix. 'topics_replied', $topics_replied );
-                $bozos = (array) $bbdb->get_results("SELECT topic_id, COUNT(post_id) AS count FROM $bbdb->posts WHERE post_status > 1 AND poster_id = '$user' GROUP BY topic_id");
-                if ( $c = count($bozos) ) :
-                    $bozo_topics = array();
+                $bozo_keys = (array) $bbdb->get_col("SELECT topic_id, COUNT(post_id) FROM $bbdb->posts WHERE post_status > 1 AND poster_id = '$user' GROUP BY topic_id");
+                $bozo_values = (array) $bbdb->get_col('', 1);
+                if ( $c = count($bozo_keys) ) :
                     for ( $i=0; $i < $c; $i++ )
-                        $bozo_topics[(int) $bozos[$i]->topic_id] = (int) $bozos[$i]->count;
+                        $bozo_topics[(int) $bozo_keys[$i]] = (int) $bozo_values[$i];
                     bb_update_usermeta( $user, $bozo_mkey, $bozo_topics );
                 else :
@@ -126 +127 @@
                 $bbdb->query("DELETE FROM $bbdb->usermeta WHERE user_id IN ($no_bozos) AND meta_key = '$bozo_mkey'");
             endif;
+            unset($users, $user, $topics_replied, $bozo_keys, $bozo_values, $bozo_topics);
         endif;
         _e("Done counting bozo topics.\n\n");

trunk/bb-includes/deprecated.php

@@ -492 +492 @@
 endif;
 
+// With no extra arguments, converts array of objects into object of arrays
+// With extra arguments corresponding to name of object properties, returns array of arrays:
+//     list($a, $b) = bb_pull_cols( $obj_array, 'a', 'b' );
+function bb_pull_cols( $obj_array ) {
+    $r = new stdClass;
+    foreach ( array_keys($obj_array) as $o )
+        foreach ( get_object_vars( $obj_array[$o] ) as $k => $v )
+            $r->{$k}[] = $v;
+
+    if ( 1 == func_num_args() )
+        return $r;
+
+    $args = func_get_args();
+    $args = array_splice($args, 1);
+
+    $a = array();
+    foreach ( $args as $arg )
+        $a[] = $r->$arg;
+    return $a;
+}
 
 ?>

trunk/bb-includes/functions.php

@@ -347 +347 @@
     if ( !isset( $thread_ids_cache[$topic_id] ) ) {
         $where = apply_filters('get_thread_post_ids_where', 'AND post_status = 0');
-        $thread_ids = (array) $bbdb->get_results("SELECT post_id, poster_id FROM $bbdb->posts WHERE topic_id = $topic_id $where ORDER BY post_time");
-        list($thread_ids_cache[$topic_id]['post'], $thread_ids_cache[$topic_id]['poster']) = bb_pull_cols( $thread_ids, 'post_id', 'poster_id' );
+        $thread_ids_cache[$topic_id]['post'] = (array) $bbdb->get_col("SELECT post_id, poster_id FROM $bbdb->posts WHERE topic_id = $topic_id $where ORDER BY post_time");
+        $thread_ids_cache[$topic_id]['poster'] = (array) $bbdb->get_col('', 1);
     }
     return $thread_ids_cache[$topic_id];
@@ -793 +793 @@
 
     // We care about the tag in this topic and if it's in other topics, but not which other topics
-    $topics = (array) $bbdb->get_results("SELECT topic_id, COUNT(*) AS count FROM $bbdb->tagged WHERE tag_id = '$tag_id' GROUP BY topic_id = '$topic_id'");
-    list($topic_ids, $counts) = bb_pull_topics( $topics, 'topic_id', 'count' );
-
-    if ( !$here = $counts[$topic_ids[$topic_id]] ) // Topic doesn't have this tag
+    $topics = array_flip((array) $bbdb->get_col("SELECT topic_id, COUNT(*) FROM $bbdb->tagged WHERE tag_id = '$tag_id' GROUP BY topic_id = '$topic_id'"));
+    $counts = (array) $bbdb->get_col('', 1);
+    if ( !$here = $counts[$topics[$topic_id]] ) // Topic doesn't have this tag
         return false;
 
@@ -2250 +2249 @@
 }
 
-// With no extra arguments, converts array of objects into object of arrays
-// With extra arguments corresponding to name of object properties, returns array of arrays:
-//     list($a, $b) = bb_pull_cols( $obj_array, 'a', 'b' );
-function bb_pull_cols( $obj_array ) {
-    $r = new stdClass;
-    foreach ( array_keys($obj_array) as $o )
-        foreach ( get_object_vars( $obj_array[$o] ) as $k => $v )
-            $r->{$k}[] = $v;
-
-    if ( 1 == func_num_args() )
-        return $r;
-
-    $args = func_get_args();
-    $args = array_splice($args, 1);
-
-    $a = array();
-    foreach ( $args as $arg )
-        $a[] = $r->$arg;
-    return $a;
-}
-
 ?>