Changeset 3933

Timestamp:

01/26/2011 03:28:35 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Introduce Forums tab to user account area, to show topics the user has started, topics the user has replied to, and favorite forum topics. This includes additional template files in bp-default to support new functionality, and edits to the forum_sql filter functions.

Location:

trunk

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-forums/bp-forums-loader.php (modified) (3 diffs)
• bp-forums/bp-forums-screens.php (modified) (2 diffs)
• bp-forums/bp-forums-template.php (modified) (3 diffs)
• bp-groups/bp-groups-activity.php (modified) (1 diff)
• bp-groups/bp-groups-filters.php (modified) (2 diffs)
• bp-themes/bp-default/forums/index.php (modified) (1 diff)
• bp-themes/bp-default/members/single/forums (added)
• bp-themes/bp-default/members/single/forums.php (added)
• bp-themes/bp-default/members/single/forums/topics.php (added)
• bp-themes/bp-default/members/single/home.php (modified) (1 diff)

trunk/bp-core/bp-core-template.php

@@ -988 +988 @@
 }
 
+function bp_is_user_forums() {
+    global $bp;
+
+    if ( bp_is_current_component( 'forums' ) )
+        return true;
+
+    return false;
+}
+
 function bp_is_user_groups() {
     global $bp;

trunk/bp-forums/bp-forums-loader.php

@@ -125 +125 @@
         // Additional menu if friends is active
         $sub_nav[] = array(
-            'name'            => __( 'Topics Started', 'buddypress' ),
+            'name'            => __( 'Started', 'buddypress' ),
             'slug'            => 'topics',
             'parent_url'      => $forums_link,
@@ -136 +136 @@
         // Additional menu if friends is active
         $sub_nav[] = array(
-            'name'            => __( 'Replies', 'buddypress' ),
+            'name'            => __( 'Replied To', 'buddypress' ),
             'slug'            => 'replies',
             'parent_url'      => $forums_link,
             'parent_slug'     => $this->slug,
-            'screen_function' => 'bp_forums_screen_topics',
+            'screen_function' => 'bp_forums_screen_replies',
             'position'        => 40,
             'item_css_id'     => 'forums-friends'
@@ -147 +147 @@
         // Favorite forums items
         $sub_nav[] = array(
-            'name'            => __( 'Favorite Topics', 'buddypress' ),
+            'name'            => __( 'Favorites', 'buddypress' ),
             'slug'            => 'favorites',
             'parent_url'      => $forums_link,

trunk/bp-forums/bp-forums-screens.php

@@ -4 +4 @@
     global $bp;
 
-    if ( bp_is_current_component( 'forums' ) ) {
+    if ( bp_is_groups_component() && !bp_current_action() && !bp_current_item() ) {
         if ( bp_forum_directory_is_disabled() || !bp_is_active( 'groups' ) )
             return false;
@@ -61 +61 @@
 add_action( 'bp_screens', 'bp_forums_directory_forums_setup' );
 
+function bp_forums_screen_topics() {
+    global $bp;
+
+    do_action( 'bp_forums_screen_topics' );
+
+    bp_core_load_template( apply_filters( 'bp_forums_screen_topics', 'members/single/home' ) );
+}
+
+function bp_forums_screen_replies() {
+    global $bp;
+
+    do_action( 'bp_forums_screen_replies' );
+
+    bp_core_load_template( apply_filters( 'bp_forums_screen_replies', 'members/single/home' ) );
+}
+
+function bp_forums_screen_favorites() {
+    global $bp;
+
+    do_action( 'bp_forums_screen_favorites' );
+
+    bp_core_load_template( apply_filters( 'bp_forums_screen_favorites', 'members/single/home' ) );
+}
+
 ?>

trunk/bp-forums/bp-forums-template.php

@@ -102 +102 @@
             $this->total_topic_count = 0;
         } else {
-            if ( $forum_id ) {
+            if ( !empty( $forum_id ) ) {
                 $topic_count = bp_forums_get_forum( $forum_id );
                 $topic_count = (int)$topic_count->topics;
-            } else if ( function_exists( 'groups_total_public_forum_topic_count' ) ) {
+            } else if ( !empty( $bp->groups->current_group ) ) {
                 $topic_count = (int)groups_total_public_forum_topic_count( $type );
             } else {
@@ -217 +217 @@
      * pass their parameters directly to the loop.
      */
-    $type = 'newest';
-    $user_id = 0;
-    $forum_id = false;
+    $type         = 'newest';
+    $user_id      = 0;
+    $forum_id     = false;
     $search_terms = false;
-    $no_stickies = 'all';
+    $no_stickies  = 'all';
 
     // User filtering
@@ -732 +732 @@
         global $bp, $forum_template;
 
-        $start_num = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
-        $from_num = bp_core_number_format( $start_num );
-        $to_num = bp_core_number_format( ( $start_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $start_num + ( $forum_template->pag_num - 1 ) );
-        $total = bp_core_number_format( $forum_template->total_topic_count );
-
+        $start_num  = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
+        $from_num   = bp_core_number_format( $start_num );
+        $to_num     = bp_core_number_format( ( $start_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $start_num + ( $forum_template->pag_num - 1 ) );
+        $total      = bp_core_number_format( $forum_template->total_topic_count );
         $pag_filter = false;
+
         if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) )
             $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );

trunk/bp-groups/bp-groups-activity.php

@@ -33 +33 @@
 
     // If the group is not public, hide the activity sitewide.
-    if ( 'public' == $bp->groups->current_group->status )
+    if ( isset( $bp->groups->current_group->status ) && 'public' == $bp->groups->current_group->status )
         $hide_sitewide = false;
     else

trunk/bp-groups/bp-groups-filters.php

@@ -66 +66 @@
 
     // Only filter the forum SQL on group pages or on the forums directory
-    if ( bp_is_forums_component() ||
-            ( !empty( $bp->groups->current_group ) &&
-                ( 'public' == $bp->groups->current_group->status ) ||
-                    ( !empty( $bp->groups->current_group->is_member ) ) ) ) {
-
-        add_filter( 'get_topics_fields',     'groups_add_forum_fields_sql' );
-        add_filter( 'get_topics_index_hint', 'groups_add_forum_tables_sql' );
-        add_filter( 'get_topics_where',      'groups_add_forum_where_sql'  );
-    }
+    add_filter( 'get_topics_fields',     'groups_add_forum_fields_sql' );
+    add_filter( 'get_topics_index_hint', 'groups_add_forum_tables_sql' );
+    add_filter( 'get_topics_where',      'groups_add_forum_where_sql'  );
 }
 add_filter( 'bbpress_init', 'groups_add_forum_privacy_sql' );
@@ -90 +84 @@
     global $bp;
 
-    if ( !is_super_admin() || ( bp_is_single_item() && !bp_group_is_member( $bp->groups->current_group->id ) ) )
-        $must_be_public = "AND g.status = 'public'";
-    else
-        $must_be_public = '';
+    // Set this for groups
+    $parts['groups'] = "(gm.meta_key = 'forum_id' AND gm.meta_value = t.forum_id)";
 
-    $bp->groups->filter_sql = $must_be_public . ' AND ' . $sql;
+    // Restrict to public...
+    $parts['private'] = "g.status = 'public'";
 
-    return "(gm.meta_key = 'forum_id' AND gm.meta_value = t.forum_id) {$must_be_public} AND {$sql}";
+    /**
+     * ...but do some checks to possibly remove public restriction.
+     *
+     * Decide if private are visible
+     */
+    // Are we in our own profile?
+    if ( bp_is_my_profile() )
+        unset( $parts['private'] );
+
+    // Are we a super admin?
+    elseif ( is_super_admin() )
+        unset( $parts['private'] );
+
+    // Are we a member of this group
+    elseif ( bp_is_single_item() && bp_group_is_member( $bp->groups->current_group->id ) )
+        unset( $parts['private'] );
+
+    // Check the SQL filter that was passed
+    if ( !empty( $sql ) )
+        $parts['passed'] = $sql;
+
+    // Assemble Voltron
+    $parts_string = implode( ' AND ', $parts );
+
+    // Set it to the global filter
+    $bp->groups->filter_sql = $parts_string;
+
+    // Return the global filter
+    return $bp->groups->filter_sql;
 }
 

trunk/bp-themes/bp-default/forums/index.php

@@ -40 +40 @@
                         <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                            <li id="forums-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ); ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+                            <li id="forums-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() . '/topics' ); ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
 
                         <?php endif; ?>

trunk/bp-themes/bp-default/members/single/home.php

@@ -57 +57 @@
                     locate_template( array( 'members/single/profile.php'  ), true );
 
+                elseif ( bp_is_user_forums() ) :
+                    locate_template( array( 'members/single/forums.php'  ), true );
+
                 // If nothing sticks, load a generic template
                 else :