Changeset 1621

Timestamp:

07/21/2009 09:45:28 PM (16 years ago)

Author:

apeatling

Message:

Completely re-wrote the forums component. No longer needs an external setup of bbPress. bbPress is included as an external that can be set up with one click for new installations. Existing bbPress installs, or BuddyPress upgrades can use the "use existing install" option and provide the location of their bb-config.php file.

Added complete forum management for group mods and admins (sticky/delete/close/edit) and edit/delete for group members on their own posts. Make sure you update your theme with the new template files in the /groups/ directory to get access to these features.

The "use existing install" option needs testing before it can become reliable. Expect changes.

Location:

trunk

Files:

• bp-activity.php (modified) (3 diffs)
• bp-activity/bp-activity-classes.php (modified) (3 diffs)
• bp-blogs.php (modified) (2 diffs)
• bp-core.php (modified) (1 diff)
• bp-core/css/structure.css (modified) (1 diff)
• bp-forums (modified) (1 prop)
• bp-forums.php (modified) (3 diffs)
• bp-forums/bbpress-plugins (deleted)
• bp-forums/bp-forums-admin.php (modified) (2 diffs)
• bp-forums/bp-forums-bbpress-live.php (deleted)
• bp-forums/bp-forums-bbpress.php (added)
• bp-forums/bp-forums-classes.php (added)
• bp-forums/bp-forums-cssjs.php (added)
• bp-forums/bp-forums-filters.php (modified) (3 diffs)
• bp-forums/bp-forums-templatetags.php (modified) (19 diffs)
• bp-forums/images (added)
• bp-forums/images/closed.png (added)
• bp-forums/installation-readme.txt (modified) (1 diff)
• bp-groups.php (modified) (20 diffs)
• bp-groups/bp-groups-cssjs.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (19 diffs)
• bp-status/bp-status-filters.php (modified) (2 diffs)
• bp-wire.php (modified) (3 diffs)

trunk/bp-activity.php

@@ -189 +189 @@
     extract( $r, EXTR_SKIP );
     
+    /* Insert the "time-since" placeholder */
+    if ( $content ) {
+        if ( !$pos = strpos( $content, '<blockquote' ) ) {
+            if ( !$pos = strpos( $content, '<div' ) ) {
+                if ( !$pos = strpos( $content, '<ul' ) ) {
+                    $content .= ' <span class="time-since">%s</span>';
+                }
+            }
+        }
+        
+        if ( $pos ) {
+            $before = substr( $content, 0, $pos );
+            $after = substr( $content, $pos, strlen( $content ) );
+            
+            $content = $before . ' <span class="time-since">%s</span>' . $after;
+        }
+    }
+
     $activity = new BP_Activity_Activity;
     $activity->user_id = $user_id;
@@ -208 +226 @@
 }
 
