Changeset 2194 for trunk/bp-forums.php

Timestamp:

12/17/2009 12:24:10 PM (17 years ago)

Author:

apeatling

Message:

Fixing forum filtering and added "My Topics" tab to the forums directory.

File:

• trunk/bp-forums.php (modified) (4 diffs)

trunk/bp-forums.php

@@ -128 +128 @@
 }
 
-function bp_forums_get_forum_topicpost_count( $forum_id ) {
-        global $wpdb, $bbdb;
-
-        do_action( 'bbpress_init' );
-
-        /* Need to find a bbPress function that does this */
-        return $wpdb->get_results( $wpdb->prepare( "SELECT topics, posts from {$bbdb->forums} WHERE forum_id = %d", $forum_id ) );
-}
-
 /* Topic Functions */
 
@@ -147 +138 @@
                 'type' => 'newest',
                 'forum_id' => false,
+                'user_id' => false,
                 'page' => 1,
                 'per_page' => 15,
@@ -159 +151 @@
         switch ( $type ) {
                 case 'newest':
-                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'per_page' => $per_page, 'page' => $page, 'number' => $per_page, 'exclude' => $exclude, 'topic_title' => $filter, 'sticky' => $show_stickies ), 'get_latest_topics' );
-                        $topics = $query->results;
-                break;
-
-                case 'popular':
-                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_posts', 'topic_title' => $filter, 'sticky' => $show_stickies ) );
+                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'topic_author_id' => $user_id, 'per_page' => $per_page, 'page' => $page, 'number' => $per_page, 'exclude' => $exclude, 'topic_title' => $filter, 'sticky' => $show_stickies ), 'get_latest_topics' );
                         $topics =& $query->results;
                 break;
 
-                case 'unreplied':
-                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'post_count' => 1, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_time', 'topic_title' => $filter, 'sticky' => $show_stickies ) );
+                case 'popular':
+                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'topic_author_id' => $user_id, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_posts', 'topic_title' => $filter, 'sticky' => $show_stickies ) );
                         $topics =& $query->results;
                 break;
 
-                case 'personal':
-                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'per_page' => $per_page, 'page' => $page, 'topic_author_id' => $bp->loggedin_user->id, 'order_by' => 't.topic_time', 'topic_title' => $filter, 'sticky' => $show_stickies ), 'get_recent_user_threads' );
+                case 'unreplied':
+                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'topic_author_id' => $user_id, 'post_count' => 1, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_time', 'topic_title' => $filter, 'sticky' => $show_stickies ) );
                         $topics =& $query->results;
                 break;
 
                 case 'tag':
-                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'tag' => $filter, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_time', 'sticky' => $show_stickies ) );
+                        $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'topic_author_id' => $user_id, 'tag' => $filter, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_time', 'sticky' => $show_stickies ) );
                         $topics =& $query->results;
                 break;
@@ -319 +306 @@
 }
 
+function bp_forums_total_topic_count() {
+        do_action( 'bbpress_init' );
+
+        $query = new BB_Query( 'topic', array( 'page' => 1, 'per_page' => false, 'count' => true ) );
+        return $query->count;
+}
+
+function bp_forums_total_topic_count_for_user( $user_id = false ) {
+        global $bp;
+
+        do_action( 'bbpress_init' );
+
+        if ( !$user_id )
+                $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+
+        $query = new BB_Query( 'topic', array( 'topic_author_id' => $user_id, 'page' => 1, 'per_page' => false, 'count' => true ) );
+        return $query->count;
+}
+
 /* Post Functions */