-function bp_activity_update( $args = '' ) {
-    global $bp, $wpdb;
-    
-    extract( $args );
-    
+/* There are multiple ways to delete activity items, depending on the information you have at the time. */
+
+function bp_activity_delete_by_item_id( $args = '' ) {
+    global $bp;
+
     $defaults = array(
-        'user_id' => $bp->loggedin_user->id,
-        'content' => false,
+        'item_id' => false,
         'component_name' => false,
         'component_action' => false,
-        'item_id' => false,
-        'secondary_item_id' => false,
-        'recorded_time' => time(),
-        'hide_sitewide' => false
+        'user_id' => false, // optional
+        'secondary_item_id' => false // optional
     );
 
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
-        
-    $activity = new BP_Activity_Activity( $user_id, $component_name, $component_action, $item_id, $secondary_item_id );
-    $activity->user_id = $user_id;
-    $activity->content = $content;
-    $activity->primary_link = $primary_link;
-    $activity->component_name = $component_name;
-    $activity->component_action = $component_action;
-    $activity->item_id = $item_id;
-    $activity->secondary_item_id = $secondary_item_id;
-    $activity->date_recorded = $recorded_time;
-    $activity->hide_sitewide = $hide_sitewide;
-        
-    if ( !$activity->save() )
-        return false;
-
-    do_action( 'bp_activity_update', $args );
-    
-    return true;
-}
-
-/* There are multiple ways to delete activity items, depending on the information you have at the time. */
-
-function bp_activity_delete_by_item_id( $user_id, $component_name, $component_action, $item_id, $secondary_item_id = false ) {  
-    if ( !BP_Activity_Activity::delete_by_item_id( $user_id, $component_name, $component_action, $item_id, $secondary_item_id ) )
-        return false;
-
-    do_action( 'bp_activity_delete_by_item_id', $user_id, $component_name, $component_action, $item_id, $secondary_item_id );
+
+    if ( !BP_Activity_Activity::delete_by_item_id( $item_id, $component_name, $component_action, $user_id, $secondary_item_id ) )
+        return false;
+
+    do_action( 'bp_activity_delete_by_item_id', $item_id, $component_name, $component_action, $user_id, $secondary_item_id );
 
     return true;
@@ -345 +338 @@
 /* DEPRECATED - use bp_activity_delete_by_item_id() */
 function bp_activity_delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id ) { 
-    if ( !bp_activity_delete_by_item_id( $user_id, $component_name, $component_action, $item_id, $secondary_item_id ) )
+    if ( !bp_activity_delete_by_item_id( array( 'item_id' => $item_id, 'component_name' => $component_name, 'component_action' => $component_action, 'user_id' => $user_id, 'secondary_item_id' => $secondary_item_id ) ) )
         return false;
         

trunk/bp-activity/bp-activity-classes.php

@@ -15 +15 @@
         global $bp;
         
-        if ( $args ) {
+        if ( $args && is_array($args) ) {
             extract( $args );
             
@@ -106 +106 @@
     /* Static Functions */ 
 
-    function delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id = false ) {
-        global $wpdb, $bp;
-                
-        if ( !$user_id )
-            return false;
+    function delete( $item_id, $component_name, $component_action, $user_id = false, $secondary_item_id = false ) {
+        global $wpdb, $bp;
 
         if ( $secondary_item_id )
@@ -116 +113 @@
         
         if ( $component_action )
-            $component_action_sql = $wpdb->prepare( "AND component_action = %s AND user_id = %d", $component_action, $user_id );
-                
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND item_id = %d {$secondary_sql} AND component_name = %s {$cached_component_action_sql}", $user_id, $item_id, $component_name ) );
-    }
-    
-    function delete_by_item_id( $user_id, $component_name, $component_action, $item_id, $secondary_item_id = false ) {
+            $component_action_sql = $wpdb->prepare( "AND component_action = %s", $component_action );
+        
+        if ( $user_id )
+            $user_sql = $wpdb->prepare( "AND user_id = %d", $user_id );
+
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %d {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
+    }
+    
+    function delete_by_item_id( $item_id, $component_name, $component_action, $user_id = false, $secondary_item_id = false ) {
         return BP_Activity_Activity::delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id );
     }

trunk/bp-blogs.php

@@ -408 +408 @@
             $recorded_post->blog_id = $blog_id;
             $recorded_post->post_id = $post_id;
-            $recorded_post->date_created = strtotime( $post->post_date );
+            $recorded_post->date_created = strtotime( $post->post_date_gmt );
             
             $recorded_post_id = $recorded_post->save();
             
             bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
-            bp_blogs_record_activity( array( 'item_id' => $recorded_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post', 'is_private' => bp_blogs_is_blog_hidden( $recorded_post->blog_id ), 'user_id' => $recorded_post->user_id, 'recorded_time' => strtotime( $post->post_date ) ) );
+            bp_blogs_record_activity( array( 'item_id' => $recorded_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post', 'is_private' => bp_blogs_is_blog_hidden( $recorded_post->blog_id ), 'user_id' => $recorded_post->user_id, 'recorded_time' => strtotime( $post->post_date_gmt ) ) );
         }
     } else {
@@ -439 +439 @@
         /* Delete and re-add the activity stream item to reflect potential content changes. */
         bp_blogs_delete_activity( array( 'item_id' => $recorded_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post', 'user_id' => $recorded_post->user_id ) );
-        bp_blogs_record_activity( array( 'item_id' => $recorded_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post', 'is_private' => bp_blogs_is_blog_hidden( $recorded_post->blog_id ), 'user_id' => $recorded_post->user_id, 'recorded_time' => strtotime( $post->post_date ) ) );
+        bp_blogs_record_activity( array( 'item_id' => $recorded_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post', 'is_private' => bp_blogs_is_blog_hidden( $recorded_post->blog_id ), 'user_id' => $recorded_post->user_id, 'recorded_time' => strtotime( $post->post_date_gmt ) ) );
     }
 

trunk/bp-core.php

@@ -1540 +1540 @@
     global $wpdb;
     ?>
-<!-- Generated in <?php timer_stop(1); ?> seconds. -->
+<!-- Generated in <?php timer_stop(1); ?> seconds. <?php echo $wpdb->num_queries; ?> queries.-->
     <?php
 }

trunk/bp-core/css/structure.css

@@ -85 +85 @@
             }
 
-            div.info-group h4 a {
+            div.info-group h4 span {
                 position: absolute;
                 top: 0.31em;

trunk/bp-forums.php

@@ -5 +5 @@
     define ( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
 
-require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress-live.php' );
+require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress.php' );
+require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-classes.php' );
 require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-templatetags.php' );
 require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-filters.php' );
-
-if ( is_admin() )
-    require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-admin.php' );
+require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-cssjs.php' );
 
 function bp_forums_setup() {
-    global $bp, $bbpress_live;
-
-    if ( '' == get_usermeta( $bp->loggedin_user->id, 'bb_capabilities' ) )
-        bp_forums_make_user_active_member( $bp->loggedin_user->id );
-    
-    $bp->version_numbers->forums = BP_FORUMS_VERSION;
+    global $bp;
+    
+    $bp->forums->image_base = BP_PLUGIN_URL . '/bp-forums/images';
+    $bp->forums->bbconfig = get_site_option( 'bb-config-location' );
 }
 add_action( 'plugins_loaded', 'bp_forums_setup', 5 );
@@ -24 +21 @@
 
 function bp_forums_is_installed_correctly() {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    if ( !$bbpress_live->fetch->endpoint )
-        return false;
-    
-    return true;
-}
-
-function bp_forums_get_forum( $parent = 0, $depth = 0 ) {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    if ( $forum = $bbpress_live->get_forums( $parent, $depth ) ) {
-        do_action( 'bp_forums_get_forum', $forum );
-        return $forum;
-    }
+    global $bp;
+    
+    if ( file_exists( $bp->forums->bbconfig ) )
+        return true;
     
     return false;
 }
 
-function bp_forums_get_topics( $forum_id = 0, $number = 0, $page = 1 ) {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    if ( $topics = $bbpress_live->get_topics( $forum_id, $number, $page ) ) {
-        do_action( 'bp_forums_get_topics', $topics );
-        return $topics;
-    }
-    
+function bp_forums_add_admin_menu() {
+    global $bp;
+    
+    if ( !is_site_admin() )
+        return false;
+
+    require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-admin.php' );
+    
+    /* Add the administration tab under the "Site Admin" tab for site administrators */
+    add_submenu_page( 'bp-core.php', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 2, __FILE__, "bp_forums_bbpress_admin" );
+}
+add_action( 'admin_menu', 'bp_forums_add_admin_menu' );
+
+function bp_forums_get_forum( $forum_id ) {
+    do_action( 'bbpress_init' );
+    return bb_get_forum( $forum_id );
+}
+
+function bp_forums_get_forum_topics( $args = '' ) {
+    do_action( 'bbpress_init' );
+    
+    $defaults = array( 
+        'forum_id' => false, 
+        'page' => 1, 
+        'per_page' => 15, 
+        'exclude' => false
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    return get_latest_topics( array( 'forum' => $forum_id, 'page' => $page_num, 'number' => $per_page, 'exclude' => $exclude ) );
+}
+
+function bp_forums_get_topic_details( $topic_id ) {
+    do_action( 'bbpress_init' );
+    return get_topic( $topic_id );
+}
+
+function bp_forums_get_topic_id_from_slug( $topic_slug ) {
+    do_action( 'bbpress_init' );    
+    return bb_get_id_from_slug( 'topic', $topic_slug );
+}
+
+function bp_forums_get_topic_posts( $args = '' ) {
+    do_action( 'bbpress_init' );
+    
+    $defaults = array( 
+        'topic_id' => false, 
+        'page' => 1,
+        'per_page' => 15,
+        'order' => 'ASC'
+    );
+
+    $args = wp_parse_args( $args, $defaults );
+
+    $query = new BB_Query( 'post', $args, 'get_thread' );
+    return $query->results;
+}
+
+function bp_forums_get_post( $post_id ) {
+    do_action( 'bbpress_init' );
+    return bb_get_post( $post_id );
+}
+
+function bp_forums_new_forum( $args = '' ) {
+    do_action( 'bbpress_init' );
+    
+    $defaults = array( 
+        'forum_name' => '', 
+        'forum_desc' => '', 
+        'forum_parent_id' => BP_FORUMS_PARENT_FORUM_ID, 
+        'forum_order' => false, 
+        'forum_is_category' => 0
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    return bb_new_forum( array( 'forum_name' => stripslashes( $forum_name ), 'forum_desc' => stripslashes( $forum_desc ), 'forum_parent' => $forum_parent_id, 'forum_order' => $forum_order, 'forum_is_category' => $forum_is_category ) );
+}
+
+function bp_forums_new_topic( $args = '' ) {
+    global $bp;
+    
+    do_action( 'bbpress_init' );
+    
+    $defaults = array(
+        'topic_title' => '',
+        'topic_slug' => '',
+        'topic_poster' => $bp->loggedin_user->id, // accepts ids
+        'topic_poster_name' => $bp->loggedin_user->fullname, // accept names
+        'topic_last_poster' => $bp->loggedin_user->id, // accepts ids
+        'topic_last_poster_name' => $bp->loggedin_user->fullname, // accept names
+        'topic_start_time' => bb_current_time( 'mysql' ),
+        'topic_time' => bb_current_time( 'mysql' ),
+        'topic_open' => 1,
+        'forum_id' => 0 // accepts ids or slugs
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    if ( empty( $topic_slug ) )
+        $topic_slug = sanitize_title( $topic_title );
+        
+    if ( !$topic_id = bb_insert_topic( array( 'topic_title' => stripslashes( $topic_title ), 'topic_slug' => $topic_slug, 'topic_poster' => $topic_poster, 'topic_poster_name' => $topic_poster_name, 'topic_last_poster' => $topic_last_poster, 'topic_last_poster_name' => $topic_last_poster_name, 'topic_start_time' => $topic_start_time, 'topic_time' => $topic_time, 'topic_open' => $topic_open, 'forum_id' => (int)$forum_id ) ) )
+        return false;
+    
+    /* Now insert the first post. */
+    if ( !bp_forums_insert_post( array( 'topic_id' => $topic_id, 'post_text' => $topic_text, 'post_time' => $topic_time, 'poster_id' => $topic_poster ) ) )
+        return false;
+    
+    return $topic_id;
+}
+
+function bp_forums_update_topic( $args = '' ) {
+    global $bp;
+    
+    do_action( 'bbpress_init' );
+    
+    $defaults = array(
+        'topic_id' => false,
+        'topic_title' => '',
+        'topic_text' => ''
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    if ( !$topic_id = bb_insert_topic( array( 'topic_id' => $topic_id, 'topic_title' => stripslashes( $topic_title ) ) ) )
+        return false;
+    
+    if ( !$post = bb_get_first_post( $topic_id ) )
+        return false;
+
+    /* Update the first post */
+    if ( !$post = bb_insert_post( array( 'post_id' => $post->post_id, 'topic_id' => $topic_id, 'post_text' => $topic_text, 'post_time' => $post->post_time, 'poster_id' => $post->poster_id, 'poster_ip' => $post->poster_ip, 'post_status' => $post->post_status, 'post_position' => $post->post_position ) ) )
+        return false;
+    
+    return bp_forums_get_topic_details( $topic_id );
+}
+
+function bp_forums_sticky_topic( $args = '' ) {
+    global $bp;
+    
+    do_action( 'bbpress_init' );
+    
+    $defaults = array(
+        'topic_id' => false,
+        'mode' => 'stick' // stick/unstick
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    if ( 'stick' == $mode )
+        return bb_stick_topic( $topic_id );
+    else if ( 'unstick' == $mode )
+        return bb_unstick_topic( $topic_id );
+
     return false;
 }
 
-function bp_forums_get_topic_details( $topic_id = 0 ) {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    if ( $topic = $bbpress_live->get_topic_details( $topic_id ) ) {
-        do_action( 'bp_forums_get_topic_details', $topic );
-        return $topic;
-    }
-    
+function bp_forums_openclose_topic( $args = '' ) {
+    global $bp;
+    
+    do_action( 'bbpress_init' );
+    
+    $defaults = array(
+        'topic_id' => false,
+        'mode' => 'close' // stick/unstick
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    if ( 'close' == $mode )
+        return bb_close_topic( $topic_id );
+    else if ( 'open' == $mode )
+        return bb_open_topic( $topic_id );
+
     return false;
 }
 
-function bp_forums_get_posts( $topic_id = 0, $number = 0, $page = 1 ) {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    if ( $posts = $bbpress_live->get_posts( $topic_id, $number, $page ) ) {
-        do_action( 'bp_forums_get_posts', $posts );
-        return $posts;
-    }
-
-    return false;
-}
-
-function bp_forums_get_post( $post_id = 0 ) {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-            
-    if ( $post = $bbpress_live->get_post( $post_id ) ) {
-        do_action( 'bp_forums_get_post', $post );
-        return $post;
-    }
-
-    return false;
-}
-
-function bp_forums_new_forum( $name = '', $desc = '', $parent = BP_FORUMS_PARENT_FORUM_ID, $order = 0, $is_category = false ) {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    if ( $forum = $bbpress_live->new_forum( $name, $desc, $parent, $order, $is_category ) ) {
-        do_action( 'bp_forums_new_forum', $forum );
-        return $forum;
-    }
-    
-    return false;
-}
-
-function bp_forums_new_topic( $title = '', $topic_text = '', $topic_tags = '', $forum_id = 0 ) {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    $topic_text = apply_filters( 'bp_forums_new_post_text', $topic_text );
-    $title = apply_filters( 'bp_forums_new_post_title', $title );
-    $topic_tags = apply_filters( 'bp_forums_new_post_tags', $topic_tags );
-    
-    if ( $topic = $bbpress_live->new_topic( $title, $topic_text, $topic_tags, (int)$forum_id ) ) {
-        do_action( 'bp_forums_new_topic', $topic );
-        return $topic; 
-    }
-    
-    return false;
-}
-
-function bp_forums_new_post( $post_text = '', $topic_id = 0 ) {
-    global $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    $post_text = apply_filters( 'bp_forums_new_post_text', $post_text );
-    
-    if ( $post = $bbpress_live->new_post( $post_text, (int)$topic_id ) ) {
-        do_action( 'bp_forums_new_post', $post );
-        return $post;
-    }
-    
-    return false;
+function bp_forums_delete_topic( $args = '' ) {
+    global $bp;
+    
+    do_action( 'bbpress_init' );
+    
+    $defaults = array(
+        'topic_id' => false
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+
+    return bb_delete_topic( $topic_id, 1 );
+}
+
+function bp_forums_insert_post( $args = '' ) {
+    global $bp;
+    
+    do_action( 'bbpress_init' );
+
+    $defaults = array(
+        'post_id' => false, 
+        'topic_id' => false,
+        'post_text' => '',
+        'post_time' => bb_current_time( 'mysql' ),
+        'poster_id' => $bp->loggedin_user->id, // accepts ids or names
+        'poster_ip' => $_SERVER['REMOTE_ADDR'],
+        'post_status' => 0, // use bb_delete_post() instead
+        'post_position' => false
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    if ( !$post = bp_forums_get_post( $post_id ) )
+        $post_id = false;
+
+    if ( !isset( $topic_id ) )
+        $topic_id = $post->topic_id;
+    
+    if ( empty( $post_text ) )
+        $post_text = $post->post_text;
+    
+    if ( !isset( $post_time ) )
+        $post_time = $post->post_time;
+
+    if ( !isset( $post_position ) )
+        $post_position = $post->post_position;
+
+    return bb_insert_post( array( 'post_id' => $post_id, 'topic_id' => $topic_id, 'post_text' => stripslashes( $post_text ), 'post_time' => $post_time, 'poster_id' => $poster_id, 'poster_ip' => $poster_ip, 'post_status' => $post_status, 'post_position' => $post_position ) );
 }
 
@@ -189 +284 @@
 add_action( 'bp_forums_new_post', 'bp_core_clear_cache' );
 
-
-
+function bb_forums_filter_caps( $allcaps ) {
+    global $bp, $wp_roles, $bb_table_prefix;
+    
+    $bb_cap = get_usermeta( $bp->loggedin_user->id, $bb_table_prefix . 'capabilities' );
+
+    if ( empty( $bb_cap ) )
+        return $allcaps;
+    
+    $bb_cap = array_keys($bb_cap);
+    $bb_cap = $wp_roles->get_role( $bb_cap[0] );
+    $bb_cap = $bb_cap->capabilities;
+    
+    return array_merge( (array) $allcaps, (array) $bb_cap );
+}
+add_filter( 'user_has_cap', 'bb_forums_filter_caps' );
 ?>

trunk/bp-forums/bp-forums-admin.php

@@ -1 +1 @@
 <?php
-function bp_forums_add_admin_menu() {
-    global $wpdb, $bp;
-
-    if ( is_site_admin() ) {
-        /* Add the administration tab under the "Site Admin" tab for site administrators */
-        add_submenu_page( 'bp-core.php', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 2, __FILE__, "bp_forums_bbpress_admin" );
-    }
-}
-add_action( 'admin_menu', 'bp_forums_add_admin_menu' );
 
 function bp_forums_bbpress_admin() { 
-    global $bp, $bbpress_live;
-    
-    if ( !is_object( $bbpress_live ) ) {
-        include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        $bbpress_live = new bbPress_Live();
-    }
-    
-    if ( isset( $_POST['submit'] ) ) {
-        check_admin_referer('bbpress-settings');
-
-        $_fetch_options = array(
-            'target_uri' => stripslashes((string) $_POST['target_uri']),
-            'username' => stripslashes((string) $_POST['username']),
-            'password' => stripslashes((string) $_POST['password']),
-            'always_use_auth' => (bool) $_POST['always_use_auth']
-        );
-        update_option( 'bbpress_live_fetch', $_fetch_options );
-
-        $_options = array(
-            'cache_enabled' => (bool) $_POST['cache_enabled'],
-            'cache_timeout' => (int) $_POST['cache_timeout'],
-            'widget_forums' => (bool) $_POST['widget_forums'],
-            'widget_topics' => (bool) $_POST['widget_topics'],
-            'post_to_topic' => (bool) $_POST['post_to_topic'],
-            'post_to_topic_forum' => stripslashes((string) $_POST['post_to_topic_forum']),
-            'post_to_topic_delay' => (int) $_POST['post_to_topic_delay']
-        );
-        update_option( 'bbpress_live', $_options );     
-    
-        $fetch_options = $_fetch_options;
-        $options = $_options;
-        
-        do_action( 'bp_forums_bbpress_admin', $_fetch_options, $_options );
-        
-    } else {
-        $fetch_options = $bbpress_live->fetch->options;
-        $options = $bbpress_live->options;
-    }
+    global $bp;
 ?>
     <div class="wrap">
@@ -59 +13 @@
             </div>
         <?php endif; ?>
-        <br />
+
+        <?php
         
-        <?php if ( isset($path_success) ) : ?><?php echo "<p id='message' class='updated fade'>$path_success</p>" ?><?php endif; ?>
-            
-        <p><?php _e( 'To enable forums for each group in a BuddyPress installation, you must first download, install, and setup bbPress and integrate it with WordPress MU.', 'buddypress' ) ?></p>
-        <p><?php _e( 'Once you have bbPress set up correctly, enter the options below so that BuddyPress can connect.', 'buddypress' ) ?></p>
-        
-        <form action="<?php echo site_url() . '/wp-admin/admin.php?page=' . BP_PLUGIN_DIR . '/bp-forums/bp-forums-admin.php' ?>" name="bbpress-path-form" id="bbpress-path-form" method="post">             
-            <input type="hidden" name="option_page" value="bbpress-live" />
-            
-            <table class="form-table">
-                <tr valign="top">
-                    <th scope="row"><label for="target_uri"><?php _e( 'bbPress URL', 'buddypress' ) ?></label></th>
-                    <td>
-                        <input name="target_uri" type="text" id="target_uri" value="<?php echo attribute_escape( $fetch_options['target_uri'] ); ?>" size="60" /><br />
-                        <?php _e( 'The URL of the location you installed bbPress. For example, http://example.com/forums/', 'buddypress' ); ?>
-                    </td>
-                </tr>
-                <tr valign="top">
-                    <th scope="row"><label for="username"><?php _e( 'bbPress username', 'buddypress' ) ?></label></th>
-                    <td>
-                        <input name="username" type="text" id="username" value="<?php echo attribute_escape( $fetch_options['username'] ); ?>" size="20" /><br />
-                        <?php _e( 'The username for the user (with admin rights) that you created for BuddyPress integration', 'buddypress' ); ?>
-                    </td>
-                </tr>
-                <tr valign="top">
-                    <th scope="row"><label for="password"><?php _e( 'bbPress password', 'buddypress' ) ?></label></th>
-                    <td>
-                        <input name="password" type="password" id="password" value="<?php echo attribute_escape( $fetch_options['password'] ); ?>" size="20" /><br />
-                        <?php _e( 'The password for the user (with admin rights) that you created for BuddyPress integration', 'buddypress' ); ?>
-                    </td>
-                </tr>
-            </table>
-            <br />
-            <h3><?php _e( 'Cache requests', 'buddypress' ) ?></h3>
-            <table class="form-table">
-                <tr valign="top">
-                    <th scope="row"><label for="cache_enabled"><?php _e( 'Caching enabled', 'buddypress' ) ?></label></th>
-                    <td>
-                        <input name="cache_enabled" type="checkbox" id="cache_enabled" value="1"<?php echo( $options['cache_enabled'] ? ' checked="checked"' : '' ); ?> />
-                        <?php _e( 'Turn on caching of requests to reduce latency and load.', 'buddypress' ); ?>
-                    </td>
-                </tr>
-                <tr valign="top">
-                    <th scope="row"><label for="cache_timeout"><?php _e( 'Cache timeout', 'buddypress' ) ?></label></th>
-                    <td>
-                        <input name="cache_timeout" type="text" id="cache_timeout" value="<?php echo attribute_escape( $options['cache_timeout'] ); ?>" size="10" /> <?php _e( '(seconds)', 'buddypress' ) ?><br />
-                        <?php _e( 'The amount of time in seconds that a cached request is valid for.', 'buddypress' ); ?>
-                    </td>
-                </tr>
-            </table>
-            <br />
-            <p class="submit">
-                <input class="button-primary" type="submit" name="submit" value="<?php _e('Save Settings', 'buddypress') ?>"/>
-            </p>
-            <?php wp_nonce_field('bbpress-settings') ?>
-        </form>
+        if ( !bp_forums_is_installed_correctly() )
+            bp_forums_bbpress_install_wizard();
+        else { ?>
+            
+            <p>In development:<br />This screen will allow you to manage the relationships between existing groups and forums.</p>
+            
+        <?php   
+        }
+        ?>
     </div>
 <?php
 }
+
+function bp_forums_bbpress_install_wizard() { 
+    $post_url = site_url( 'wp-admin/admin.php?page=' . 'buddypress/bp-forums.php' );
+
+    switch( $_REQUEST['step'] ) {       
+        case 'existing': 
+            if ( 1 == (int)$_REQUEST['doinstall'] ) {
+                if ( !bp_forums_configure_existing_install() )
+                    echo "no go";
+            }
+                ?>
+                    <form action="" method="post">
+                        <h3><?php _e( 'Existing bbPress Installation', 'buddypress' ) ?></h3>
+                        <p><?php _e( "BuddyPress can make use of your existing bbPress install. Just provide the location of your <code>bb-config.php</code> file, and BuddyPress will do the rest.", 'buddypress' ) ?></p>
+                        <p><label><code>bb-config.php</code> file location:</label><br /><input style="width: 50%" type="text" name="bbconfigloc" id="bbconfigloc" value="<?php echo str_replace( 'buddypress', '', $_SERVER['DOCUMENT_ROOT'] ) ?>" /></p>
+                        <p><input type="submit" class="button-primary" value="<?php _e( 'Complete Installation', 'buddypress' ) ?>" /></p>
+                        <input type="hidden" name="step" value="existing" />
+                        <input type="hidden" name="doinstall" value="1" />
+                        <?php wp_nonce_field( 'bp_forums_existing_install_init' ) ?>
+                    </form>
+                <?php   
+        break;
+
+        case 'new':
+            if ( 1 == (int)$_REQUEST['doinstall'] ) {
+                $result = bp_forums_bbpress_install();
+            
+                switch ( $result ) {
+                    case 1:
+                        _e( 'All done! Configuration settings have been saved to the file <code>bb-config.php</code> in the root of your WordPress install.' );
+                        break;
+                    default:
+                        // Just write the contents to screen
+                        _e( 'A configuration file could not be created. No problem, but you will need to save the text shown below into a file named <code>bb-config.php</code> in the root directory of your WordPress installation before you can start using the forum functionality.' );
+                        ?><code style="display:block; margin-top: 30px;"><pre><?php echo htmlspecialchars( $result ) ?></pre></code><?php
+                        break;
+                }
+            } else {
+            ?>
+                <h3><?php _e( 'New bbPress Installation', 'buddypress' ) ?></h3>
+                <p><?php _e( "You've decided to set up a new installation of bbPress for forum management in BuddyPress. This is very simple and is usually just a one click
+                process. When you're ready, hit the link below.", 'buddypress' ) ?></p>
+                <p><a class="button-primary" href="<?php echo wp_nonce_url( $post_url . '&step=new&doinstall=1', 'bp_forums_new_install_init' ) ?>"><?php _e( 'Complete Installation', 'buddypress' ) ?></a></p>
+            <?php
+            }
+        break;
+    
+        default: ?>
+            <p><?php _e( 'Forums in BuddyPress make use of a bbPress installation to function. You can choose to either let BuddyPress set up a new bbPress install, or use an already existing bbPress install. Please choose one of the options below.', 'buddypress' ) ?></p>
+            
+            <a class="button" href="<?php echo $post_url . '&step=new' ?>"><?php _e( 'Set up a new bbPress installation', 'buddypress' ) ?></a> &nbsp;
+            <a class="button" href="<?php echo $post_url . '&step=existing' ?>"><?php _e( 'Use an existing bbPress installation', 'buddypress' ) ?></a>
+
+        <?php 
+        break;
+    }
+}
+
+function bp_forums_configure_existing_install() {
+    global $wpdb, $bbdb;
+    
+    check_admin_referer( 'bp_forums_existing_install_init' );
+    
+    if ( false === strpos( $_REQUEST['bbconfigloc'], 'bp-config.php' ) ) {
+        if ( '/' != substr( $_REQUEST['bbconfigloc'], -1, 1 ) )
+            $_REQUEST['bbconfigloc'] .= '/';
+        
+        $_REQUEST['bbconfigloc'] .= 'bp-config.php';
+    }
+
+    var_dump( $_REQUEST['bbconfigloc'], file_exists( $_REQUEST['bbconfigloc'] ) );
+
+    if ( !file_exists( $_REQUEST['bbconfigloc'] ) )
+        return false;
+
+    update_site_option( 'bb-config-location', $_REQUEST['bbconfigloc'] );
+    
+    return true;
+}
+
+function bp_forums_bbpress_install() {
+    global $wpdb, $bbdb;
+    
+    check_admin_referer( 'bp_forums_new_install_init' );
+
+    /* Create the bb-config.php file */
+    $initial_write = bp_forums_bbpress_write(
+        BP_PLUGIN_DIR . '/bp-forums/bbpress/bb-config-sample.php',
+        ABSPATH . 'bb-config.php',
+        array(
+            "define( 'BBDB_NAME',"          => array( "'bbpress'",                      "'" . DB_NAME . "'" ),
+            "define( 'BBDB_USER',"          => array( "'username'",                     "'" . DB_USER . "'" ),
+            "define( 'BBDB_PASSWO"          => array( "'password'",                     "'" . DB_PASSWORD . "'" ),
+            "define( 'BBDB_HOST',"          => array( "'localhost'",                    "'" . DB_HOST . "'" ),
+            "define( 'BBDB_CHARSE"          => array( "'utf8'",                         "'" . DB_CHARSET . "'" ),
+            "define( 'BBDB_COLLAT"          => array( "''",                             "'" . DB_COLLATE . "'" ),
+            "define( 'BB_AUTH_KEY"          => array( "'put your unique phrase here'",  "'" . AUTH_KEY . "'" ),
+            "define( 'BB_SECURE_A"          => array( "'put your unique phrase here'",  "'" . SECURE_AUTH_KEY . "'" ),
+            "define( 'BB_LOGGED_I"          => array( "'put your unique phrase here'",  "'" . LOGGED_IN_KEY . "'" ),
+            "define( 'BB_NONCE_KE"          => array( "'put your unique phrase here'",  "'" . NONCE_KEY . "'" ),
+            "\$bb_table_prefix = '"         => array( "'bb_'",                          "'" . $wpdb->base_prefix . "bb_'" ),
+            "define( 'BB_LANG', '"          => array( "''",                             "'" . WPLANG . "'" )
+        )
+    );
+    
+    /* Add the custom user and usermeta entries to the config file */
+    if ( $initial_write == 1 ) {
+        $file = file_get_contents( ABSPATH . 'bb-config.php' );
+    } else {
+        $file = &$initial_write;
+    }
+
+    $file = substr( $file, 0, -2 );
+    $file .= "\n" .   '$bb->custom_user_table = "' . $wpdb->users . '";'; 
+    $file .= "\n" .   '$bb->custom_user_meta_table = "' . $wpdb->usermeta . '";';
+    $file .= "\n\n" . '$bb->uri = "' . BP_PLUGIN_URL . '/bp-forums/bbpress/";';
+    $file .= "\n" .   '$bb->name = "' . get_blog_option( BP_ROOT_BLOG, 'name' ) . ' ' . __( 'Forums', 'buddypress' ) . '";';
+    $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
+    $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', "' . AUTH_SALT . '");'; 
+    $file .= "\n" .   'define(\'BB_LOGGED_IN_SALT\', "' . LOGGED_IN_SALT . '");';   
+    $file .= "\n" .   'define(\'BB_SECURE_AUTH_SALT\', "' . SECURE_AUTH_SALT . '");';   
+    $file .= "\n\n" . 'define(\'WP_AUTH_COOKIE_VERSION\', 2);'; 
+    $file .= "\n\n" . '?>';
+    
+    if ( $initial_write == 1 ) {
+        $file_handle = fopen( ABSPATH . 'bb-config.php', 'w' );
+        fwrite( $file_handle, $file );
+        fclose( $file_handle );
+    } else {
+        $initial_write = $file;
+    }
+
+    update_site_option( 'bb-config-location', ABSPATH . 'bb-config.php' );
+    return $initial_write;
+}
+
+function bp_forums_bbpress_write( $file_source, $file_target, $alterations ) {
+    if ( !$file_source || !file_exists( $file_source ) || !is_file( $file_source ) ) {
+        return -1;
+    }
+
+    if ( !$file_target ) {
+        $file_target = $file_source;
+    }
+
+    if ( !$alterations || !is_array( $alterations ) ) {
+        return -2;
+    }
+    
+    // Get the existing lines in the file
+    $lines = file( $file_source );
+
+    // Initialise an array to store the modified lines
+    $modified_lines = array();
+
+    // Loop through the lines and modify them
+    foreach ( $lines as $line ) {
+        if ( isset( $alterations[substr( $line, 0, 20 )] ) ) {
+            $alteration = $alterations[substr( $line, 0, 20 )];
+            $modified_lines[] = str_replace( $alteration[0], $alteration[1], $line );
+        } else {
+            $modified_lines[] = $line;
+        }
+    }
+    
+    $writable = true;
+    if ( file_exists( $file_target ) ) {
+        if ( !is_writable( $file_target ) ) {
+            $writable = false;
+        }
+    } else {
+        $dir_target = dirname( $file_target );
+
+        if ( file_exists( $dir_target ) ) {
+            @chmod( $dir_target, 0777 );
+
+            if ( !is_writable( $dir_target ) || !is_dir( $dir_target ) ) {
+                $writable = false;
+            }
+            
+            @chmod( $dir_target, 0666 );
+        } else {
+            $writable = false;
+        }
+    }
+
+    if ( !$writable )
+        return trim( join( null, $modified_lines ) );
+
+    // Open the file for writing - rewrites the whole file
+    $file_handle = fopen( $file_target, 'w' );
+
+    // Write lines one by one to avoid OS specific newline hassles
+    foreach ( $modified_lines as $modified_line ) {
+        if ( false !== strpos( $modified_line, '?>' ) ) {
+            $modified_line = '?>';
+        }
+        fwrite( $file_handle, $modified_line );
+        if ( $modified_line == '?>' ) {
+            break;
+        }
+    }
+
+    // Close the config file
+    fclose( $file_handle );
+
+    @chmod( $file_target, 0666 );
+
+    return 1;
+}
 ?>

trunk/bp-forums/bp-forums-filters.php

@@ -1 +1 @@
 <?php
-
-/* BuddyPress filters */
-add_filter( 'bp_get_the_topic_latest_post_excerpt', 'bp_create_excerpt' );
 
 /* Apply WordPress defined filters */
@@ -28 +25 @@
 add_filter( 'bp_get_the_topic_post_content', 'make_clickable' );
 
-add_filter( 'bp_get_activity_content', 'bp_forums_filter_decode' );
-add_filter( 'bp_forums_new_post_text', 'bp_forums_filter_encode' );
-
-add_filter( 'bp_get_the_topic_post_content', 'bp_forums_filter_decode' );
-add_filter( 'bp_get_the_topic_latest_post_excerpt', 'bp_forums_filter_decode' );
-
 function bp_forums_add_allowed_tags( $allowedtags ) {
     $allowedtags['p'] = array();
@@ -42 +33 @@
 add_filter( 'edit_allowedtags', 'bp_forums_add_allowed_tags' );
 
-function bp_forums_filter_encode( $content ) {
-    $content = htmlentities( $content, ENT_COMPAT, "UTF-8" );
-    $content = str_replace( '&', '/amp/', $content );
-
-    return $content;
-}
-
-function bp_forums_filter_decode( $content ) {
-    $content = str_replace( '/amp/', '&', $content );
-    $content = @html_entity_decode( $content, ENT_COMPAT, "UTF-8" );
-    $content = str_replace( '[', '<', $content );
-    $content = str_replace( ']', '>', $content );
-    $content = stripslashes( wp_filter_kses( $content ) );
-
-    return $content;
-}
-
 ?>

trunk/bp-forums/bp-forums-templatetags.php

@@ -19 +19 @@
     var $order;
     
-    function BP_Forums_Template_Forum( $forum_id, $per_page, $max ) {
-        global $bp, $current_user;
+    function BP_Forums_Template_Forum( $forum_id, $per_page, $max, $no_stickies ) {
+        global $bp;
 
         $this->pag_page = isset( $_REQUEST['forum_page'] ) ? intval( $_REQUEST['forum_page'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 
-        $this->topics = bp_forums_get_topics( $forum_id, $this->pag_num, $this->pag_page );
-        
-        if ( !$this->topics ) {
+        $this->topics = bp_forums_get_forum_topics( array( 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num ) );
+
+        if ( !(int)$this->topics ) {
             $this->topic_count = 0;
             $this->total_topic_count = 0;
         } else {
-            $forum_count = count( bp_forums_get_topics( $forum_id ) );
+            $topic_count = bp_forums_get_forum( $forum_id );
+            $topic_count = (int)$topic_count->topics;
             
-            if ( !$max || $max >= $forum_count )
-                $this->total_topic_count = $forum_count;
+            if ( !$max || $max >= $topic_count )
+                $this->total_topic_count = $topic_count;
             else
                 $this->total_topic_count = (int)$max;
@@ -46 +47 @@
                 $this->topic_count = count( $this->topics );
             }       
+        }
+        
+        if ( !$no_stickies) {
+            /* Place stickies at the top - not sure why bbPress doesn't do this? */
+            foreach( (array)$this->topics as $topic ) {
+                if ( 1 == (int)$topic->topic_sticky )
+                    $stickies[] = $topic;
+                else
+                    $standard[] = $topic; 
+            }
+            $this->topics = array_merge( (array)$stickies, (array)$standard );
         }
 
@@ -107 +119 @@
 function bp_has_topics( $args = '' ) {
     global $forum_template, $bp;
-    global $group_obj;
     
     $defaults = array(
         'forum_id' => false,
-        'per_page' => 10,
-        'max' => false
+        'per_page' => 15,
+        'max' => false,
+        'no_stickies' => false
     );
 
@@ -118 +130 @@
     extract( $r, EXTR_SKIP );
 
-    if ( !$forum_id && $bp->current_component == $bp->groups->slug && 'forum' == $bp->current_action )
-        $forum_id = groups_get_groupmeta( $group_obj->id, 'forum_id' );
+    if ( !$forum_id && $bp->current_component == $bp->groups->slug )
+        $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
     
     if ( is_numeric( $forum_id ) )
-        $forum_template = new BP_Forums_Template_Forum( $forum_id, $per_page, $max );
+        $forum_template = new BP_Forums_Template_Forum( (int)$forum_id, $per_page, $max, $no_stickies );
     else
         return false;
@@ -166 +178 @@
     }
 
+function bp_the_topic_text() {
+    echo bp_get_the_topic_text();
+}
+    function bp_get_the_topic_text() {
+        global $forum_template;
+
+        $post = bb_get_first_post( $forum_template->topic->topic_id );
+        return apply_filters( 'bp_get_the_topic_text', $post->post_text );
+    }
+
 function bp_the_topic_poster_id() {
     echo bp_get_the_topic_poster_id();
@@ -175 +197 @@
     }
 
-function bp_the_topic_poster_avatar() {
-    echo bp_get_the_topic_poster_avatar();
-}
-    function bp_get_the_topic_poster_avatar() {
-        global $forum_template;
-
-        return apply_filters( 'bp_get_the_topic_poster_avatar', bp_core_get_avatar( $forum_template->topic->topic_poster, 1 ) ); 
+function bp_the_topic_poster_avatar( $args = '' ) {
+    echo bp_get_the_topic_poster_avatar( $args );
+}
+    function bp_get_the_topic_poster_avatar( $args = '' ) {
+        global $forum_template;
+    
+        $defaults = array(
+            'type' => 'thumb',
+            'width' => false,
+            'height' => false,
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        if ( 'thumb' == $type )
+            $size = 1;
+        else
+            $size = 2;
+
+        if ( $width && $height )
+            $av = bp_core_get_avatar( $forum_template->topic->topic_poster, $size, $width, $height );
+        else
+            $av = bp_core_get_avatar( $forum_template->topic->topic_poster, $size );
+
+        return apply_filters( 'bp_get_the_topic_poster_avatar', $av ); 
     }
 
@@ -202 +243 @@
     }
 
-function bp_the_topic_last_poster_avatar() {
-    echo bp_get_the_topic_last_poster_avatar();
-}
-    function bp_get_the_topic_last_poster_avatar() {
-        global $forum_template;
-
-        return apply_filters( 'bp_get_the_topic_last_poster_avatar', bp_core_get_avatar( $forum_template->topic->topic_last_poster, 1 ) ); 
+function bp_the_topic_last_poster_avatar( $args = '' ) {
+    echo bp_get_the_topic_last_poster_avatar( $args );
+}
+    function bp_get_the_topic_last_poster_avatar( $args = '' ) {
+        global $forum_template;
+
+        $defaults = array(
+            'type' => 'thumb',
+            'width' => false,
+            'height' => false,
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        if ( 'thumb' == $type )
+            $size = 1;
+        else
+            $size = 2;
+
+        if ( $width && $height )
+            $av = bp_core_get_avatar( $forum_template->topic->topic_last_poster, $size, $width, $height );
+        else
+            $av = bp_core_get_avatar( $forum_template->topic->topic_last_poster, $size );
+
+        return apply_filters( 'bp_get_the_topic_last_poster_avatar', $av ); 
     }
 
@@ -299 +359 @@
 }
     function bp_get_the_topic_permalink() {
-        global $forum_template, $bbpress_live, $group_obj;
-
-        $target_uri = $bbpress_live->fetch->options['target_uri'];
-
-        return apply_filters( 'bp_get_the_topic_permalink', bp_get_group_permalink( $group_obj ) . '/forum/topic/' . $forum_template->topic->topic_id );
+        global $forum_template, $bp;
+        
+        if ( $bp->is_single_item )
+            $permalink = $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/';
+        else
+            $permalink = $bp->root_domain . $bp->current_component . '/' . $bp->current_action . '/';
+            
+        return apply_filters( 'bp_get_the_topic_permalink', $permalink . 'forum/topic/' . $forum_template->topic->topic_slug );
     }
 
@@ -312 +375 @@
         global $forum_template;
 
-        return apply_filters( 'bp_get_the_topic_time_since_created', $forum_template->topic->topic_start_time_since );
-    }
-    
-function bp_the_topic_latest_post_excerpt() {
-    echo bp_get_the_topic_latest_post_excerpt();
-}
-    function bp_get_the_topic_latest_post_excerpt() {
-        global $forum_template;
+        return apply_filters( 'bp_get_the_topic_time_since_created', bp_core_time_since( bb_gmtstrtotime( $forum_template->topic->topic_start_time ) ) );
+    }
+    
+function bp_the_topic_latest_post_excerpt( $args = '' ) {
+    echo bp_get_the_topic_latest_post_excerpt( $args );
+}
+    function bp_get_the_topic_latest_post_excerpt( $args = '' ) {
+        global $forum_template;
+
+        $defaults = array(
+            'length' => 10
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
 
         $post = bp_forums_get_post( $forum_template->topic->topic_last_post_id );
-        return apply_filters( 'bp_get_the_topic_latest_post_excerpt', $post['post_text'] );
+        $post = bp_create_excerpt( $post->post_text, $length );
+        return apply_filters( 'bp_get_the_topic_latest_post_excerpt', $post );
     }
 
@@ -336 +407 @@
         global $forum_template;
 
-        return apply_filters( 'bp_get_the_topic_time_since_last_post', $forum_template->topic->topic_time_since );
-    }
+        return apply_filters( 'bp_get_the_topic_time_since_last_post', bp_core_time_since( bb_gmtstrtotime( $forum_template->topic->topic_time ) ) );
+    }
+
+function bp_the_topic_admin_links( $args = '' ) {
+    echo bp_get_the_topic_admin_links( $args );
+}
+    function bp_get_the_topic_admin_links( $args = '' ) {
+        global $forum_template; 
+        
+        $defaults = array(
+            'seperator' => '|'
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        $links  = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . '/edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit', 'buddypress' ) . '</a> ' . $seperator . ' ';
+
+        if ( 0 == (int)$forum_template->topic->topic_sticky )
+            $links .= '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . '/stick', 'bp_forums_stick_topic' ) . '">' . __( 'Sticky', 'buddypress' ) . '</a> ' . $seperator . ' ';
+        else
+            $links .= '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . '/unstick', 'bp_forums_unstick_topic' ) . '">' . __( 'Un-stick', 'buddypress' ) . '</a> ' . $seperator . ' ';
+
+        if ( 0 == (int)$forum_template->topic->topic_open )
+            $links .= '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . '/open', 'bp_forums_open_topic' ) . '">' . __( 'Open', 'buddypress' ) . '</a> ' . $seperator . ' ';
+        else
+            $links .= '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . '/close', 'bp_forums_close_topic' ) . '">' . __( 'Close', 'buddypress' ) . '</a> ' . $seperator . ' ';
+
+        $links .= '<a id="topic-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . '/delete', 'bp_forums_delete_topic' ) . '">' . __( 'Delete', 'buddypress' ) . '</a>';
+
+        return $links;
+    }
+
+function bp_the_topic_css_class() {
+    echo bp_get_the_topic_css_class();
+}
+
+    function bp_get_the_topic_css_class() {
+        global $forum_template;
+    
+        $class = false;
+    
+        if ( 1 == (int)$forum_template->topic->topic_sticky ) {
+            $class .= 'sticky';
+        }
+    
+        if ( 0 == (int)$forum_template->topic->topic_open ) {
+            $class .= ' closed';
+        }
+    
+        return trim( $class );
+    }
+
 
 function bp_forum_pagination() {
@@ -358 +480 @@
     <img id="ajax-loader-groups" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
 <?php
+}
+
+function bp_is_edit_topic() {
+    global $bp;
+    
+    if ( in_array( 'post', (array)$bp->action_variables ) && in_array( 'edit', (array)$bp->action_variables ) )
+        return false;
+    
+    return true;
 }
 
@@ -391 +522 @@
         $forum_template->topic = (object) bp_forums_get_topic_details( $this->topic_id );
 
-        $this->posts = bp_forums_get_posts( $this->topic_id, $this->pag_num, $this->pag_page );
+        $this->posts = bp_forums_get_topic_posts( array( 'topic_id' => $this->topic_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num ) );
         
         if ( !$this->posts ) {
@@ -474 +605 @@
     $defaults = array(
         'topic_id' => false,
-        'per_page' => 10,
+        'per_page' => 15,
         'max' => false
     );
@@ -482 +613 @@
 
     if ( !$topic_id && $bp->current_component == $bp->groups->slug && 'forum' == $bp->current_action && 'topic' == $bp->action_variables[0] )
-        $topic_id = $bp->action_variables[1];
+        $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
 
     if ( is_numeric( $topic_id ) )
@@ -520 +651 @@
     }
 
-function bp_the_topic_post_poster_avatar() {
-    echo bp_get_the_topic_post_poster_avatar();
-}
-    function bp_get_the_topic_post_poster_avatar() {
+function bp_the_topic_post_poster_avatar( $args = '' ) {
+    echo bp_get_the_topic_post_poster_avatar( $args );
+}
+    function bp_get_the_topic_post_poster_avatar( $args = '' ) {
         global $topic_template;
 
-        return apply_filters( 'bp_get_the_topic_post_poster_avatar', bp_core_get_avatar( $topic_template->post->poster_id, 1, 20, 20 ) ); 
+        $defaults = array(
+            'type' => 'thumb',
+            'width' => 20,
+            'height' => 20,
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        if ( 'thumb' == $type )
+            $size = 1;
+        else
+            $size = 2;
+
+        if ( $width && $height )
+            $av = bp_core_get_avatar( $topic_template->post->poster_id, $size, $width, $height );
+        else
+            $av = bp_core_get_avatar( $topic_template->post->poster_id, $size );
+
+        return apply_filters( 'bp_get_the_topic_post_poster_avatar', $av ); 
     }
 
@@ -550 +700 @@
         global $topic_template;
 
-        return apply_filters( 'bp_get_the_topic_post_time_since', $topic_template->post->post_time_since );
+        return apply_filters( 'bp_get_the_topic_post_time_since', bp_core_time_since( bb_gmtstrtotime( $topic_template->post->post_time ) ) );
+    }
+
+function bp_the_topic_post_is_mine() {
+    echo bp_the_topic_post_is_mine();
+}
+    function bp_get_the_topic_post_is_mine() {
+        global $bp, $topic_template;
+        
+        return $bp->loggedin_user->id == $topic_template->post->poster_id;
+    }
+
+function bp_the_topic_post_admin_links( $args = '' ) {
+    echo bp_get_the_topic_post_admin_links( $args );
+}
+    function bp_get_the_topic_post_admin_links( $args = '' ) {
+        global $topic_template; 
+        
+        $defaults = array(
+            'seperator' => '|'
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        $links  = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . $topic_template->post->id . '/post/' . $topic_template->post->post_id . '/edit/', 'bp_forums_edit_post' ) . '">' . __( 'Edit', 'buddypress' ) . '</a> ' . $seperator . ' ';
+        $links .= '<a id="post-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . '/post/' . $topic_template->post->post_id . '/delete/', 'bp_forums_delete_post' ) . '">' . __( 'Delete', 'buddypress' ) . '</a>';
+
+        return $links;
+    }
+
+function bp_the_topic_post_edit_text() {
+    echo bp_get_the_topic_post_edit_text();
+}
+    function bp_get_the_topic_post_edit_text() {
+        global $bp;
+        
+        $post = bp_forums_get_post( $bp->action_variables[3] );
+        return attribute_escape( $post->post_text );
     }
 
@@ -578 +766 @@
 }
     function bp_get_forum_permalink() {
-        global $group_obj;
-
-        return apply_filters( 'bp_get_forum_permalink', bp_get_group_permalink( $group_obj ) . '/forum' );
+        global $bp;
+        
+        if ( $bp->is_single_item )
+            $permalink = $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/';
+        else
+            $permalink = $bp->root_domain . $bp->current_component . '/' . $bp->current_action . '/';
+
+        return apply_filters( 'bp_get_forum_permalink', $permalink . 'forum' );
     }
 
@@ -589 +782 @@
         global $topic_template;
 
-        return apply_filters( 'bp_get_forum_action', bp_get_group_permalink( $group_obj ) . '/forum' ); 
+        return apply_filters( 'bp_get_forum_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );  
     }
 
@@ -596 +789 @@
 }
     function bp_get_forum_topic_action() {
-        global $topic_template;
-
-        return apply_filters( 'bp_get_forum_topic_action', bp_get_group_permalink( $group_obj ) . '/forum/topic/' . $topic_template->topic_id );    
+        global $bp;
+        
+        return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );    
     }
 

trunk/bp-forums/installation-readme.txt

@@ -2 +2 @@
 '''''''''''''''''''''''''''''''''''
 
-The bp-forums component provides a link between bbPress and BuddyPress so forums can be
-created and manipulated directly in BuddyPress.
-
-Forum functionality is currently quite basic and limited to creating forums, creating topics and posting.
-More advanced integration including moderation, searching and tagging support will come in later
-versions of the component.
-
-*** Please Note ***
-
-You *must* be running the latest alpha of bbPress and at least WPMU version 2.7 for forum integration to 
-work.
-
-************************************************
-Follow these steps to get forums up and running:
-************************************************
-
-1. Run the bbPress installer by browsing to the location that you uploaded bbPress.
-
-2. On Step 2 you will need to integrate bbPress with WordPress
-
-   - Check the "Add integration settings" box
-
-   - Leave "Add cookie integration settings" unchecked
-
-   - Check the "Add user database integration settings" box
-     - Add your table prefix (usually always 'wp_')
-     - Add your WordPress database settings found in wp-config.php
-     - You can usually ignore the "character set" and "collation" boxes
-     - Leave the "Custom user tables" section blank.
-
-3. On Step 3 enter anything you like for your site name and first forum name. Select "Admin" from the
-   dropdown to use as your keymaster user.
-
-4. Head to your new bbPress install and log in with your WordPress administrator account (admin).
-
-5. Head to the Admin area (/bb-admin) and then the settings menu. Check the "Enable XML-RPC" option.
-   Also check the "Enable Pingbacks" option just below.
-
-6. In the bp-forums component there is a /bbpress-plugins/ folder. Copy the 'buddypress-enable.php'
-   plugin file from that folder into your bbpress plugins folder (eg domain/bbpress/bb-plugins/)
-
-7. Enable the plugin in the bbPress admin area under the plugins menu.
-
-8. Head back to your BuddyPress installation and sign up as a new user. Once you have
-   activated the new user, make a note of the username and password given.
-
-9. Log back into your bbPress installation as the administrator, and head back to the admin panel (/bb-admin).
-   Go to the "Users" tab and look for the new user you signed up in step 8 in the list. Hit the "Edit"
-   link for that user, on the end of the row.
-
-10. On the edit user screen there is a drop down menu called "User Type". Select "Administrator" as the user
-    type for this user. Hit the "Update Profile" button.
-
-11. Enable user switching in bbPress by copying the following line of code into your bbPress bb-config.php
-    file:
-    
-        $bb->bb_xmlrpc_allow_user_switching = true;
-
-12. Log into your WPMU admin interface and head to "BuddyPress > Forums Setup" fill in the details on that
-    page. Make sure you don't leave out the ending slash on your bbPress URL. (http://example.com/bbpress/)
-    Enter the username and password for the user that you signed up in step 8.
-
-13. Once you have saved those details you can create group forums. Existing groups you will need to head
-    to the group admin settings page, disable then enable the group forum setting to generate a new forum. 
-    New groups will work fine.
-
-*** NOTE ***
-
-Group forums are public, even if a group is private its forum will be accessable through the bbPress interface.
-This will change eventually, but please be aware of the public status of forums before posting.
+Please sign in to WordPress as a site admin and head to "BuddyPress > Forums Setup" to install.

trunk/bp-groups.php

@@ -106 +106 @@
     $bp->groups->table_name_groupmeta = $wpdb->base_prefix . 'bp_groups_groupmeta';
     $bp->groups->image_base = BP_PLUGIN_URL . '/bp-groups/images';
-    $bp->groups->format_activity_function = 'groups_format_activity';
     $bp->groups->format_notification_function = 'groups_format_notifications';
     $bp->groups->slug = BP_GROUPS_SLUG;
@@ -250 +249 @@
 
             if ( $bp->groups->current_group->enable_forum && function_exists('bp_forums_setup') )
-                bp_core_new_subnav_item( array( 'name' => __( 'Forum', 'buddypress' ), 'slug' => 'group-forum', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_forum', 'position' => 40, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
+                bp_core_new_subnav_item( array( 'name' => __( 'Forum', 'buddypress' ), 'slug' => 'forum', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_forum', 'position' => 40, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-forum' ) );
 
             if ( $bp->groups->current_group->enable_wire && function_exists('bp_wire_install') )
-                bp_core_new_subnav_item( array( 'name' => __( 'Wire', 'buddypress' ), 'slug' => 'group-wire', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_wire', 'position' => 50, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
-
-            bp_core_new_subnav_item( array( 'name' => __( 'Members', 'buddypress' ), 'slug' => 'group-members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
+                bp_core_new_subnav_item( array( 'name' => __( 'Wire', 'buddypress' ), 'slug' => 'wire', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_wire', 'position' => 50, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-wire'  ) );
+
+            bp_core_new_subnav_item( array( 'name' => __( 'Members', 'buddypress' ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-members'  ) );
             
             if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
@@ -319 +318 @@
             
             /* Record this in activity streams */
-            groups_record_activity( array( 'item_id' => $group_id, 'component_name' => $bp->groups->slug, 'component_action' => 'joined_group', 'is_private' => 0 ) );
+            $group = new BP_Groups_Group( $group_id, false, false );
+
+            groups_record_activity( array(
+                'content' => sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), 
+                'primary_link' => bp_get_group_permalink( $group ),
+                'component_action' => 'joined_group',
+                'item_id' => $group->id
+            ) );
         }
 
@@ -377 +383 @@
 
     /* Set the ID of the new group, if it has already been created in a previous step */
-    if ( isset( $_COOKIE['bp_new_group_id'] ) )
+    if ( isset( $_COOKIE['bp_new_group_id'] ) ) {
         $bp->groups->new_group_id = $_COOKIE['bp_new_group_id'];
+        $bp->groups->current_group = new BP_Groups_Group( $bp->groups->new_group_id, false, false );
+    }
     
     /* If the save button is hit, lets calculate what we need to save */
@@ -424 +432 @@
             else if ( 'hidden' == $_POST['group-status'] )
                 $group_status = 'hidden';
-
+            
+            /* Once we get to the second step, record the group creation in the activity stream. As we now know the actual status of the group */
+            groups_record_activity( array(
+                'content' => sprintf( __( '%s created the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ), 
+                'primary_link' => bp_get_group_permalink( $bp->groups->current_group ),
+                'component_action' => 'created_group',
+                'item_id' => $bp->groups->current_group->id,
+                'user_id' => $user_id
+            ) );
+        
             if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_wire' => $group_enable_wire, 'enable_forum' => $group_enable_forum ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
@@ -475 +492 @@
             unset( $bp->groups->completed_create_steps );
             
-            $group = new BP_Groups_Group( $bp->groups->new_group_id, false, false );
-
-            bp_core_redirect( bp_get_group_permalink( $group ) );
+            bp_core_redirect( bp_get_group_permalink( $bp->groups->new_group ) );
         } else {
             /**
@@ -500 +515 @@
     }
 
-    $bp->groups->new_group = new BP_Groups_Group( $bp->groups->new_group_id, false, false );
     bp_core_load_template( apply_filters( 'groups_template_create_group', 'groups/create' ) );
 }
+
 
 function groups_screen_group_home() {
@@ -529 +544 @@
     global $bp;
     
-    if ( $bp->is_single_item ) {
-        $topic_id = $bp->action_variables[1];
+    if ( $bp->is_single_item && $bp->groups->current_group->user_has_access ) {
+        $topic_slug = $bp->action_variables[1];
+        $topic_id = bp_forums_get_topic_id_from_slug( $topic_slug );
         $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
         
-        if ( $topic_id ) {
+        if ( $topic_slug && $topic_id ) {
             
             /* Posting a reply */
-            if ( isset( $_POST['submit_reply'] ) && function_exists( 'bp_forums_new_post') ) {
+            if ( !$bp->action_variables[2] && isset( $_POST['submit_reply'] ) ) {
                 /* Check the nonce */
-                if ( !check_admin_referer( 'bp_forums_new_reply' ) ) 
-                    return false;
-        
-                groups_new_group_forum_post( $_POST['reply_text'], $topic_id );
-                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_id );
-            }
-            
-            do_action( 'groups_screen_group_forum_topic' );
-            
-            // If we are viewing a topic, load it.
-            bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/forum/topic' ) );
+                check_admin_referer( 'bp_forums_new_reply' );
+        
+                if ( !groups_new_group_forum_post( $_POST['reply_text'], $topic_id ) )
+                    bp_core_add_message( __( 'There was an error when replying to that topic', 'buddypress'), 'error' );
+                else
+                    bp_core_add_message( __( 'Your reply was posted successfully', 'buddypress') );
+                
+                if ( $_SERVER['QUERY_STRING'] )
+                    $query_vars = '?' . $_SERVER['QUERY_STRING'];
+                    
+                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' . $query_vars );
+            }
+            
+            /* Sticky a topic */
+            else if ( 'stick' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+                /* Check the nonce */
+                check_admin_referer( 'bp_forums_stick_topic' );
+
+                if ( !bp_forums_sticky_topic( array( 'topic_id' => $topic_id ) ) )
+                    bp_core_add_message( __( 'There was an error when making that topic a sticky', 'buddypress' ), 'error' );
+                else
+                    bp_core_add_message( __( 'The topic was made sticky successfully', 'buddypress' ) );
+            
+                do_action( 'groups_stick_topic', $topic_id );
+                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/' );
+            }
+            
+            /* Un-Sticky a topic */
+            else if ( 'unstick' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+                /* Check the nonce */
+                check_admin_referer( 'bp_forums_unstick_topic' );
+    
+                if ( !bp_forums_sticky_topic( array( 'topic_id' => $topic_id, 'mode' => 'unstick' ) ) )
+                    bp_core_add_message( __( 'There was an error when unsticking that topic', 'buddypress'), 'error' );
+                else
+                    bp_core_add_message( __( 'The topic was unstuck successfully', 'buddypress') );
+            
+                do_action( 'groups_unstick_topic', $topic_id );
+                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/' );
+            }
+            
+            /* Close a topic */
+            else if ( 'close' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+                /* Check the nonce */
+                check_admin_referer( 'bp_forums_close_topic' );
+    
+                if ( !bp_forums_openclose_topic( array( 'topic_id' => $topic_id ) ) )
+                    bp_core_add_message( __( 'There was an error when closing that topic', 'buddypress'), 'error' );
+                else
+                    bp_core_add_message( __( 'The topic was closed successfully', 'buddypress') );
+            
+                do_action( 'groups_close_topic', $topic_id );
+                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/' );
+            }
+
+            /* Open a topic */
+            else if ( 'open' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+                /* Check the nonce */
+                check_admin_referer( 'bp_forums_open_topic' );
+    
+                if ( !bp_forums_openclose_topic( array( 'topic_id' => $topic_id, 'mode' => 'open' ) ) )
+                    bp_core_add_message( __( 'There was an error when opening that topic', 'buddypress'), 'error' );
+                else
+                    bp_core_add_message( __( 'The topic was opened successfully', 'buddypress') );
+            
+                do_action( 'groups_open_topic', $topic_id );
+                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/' );
+            }
+
+            /* Delete a topic */
+            else if ( 'delete' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+                /* Check the nonce */
+                check_admin_referer( 'bp_forums_delete_topic' );
+    
+                if ( !groups_delete_forum_topic( $topic_id ) )
+                    bp_core_add_message( __( 'There was an error deleting the topic', 'buddypress'), 'error' );
+                else
+                    bp_core_add_message( __( 'The topic was deleted successfully', 'buddypress') );
+                                
+                do_action( 'groups_delete_topic', $topic_id );
+                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/' );
+            }
+            
+            /* Editing a topic */
+            else if ( 'edit' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+                if ( isset( $_POST['save_changes'] ) ) {
+                    /* Check the nonce */
+                    check_admin_referer( 'bp_forums_edit_topic' );
+        
+                    if ( !groups_update_group_forum_topic( $topic_id, $_POST['topic_title'], $_POST['topic_text'] ) )
+                        bp_core_add_message( __( 'There was an error when editing that topic', 'buddypress'), 'error' );
+                    else
+                        bp_core_add_message( __( 'The topic was edited successfully', 'buddypress') );
+                
+                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
+                }
+
+                /* Check that the user has access to edit this topic, if not, redirect. */
+                $topic = bp_forums_get_topic_details( $topic_id );
+                if ( ( !$bp->is_item_admin && !$bp->is_item_mod ) && $bp->loggedin_user->id != $topic->topic_poster )
+                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
+
+                bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/forum/edit' ) );
+            }
+            
+            /* Delete a post */
+            else if ( 'delete' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+                /* Check the nonce */
+                check_admin_referer( 'bp_forums_delete_topic' );
+    
+                if ( !groups_delete_forum_topic( $topic_id ) )
+                    bp_core_add_message( __( 'There was an error deleting the topic', 'buddypress'), 'error' );
+                else
+                    bp_core_add_message( __( 'The topic was deleted successfully', 'buddypress') );
+
+                do_action( 'groups_delete_topic', $topic_id );
+                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/' );
+            }
+            
+                        
+            /* Editing a post */
+            else if ( 'edit' == $bp->action_variables[4] && $post_id = $bp->action_variables[3] ) {
+                if ( isset( $_POST['save_changes'] ) ) {
+                    /* Check the nonce */
+                    check_admin_referer( 'bp_forums_edit_post' );
+        
+                    if ( !groups_update_group_forum_post( $post_id, $_POST['post_text'], $topic_id ) )
+                        bp_core_add_message( __( 'There was an error when editing that post', 'buddypress'), 'error' );
+                    else
+                        bp_core_add_message( __( 'The post was edited successfully', 'buddypress') );
+                
+                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
+                }
+                
+                /* Check that the user has access to edit this post, if not, redirect. */
+                $post = bp_forums_get_post( $post_id );
+                if ( ( !$bp->is_item_admin && !$bp->is_item_mod ) && $bp->loggedin_user->id != $post->poster_id )
+                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
+
+                bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/forum/edit' ) );
+            }
+
+            /* Standard topic display */
+            else {
+                if ( file_exists( TEMPLATEPATH . '/groups/single/forum/topic.php' ) )
+                    bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/single/forum/topic' ) );
+                else
+                    bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/forum/topic' ) );
+            }
         } else {
 
@@ -554 +708 @@
             if ( isset( $_POST['submit_topic'] ) && function_exists( 'bp_forums_new_topic') ) {
                 /* Check the nonce */   
-                if ( !check_admin_referer( 'bp_forums_new_topic' ) ) 
-                    return false;
+                check_admin_referer( 'bp_forums_new_topic' );
                 
-                groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id );
+                if ( !groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id ) )
+                    bp_core_add_message( __( 'There was an error when creating the topic', 'buddypress'), 'error' );
+                else
+                    bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
+                    
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/' );
             }
@@ -1181 +1338 @@
  */
 
-function groups_record_activity( $args = true ) {
-    global $bp;
-    
-    if ( function_exists('bp_activity_record') ) {
-        extract($args);
-
-        if ( !$bp->groups->current_group ) {
-            if ( !$bp->groups->current_group = wp_cache_get( 'groups_group_nouserdata_' . $item_id, 'bp' ) ) {
-                $bp->groups->current_group = new BP_Groups_Group( $item_id, false, false );
-                wp_cache_set( 'groups_group_nouserdata_' . $item_id, $bp->groups->current_group, 'bp' );
-            }
-        }
-
-        if ( 'public' == $bp->groups->current_group->status )
-            bp_activity_record( $item_id, $component_name, $component_action, $is_private, $secondary_item_id, $user_id, $secondary_user_id );
-    }
-}
-
-function groups_delete_activity( $args = true ) {
-    if ( function_exists('bp_activity_delete') ) {
-        extract($args);
-        bp_activity_delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id );
-    }
-}
-
-function groups_format_activity( $item_id, $user_id, $action, $secondary_item_id = false, $for_secondary_user = false  ) {
-    global $bp;
-    
-    switch( $action ) {
-        case 'joined_group':
-            $group = new BP_Groups_Group( $item_id, false, false );
-            
-            if ( !$group )
-                return false;
-                
-            $user_link = bp_core_get_userlink( $user_id );
-            $group_link = bp_get_group_permalink( $group );
-            
-            return array( 
-                'primary_link' => $group_link,
-                'content' => apply_filters( 'bp_groups_joined_group_activity', sprintf( __('%s joined the group %s', 'buddypress'), $user_link,  '<a href="' . $group_link . '">' . $group->name . '</a>' ) . ' <span class="time-since">%s</span>', $user_link, $group_link, $group->name )
-            );              
-        break;
-        case 'created_group':
-            $group = new BP_Groups_Group( $item_id, false, false );
-
-            if ( !$group )
-                return false;
-            
-            $user_link = bp_core_get_userlink( $user_id );
-            $group_link = bp_get_group_permalink( $group );
-            
-            return array( 
-                'primary_link' => $group_link,
-                'content' => apply_filters( 'bp_groups_created_group_activity', sprintf( __('%s created the group %s', 'buddypress'), $user_link, '<a href="' . $group_link . '">' . $group->name . '</a>') . ' <span class="time-since">%s</span>', $user_link, $group_link, $group->name )
-            );
-        break;
-        case 'new_wire_post':
-            $wire_post = new BP_Wire_Post( $bp->groups->table_name_wire, $item_id );
-            $group = new BP_Groups_Group( $wire_post->item_id, false, false );
-
-            if ( !$group || !$wire_post || !$wire_post->content )
-                return false;       
-
-            $user_link = bp_core_get_userlink( $user_id );
-            $group_link = bp_get_group_permalink( $group );
-            $post_excerpt = bp_create_excerpt( $wire_post->content );
-                    
-            $content = sprintf ( __('%s wrote on the wire of the group %s', 'buddypress'), $user_link, '<a href="' . $group_link . '">' . $group->name . '</a>' ) . ' <span class="time-since">%s</span>';          
-            $content .= '<blockquote>' . $post_excerpt . '</blockquote>';
-            
-            $content = apply_filters( 'bp_groups_new_wire_post_activity', $content, $user_link, $group_link, $group->name, $post_excerpt );
-            
-            return array( 
-                'primary_link' => $group_link,
-                'content' => $content
-            );
-        break;
-        case 'new_forum_post':
-            if ( function_exists('bp_forums_setup') ) {
-                $group = new BP_Groups_Group( $item_id, false, false );
-                $forum_post = bp_forums_get_post( $secondary_item_id );
-                $forum_topic = bp_forums_get_topic_details( $forum_post['topic_id'] );
-
-                if ( !$group || !$forum_post || !$forum_topic )
-                    return false;
-
-                $user_link = bp_core_get_userlink($user_id);
-                $group_link = bp_get_group_permalink( $group );
-
-                $post_content = apply_filters( 'bp_the_topic_post_content', bp_create_excerpt( stripslashes( $forum_post['post_text'] ), 55, false ) );
-            
-                $content = sprintf ( __('%s posted on the forum topic %s in the group %s:', 'buddypress'), $user_link, '<a href="' . $group_link . '/forum/topic/' . $forum_topic['topic_id'] . '">' . $forum_topic['topic_title'] . '</a>', '<a href="' . $group_link . '">' . $group->name . '</a>' ) . ' <span class="time-since">%s</span>';            
-                $content .= '<blockquote>' . $post_content . '</blockquote>';
-                
-                $content = apply_filters( 'bp_groups_new_forum_post_activity', $content, $user_link, $group_link, $forum_topic['topic_id'], $forum_topic['topic_title'], $group_link, $group->name, $post_content );
-
-                return array( 
-                    'primary_link' => $group_link,
-                    'content' => $content
-                );
-            }
-        break;
-        case 'new_forum_topic':
-            if ( function_exists('bp_forums_setup') ) {
-                $group = new BP_Groups_Group( $item_id, false, false );
-                $forum_topic = bp_forums_get_topic_details( $secondary_item_id );
-                $forum_post = bp_forums_get_post( $forum_topic['topic_last_post_id'] );
-
-                if ( !$group || !$forum_post || !$forum_topic )
-                    return false;
-                    
-                $user_link = bp_core_get_userlink($user_id);
-                $group_link = bp_get_group_permalink( $group );
-                
-                $post_content = apply_filters( 'bp_the_topic_post_content', bp_create_excerpt( stripslashes( $forum_post['post_text'] ), 55, false ) );
-                
-                $content = sprintf ( __('%s created the forum topic %s in the group %s:', 'buddypress'), $user_link, '<a href="' . $group_link . '/forum/topic/' . $forum_topic['topic_id'] . '">' . $forum_topic['topic_title'] . '</a>', '<a href="' . $group_link . '">' . $group->name . '</a>' ) . ' <span class="time-since">%s</span>';          
-                $content .= '<blockquote>' . $post_content . '</blockquote>';
-                
-                $content = apply_filters( 'bp_groups_new_forum_topic_activity', $content, $user_link, $group_link, $forum_topic['topic_id'], $forum_topic['topic_title'], $group_link, $group->name, $post_content );
-                
-                return array( 
-                    'primary_link' => $group_link,
-                    'content' => $content
-                );
-            }
-        break;      
-    }
-    
-    do_action( 'groups_format_activity', $action, $item_id, $user_id, $action, $secondary_item_id, $for_secondary_user );
-    
-    return false;
+function groups_record_activity( $args = '' ) {
+    global $bp;
+    
+    if ( !function_exists( 'bp_activity_add' ) )
+        return false;
+        
+    if ( 'public' != $bp->groups->current_group->status )   
+        return false;
+        
+    $defaults = array(
+        'user_id' => $bp->loggedin_user->id,
+        'content' => false,
+        'primary_link' => false,
+        'component_name' => 'groups',
+        'component_action' => false,
+        'item_id' => false,
+        'secondary_item_id' => false,
+        'recorded_time' => time(),
+        'hide_sitewide' => false
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );   
+    
+    return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
 
@@ -1587 +1636 @@
     if ( !$group->delete() )
         return false;
-    
-    // Remove the activity stream item
-    groups_delete_activity( array( 'item_id' => $group_id, 'component_name' => $bp->groups->slug, 'component_action' => 'created_group', 'user_id' => $bp->loggedin_user->id ) );
+
+    /* Delete the activity stream item */
+    if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
+        bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component_name' => 'groups', 'component_action' => 'created_group' ) );
+    }   
  
     // Remove all outstanding invites for this group
@@ -1679 +1730 @@
 
     /* Record this in activity streams */
-    groups_record_activity( array( 'item_id' => $new_member->group_id, 'component_name' => $bp->groups->slug, 'component_action' => 'joined_group', 'is_private' => 0 ) );
-    
+    groups_record_activity( array(
+        'content' => sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ), 
+        'primary_link' => bp_get_group_permalink( $bp->groups->current_group ),
+        'component_action' => 'joined_group',
+        'item_id' => $bp->groups->current_group->id
+    ) );
+
     /* Modify group meta */
     groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') + 1 );
@@ -1911 +1967 @@
 
 function groups_new_wire_post( $group_id, $content ) {
-     $bp;
-
-    $private = false;
-    if ( $bp->groups->current_group->status != 'public' )
-        $private = true;
-    
-    if ( $wire_post_id = bp_wire_new_post( $group_id, $content, $bp->groups->slug, $private ) ) {
+    global $bp;
+    
+    if ( !function_exists( 'bp_wire_new_post' ) )
+        return false;
+    
+    if ( $wire_post_id = bp_wire_new_post( $group_id, $content, 'groups' ) ) {
+        $activity_content = sprintf( __( '%s wrote on the wire of the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $content ) ) . '</blockquote>';
+        
+        groups_record_activity( array(
+            'content' => $activity_content, 
+            'primary_link' => bp_get_group_permalink( $bp->groups->current_group ),
+            'component_action' => 'new_wire_post',
+            'item_id' => $wire_post_id,
+            'secondary_item_id' => $bp->groups->current_group->id
+        ) );
+
         do_action( 'groups_new_wire_post', $group_id, $wire_post_id );
         
@@ -1927 +1993 @@
 
 function groups_delete_wire_post( $wire_post_id, $table_name ) {
-    global $bp;
-        
-    if ( bp_wire_delete_post( $wire_post_id, $bp->groups->slug, $table_name ) ) {       
+    if ( bp_wire_delete_post( $wire_post_id, 'groups', $table_name ) ) {
+        /* Delete the activity stream item */
+        if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
+            bp_activity_delete_by_item_id( array( 'item_id' => $wire_post_id, 'component_name' => 'groups', 'component_action' => 'new_wire_post' ) );
+        }
+            
         do_action( 'groups_deleted_wire_post', $wire_post_id );
         return true;
@@ -1941 +2010 @@
 function groups_new_group_forum( $group_id = false, $group_name = false, $group_desc = false ) {
     global $bp;
-    
+
     if ( !$group_id )
         $group_id = $bp->groups->current_group->id;
@@ -1951 +2020 @@
         $group_desc = $bp->groups->current_group->description;
     
-    $forum = bp_forums_new_forum( apply_filters( 'groups_new_group_forum_name', $group_name . ' - ' . __( 'Forum', 'buddypress' ), $group_name ), apply_filters( 'groups_new_group_forum_desc', $group_desc ) );
-    
-    groups_update_groupmeta( $group_id, 'forum_id', $forum['forum_id'] );
+    $forum_id = bp_forums_new_forum( array( 'forum_name' => $group_name, 'forum_description' => $group_desc ) );
+    
+    groups_update_groupmeta( $group_id, 'forum_id', $forum_id );
     
     do_action( 'groups_new_group_forum', $forum, $group_id );
@@ -1961 +2030 @@
     global $bp;
     
-    if ( $forum_post = bp_forums_new_post( $post_text, $topic_id ) ) {
-        bp_core_add_message( __( 'Reply posted successfully!', 'buddypress') );
-
-        /* Record in activity streams */
-        groups_record_activity( array( 'item_id' => $bp->groups->current_group->id, 'component_name' => $bp->groups->slug, 'component_action' => 'new_forum_post', 'is_private' => 0, 'secondary_item_id' => $forum_post['post_id'] ) );
-        
+    if ( $forum_post = bp_forums_insert_post( array( 'post_text' => $post_text, 'topic_id' => $topic_id ) ) ) {
+        $topic = bp_forums_get_topic_details( $topic_id );
+        
+        $activity_content = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $post_text ) ) . '</blockquote>';
+        
+        /* Record this in activity streams */
+        groups_record_activity( array(
+            'content' => $activity_content, 
+            'primary_link' => bp_get_group_permalink( $bp->groups->current_group ),
+            'component_action' => 'new_forum_post',
+            'item_id' => $topic_id,
+            'secondary_item_id' => $forum_post->id
+        ) );
+
         do_action( 'groups_new_forum_topic_post', $bp->groups->current_group->id, $forum_post );
         
@@ -1972 +2050 @@
     }
     
-    bp_core_add_message( __( 'There was an error posting that reply.', 'buddypress'), 'error' );                    
     return false;
 }
@@ -1979 +2056 @@
     global $bp;
     
-    if ( $topic = bp_forums_new_topic( $topic_title, $topic_text, $topic_tags, $forum_id ) ) {
-        bp_core_add_message( __( 'Topic posted successfully!', 'buddypress') );
-
-        /* Record in activity streams */
-        groups_record_activity( array( 'item_id' => $bp->groups->current_group->id, 'component_name' => $bp->groups->slug, 'component_action' => 'new_forum_topic', 'is_private' => 0, 'secondary_item_id' => $topic['topic_id'] ) );
-        
-        do_action( 'groups_new_forum_topic', $bp->groups->current_group->id, $topic );
+    if ( $topic_id = bp_forums_new_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_tags' => $topic_tags, 'forum_id' => $forum_id ) ) ) {
+        $topic = bp_forums_get_topic_details( $topic_id );
+
+        $activity_content = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $topic_text ) ) . '</blockquote>';
+        
+        /* Record this in activity streams */
+        groups_record_activity( array(
+            'content' => $activity_content, 
+            'primary_link' => bp_get_group_permalink( $bp->groups->current_group ),
+            'component_action' => 'new_forum_topic',
+            'item_id' => $topic->topic_id,
+            'secondary_item_id' => $bp->groups->current_group->id
+        ) );
+        
+        do_action( 'groups_new_forum_topic', $bp->groups->current_group->id, &$topic );
         
         return $topic;
     }
-    
-    bp_core_add_message( __( 'There was an error posting that topic.', 'buddypress'), 'error' );                    
+                    
     return false;
 }
+
+function groups_update_group_forum_topic( $topic_id, $topic_title, $topic_text ) {
+    global $bp;
+    
+    if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id ) ) ) {
+        /* Update the activity stream item */
+        bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_topic' ) );
+        
+        $activity_content = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $topic_text ) ) . '</blockquote>';
+
+        /* Record this in activity streams */
+        groups_record_activity( array(
+            'content' => $activity_content, 
+            'primary_link' => bp_get_group_permalink( $bp->groups->current_group ),
+            'component_action' => 'new_forum_topic',
+            'item_id' => (int)$topic->topic_id,
+            'user_id' => (int)$topic->topic_poster,
+            'secondary_item_id' => $bp->groups->current_group->id,
+            'recorded_time' => bb_gmtstrtotime( $topic->topic_time )
+        ) );
+
+        do_action( 'groups_update_group_forum_topic', &$topic );
+        
+        return true;
+    }
+    
+    return false;
+}
+
+function groups_delete_forum_topic( $topic_id ) {
+    global $bp;
+    
+    if ( bp_forums_delete_topic( array( 'topic_id' => $topic_id ) ) ) {
+        /* Delete the activity stream item */
+        if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
+            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_topic' ) );
+            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_post' ) );
+        }
+
+        do_action( 'groups_delete_forum_topic', $topic_id );
+        
+        return true;
+    }
+    
+    return false;
+}
+
+function groups_update_group_forum_post( $post_id, $post_text, $topic_id ) {
+    global $bp;
+    
+    $post = bp_forums_get_post( $post_id );
+        
+    if ( $post_id = bp_forums_insert_post( array( 'post_id' => $post_id, 'post_text' => $post_text, 'post_time' => $post->post_time, 'topic_id' => $topic_id ) ) ) {
+        $topic = bp_forums_get_topic_details( $topic_id );
+
+        /* Update the activity stream item */
+        bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'secondary_item_id' => $post_id, 'component_name' => 'groups', 'component_action' => 'new_forum_post' ) );
+        
+        $activity_content = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $post_text ) ) . '</blockquote>';
+        
+        /* Record this in activity streams */
+        groups_record_activity( array(
+            'content' => $activity_content, 
+            'primary_link' => bp_get_group_permalink( $bp->groups->current_group ),
+            'component_action' => 'new_forum_post',
+            'item_id' => $topic_id,
+            'secondary_item_id' => $post_id,
+            'recorded_time' => bb_gmtstrtotime( $post->post_time )
+        ) );
+
+        do_action( 'groups_update_group_forum_post', &$post, &$topic );
+        
+        return true;
+    }
+    
+    return false;
+}
+
+// function groups_delete_forum_post( $post_id, $topic_id ) {
+//  global $bp;
+//  
+//  if ( bp_forums_delete_topic( array( 'topic_id' => $topic_id ) ) ) {
+//      /* Delete the activity stream item */
+//      if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
+//          bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'secondary_item_id' => $post_id 'component_name' => 'groups', 'component_action' => 'new_forum_post' ) );
+//      }
+// 
+//      do_action( 'groups_delete_forum_topic', $topic_id );
+//      
+//      return true;
+//  }
+//  
+//  return false;
+// }
 
 /*** Group Invitations *********************************************************/
@@ -2212 +2393 @@
     
     /* Record this in activity streams */
-    groups_record_activity( array( 'item_id' => $membership->group_id, 'component_name' => $bp->groups->slug, 'component_action' => 'joined_group', 'is_private' => 0 ) );
+    $group = new BP_Groups_Group( $group_id, false, false );
+
+    groups_record_activity( array(
+        'content' => sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), 
+        'primary_link' => bp_get_group_permalink( $group ),
+        'component_action' => 'joined_group',
+        'item_id' => $group->id,
+        'user_id' => $user_id
+    ) );
 
     /* Send a notification to the user. */

trunk/bp-groups/bp-groups-cssjs.php

@@ -1 +1 @@
 <?php
-/**************************************************************************
- groups_add_js()
-  
- Inserts the Javascript needed for managing groups.
- **************************************************************************/    
 
 function groups_add_js() {

trunk/bp-groups/bp-groups-templatetags.php

@@ -594 +594 @@
     }
 
+function bp_group_is_admin() {
+    global $bp;
+    
+    return $bp->is_item_admin;
+}
+
+function bp_group_is_mod() {
+    global $bp;
+    
+    return $bp->is_item_mod;
+}
+
 function bp_group_list_admins( $full_list = true, $group = false ) {
     global $groups_template;
@@ -689 +701 @@
     if ( $forum_id && $forum_id != '' ) {
         if ( function_exists( 'bp_forums_setup' ) ) {
-            $latest_topics = bp_forums_get_topics( $forum_id, $total_topics, 1 );
+            $latest_topics = bp_forums_get_forum_topics( $forum_id );
         
             if ( $latest_topics ) { ?>
@@ -1632 +1644 @@
     function bp_get_new_group_name() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_name', $bp->groups->new_group->name );
+        return apply_filters( 'bp_get_new_group_name', $bp->groups->current_group->name );
     }
 
@@ -1640 +1652 @@
     function bp_get_new_group_description() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_description', $bp->groups->new_group->name );
+        return apply_filters( 'bp_get_new_group_description', $bp->groups->current_group->name );
     }
 
@@ -1648 +1660 @@
     function bp_get_new_group_news() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_news', $bp->groups->new_group->name );
+        return apply_filters( 'bp_get_new_group_news', $bp->groups->current_group->name );
     }
 
@@ -1656 +1668 @@
     function bp_get_new_group_enable_wire() {
         global $bp;
-        return (int) apply_filters( 'bp_get_new_group_enable_wire', $bp->groups->new_group->enable_wire );
+        return (int) apply_filters( 'bp_get_new_group_enable_wire', $bp->groups->current_group->enable_wire );
     }
 
@@ -1664 +1676 @@
     function bp_get_new_group_enable_forum() {
         global $bp;
-        return (int) apply_filters( 'bp_get_new_group_enable_forum', $bp->groups->new_group->enable_forum );
+        return (int) apply_filters( 'bp_get_new_group_enable_forum', $bp->groups->current_group->enable_forum );
     }
 
@@ -1672 +1684 @@
     function bp_get_new_group_status() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_status', $bp->groups->new_group->status );
+        return apply_filters( 'bp_get_new_group_status', $bp->groups->current_group->status );
     }
 
@@ -1680 +1692 @@
     function bp_get_new_group_avatar_thumb() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_avatar_thumb', $bp->groups->new_group->avatar_thumb );
+        return apply_filters( 'bp_get_new_group_avatar_thumb', $bp->groups->current_group->avatar_thumb );
     }
 
@@ -1688 +1700 @@
     function bp_get_new_group_avatar_full() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_avatar_full', $bp->groups->new_group->avatar_full );
+        return apply_filters( 'bp_get_new_group_avatar_full', $bp->groups->current_group->avatar_full );
     }
 
@@ -1775 +1787 @@
         }
         
-        return implode( "\n", $items );
+        return implode( "\n", (array)$items );
     }
 
@@ -2572 +2584 @@
         return false;
 
-        $friends = friends_get_friends_invite_list( $bp->loggedin_user->id, $bp->groups->new_group->id );
+        $friends = friends_get_friends_invite_list( $bp->loggedin_user->id, $bp->groups->current_group->id );
 
         if ( $friends ) {
-            $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $bp->groups->new_group->id );
+            $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $bp->groups->current_group->id );
 
     ?>
@@ -2630 +2642 @@
         case 'group-details': ?>
             <label for="group-name">* <?php _e('Group Name', 'buddypress') ?></label>
-            <input type="text" name="group-name" id="group-name" value="<?php echo attribute_escape( ( $bp->groups->new_group ) ? $bp->groups->new_group->name : $_POST['group-name'] ); ?>" />
+            <input type="text" name="group-name" id="group-name" value="<?php echo attribute_escape( ( $bp->groups->new_group ) ? $bp->groups->current_group->name : $_POST['group-name'] ); ?>" />
         
             <label for="group-desc">* <?php _e('Group Description', 'buddypress') ?></label>
-            <textarea name="group-desc" id="group-desc"><?php echo htmlspecialchars( ( $bp->groups->new_group ) ? $bp->groups->new_group->description : $_POST['group-desc'] ); ?></textarea>
+            <textarea name="group-desc" id="group-desc"><?php echo htmlspecialchars( ( $bp->groups->new_group ) ? $bp->groups->current_group->description : $_POST['group-desc'] ); ?></textarea>
         
             <label for="group-news"><?php _e('Recent News', 'buddypress') ?></label>
-            <textarea name="group-news" id="group-news"><?php echo htmlspecialchars( ( $bp->groups->new_group ) ? $bp->groups->new_group->news : $_POST['group-news'] ); ?></textarea>
+            <textarea name="group-news" id="group-news"><?php echo htmlspecialchars( ( $bp->groups->new_group ) ? $bp->groups->current_group->news : $_POST['group-news'] ); ?></textarea>
             
             <?php do_action( 'groups_custom_group_fields_editable' ) ?>
@@ -2648 +2660 @@
                 <?php if ( function_exists('bp_wire_install') ) : ?>
                 <div class="checkbox">
-                    <label><input type="checkbox" name="group-show-wire" id="group-show-wire" value="1"<?php if ( $bp->groups->new_group->enable_wire ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable comment wire', 'buddypress') ?></label>
+                    <label><input type="checkbox" name="group-show-wire" id="group-show-wire" value="1"<?php if ( $bp->groups->current_group->enable_wire ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable comment wire', 'buddypress') ?></label>
                 </div>
                 <?php endif; ?>
@@ -2655 +2667 @@
                     <?php if ( bp_forums_is_installed_correctly() ) { ?>
                         <div class="checkbox">
-                            <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php if ( $bp->groups->new_group->enable_forum ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable discussion forum', 'buddypress') ?></label>
+                            <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php if ( $bp->groups->current_group->enable_forum ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable discussion forum', 'buddypress') ?></label>
                         </div>
                     <?php } else {
@@ -2670 +2682 @@
                 <?php if ( function_exists('bp_albums_install') ) : ?>
                 <div class="checkbox with-suboptions">
-                    <label><input type="checkbox" name="group-show-photos" id="group-show-photos" value="1"<?php if ( $bp->groups->new_group->enable_photos ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable photo gallery', 'buddypress') ?></label>
-                    <div class="sub-options"<?php if ( !$bp->groups->new_group->enable_photos ) { ?> style="display: none;"<?php } ?>>
-                        <label><input type="radio" name="group-photos-status" value="all"<?php if ( !$bp->groups->new_group->photos_admin_only ) { ?> checked="checked"<?php } ?> /> <?php _e('All members can upload photos', 'buddypress') ?></label>
-                        <label><input type="radio" name="group-photos-status" value="admins"<?php if ( $bp->groups->new_group->photos_admin_only ) { ?> checked="checked"<?php } ?> /> <?php _e('Only group admins can upload photos', 'buddypress') ?></label>
+                    <label><input type="checkbox" name="group-show-photos" id="group-show-photos" value="1"<?php if ( $bp->groups->current_group->enable_photos ) { ?> checked="checked"<?php } ?> /> <?php _e('Enable photo gallery', 'buddypress') ?></label>
+                    <div class="sub-options"<?php if ( !$bp->groups->current_group->enable_photos ) { ?> style="display: none;"<?php } ?>>
+                        <label><input type="radio" name="group-photos-status" value="all"<?php if ( !$bp->groups->current_group->photos_admin_only ) { ?> checked="checked"<?php } ?> /> <?php _e('All members can upload photos', 'buddypress') ?></label>
+                        <label><input type="radio" name="group-photos-status" value="admins"<?php if ( $bp->groups->current_group->photos_admin_only ) { ?> checked="checked"<?php } ?> /> <?php _e('Only group admins can upload photos', 'buddypress') ?></label>
                     </div>
                 </div>
@@ -2681 +2693 @@
             
                 <div class="radio">
-                    <label><input type="radio" name="group-status" value="public"<?php if ( 'public' == $bp->groups->new_group->status ) { ?> checked="checked"<?php } ?> /> 
+                    <label><input type="radio" name="group-status" value="public"<?php if ( 'public' == $bp->groups->current_group->status ) { ?> checked="checked"<?php } ?> /> 
                         <strong><?php _e( 'This is a public group', 'buddypress' ) ?></strong>
                         <ul>
@@ -2690 +2702 @@
                     </label>
                     
-                    <label><input type="radio" name="group-status" value="private"<?php if ( 'private' == $bp->groups->new_group->status ) { ?> checked="checked"<?php } ?> />
+                    <label><input type="radio" name="group-status" value="private"<?php if ( 'private' == $bp->groups->current_group->status ) { ?> checked="checked"<?php } ?> />
                         <strong><?php _e( 'This is a private group', 'buddypress' ) ?></strong>
                         <ul>
@@ -2699 +2711 @@
                     </label>
                     
-                    <label><input type="radio" name="group-status" value="hidden"<?php if ( 'hidden' == $bp->groups->new_group->status ) { ?> checked="checked"<?php } ?> />
+                    <label><input type="radio" name="group-status" value="hidden"<?php if ( 'hidden' == $bp->groups->current_group->status ) { ?> checked="checked"<?php } ?> />
                         <strong><?php _e('This is a hidden group', 'buddypress') ?></strong>
                         <ul>

trunk/bp-status/bp-status-filters.php

@@ -1 +1 @@
 <?php
 
-add_filter( 'bp_get_the_status', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_the_status', 'bp_status_filter_tags' );
+add_filter( 'bp_get_the_status', 'force_balance_tags' );
 add_filter( 'bp_get_the_status', 'wptexturize' );
 add_filter( 'bp_get_the_status', 'convert_smilies' );
@@ -8 +9 @@
 add_filter( 'bp_get_the_status', 'stripslashes_deep' );
 
+function bp_status_filter_tags( $status ) {
+    return apply_filters( 'bp_status_filter_tags', strip_tags( $status, '<a>' ) );
+}
+
 ?>

trunk/bp-wire.php

@@ -98 +98 @@
  */
 
-function bp_wire_new_post( $item_id, $message, $component_name, $private_post = false, $table_name = null ) {
+function bp_wire_new_post( $item_id, $message, $component_name, $deprecated = false, $table_name = null ) {
     global $bp;
     
@@ -119 +119 @@
     if ( !$wire_post->save() )
         return false;
-    
-    if ( !$private_post ) {
-        // Record in the activity streams
-        bp_wire_record_activity( array( 'item_id' => $wire_post->id, 'component_name' => $component_name, 'component_action' => 'new_wire_post', 'is_private' => 0 ) );
-    }
     
     do_action( 'bp_wire_post_posted', $wire_post->id, $wire_post->item_id, $wire_post->user_id );
@@ -151 +146 @@
         return false;
 
-    // Delete activity stream items
-    bp_wire_delete_activity( array( 'user_id' => $wire_post->user_id, 'item_id' => $wire_post->id, 'component_name' => $component_name, 'component_action' => 'new_wire_post' ) );  
-
     do_action( 'bp_wire_post_deleted', $wire_post->id, $wire_post->item_id, $wire_post->user_id );