Changeset 3300

trunk/bp-activity.php

-                      r2863
+                      r3300
 function bp_activity_setup_globals() {
     global $bp, $wpdb, $current_blog;
+    global $bp, $current_blog;
     if ( !defined( 'BP_ACTIVITY_SLUG' ) )
         define ( 'BP_ACTIVITY_SLUG', $bp->pages->activity->slug );
     /* For internal identification */
+    // For internal identification
     $bp->activity->id = 'activity';
     $bp->activity->name = $bp->pages->activity->name;
     $bp->activity->slug = BP_ACTIVITY_SLUG;
+    $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity';
+    $bp->activity->table_name_meta = $wpdb->base_prefix . 'bp_activity_meta';
+    $bp->activity->table_name      = $bp->table_prefix . 'bp_activity';
+    $bp->activity->table_name_meta = $bp->table_prefix . 'bp_activity_meta';
     $bp->activity->format_notification_function = 'bp_activity_format_notifications';
     /* Register this in the active components array */
+    // Register this in the active components array
     $bp->active_components[$bp->activity->slug] = $bp->activity->id;
 …
     if ( bp_is_active( 'groups' ) )
         bp_core_new_subnav_item( array( 'name' => __( 'Groups', 'buddypress' ), 'slug' => $bp->groups->name, 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->name, 'screen_function' => 'bp_activity_screen_groups', 'position' => 30, 'item_css_id' => 'activity-groups' ) );
+        bp_core_new_subnav_item( array( 'name' => __( 'Groups', 'buddypress' ), 'slug' => BP_GROUPS_SLUG, 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->name, 'screen_function' => 'bp_activity_screen_groups', 'position' => 30, 'item_css_id' => 'activity-groups' ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Favorites', 'buddypress' ), 'slug' => 'favorites', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->name, 'screen_function' => 'bp_activity_screen_favorites', 'position' => 40, 'item_css_id' => 'activity-favs' ) );
 …
         return false;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         $bp->is_item_admin = false;
 …
         return false;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         $bp->is_item_admin = false;
 …
     global $bp;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         $bp->is_item_admin = false;
 …
     global $bp;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         $bp->is_item_admin = false;
 …
             bp_core_redirect( $bp->loggedin_user->domain );
         else
             bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . clean_url( $bp->root_domain . '/' . $bp->activity->slug . '/p/' . $bp->current_action ) ) );
+            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( $bp->root_domain . '/' . $bp->activity->slug . '/p/' . $bp->current_action ) ) );
+    }
 …
 function bp_activity_screen_notification_settings() {
     global $bp; ?>
+    <table class="notification-settings" id="activity-notification-settings">
+        <tr>
+            <th class="icon"></th>
+            <th class="title"><?php _e( 'Activity', 'buddypress' ) ?></th>
+            <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+            <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php printf( __( "A member replies to an update or comment you've posted", 'buddypress' ), $current_user->user_login ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <?php do_action( 'bp_activity_screen_notification_settings' ) ?>
+    <table class="notification-settings zebra" id="activity-notification-settings">
+        <thead>
+            <tr>
+                <th class="icon"></th>
+                <th class="title"><?php _e( 'Activity', 'buddypress' ) ?></th>
+                <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+                <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td></td>
+                <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_mention', true ) || 'yes' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td><?php printf( __( "A member replies to an update or comment you've posted", 'buddypress' ), $current_user->user_login ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) || 'yes' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <?php do_action( 'bp_activity_screen_notification_settings' ) ?>
+        </tbody>
     </table>
 <?php
 …
     /* Check access */
     if ( !is_site_admin() && $activity->user_id != $bp->loggedin_user->id )
+    if ( !is_super_admin() && $activity->user_id != $bp->loggedin_user->id )
         return false;
 …
 function bp_activity_add( $args = '' ) {
     global $bp, $wpdb;
+    global $bp;
     $defaults = array(
         'id' => false, // Pass an existing activity ID to update an existing entry.
         'action' => '', // The activity action - e.g. "Jon Doe posted an update"
         'content' => '', // Optional: The content of the activity item e.g. "BuddyPress is awesome guys!"
         'component' => false, // The name/ID of the component e.g. groups, profile, mycomponent
         'type' => false, // The activity type e.g. activity_update, profile_updated
         'primary_link' => '', // Optional: The primary URL for this item in RSS feeds (defaults to activity permalink)
         'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user.
         'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id
+        'id'                => false, // Pass an existing activity ID to update an existing entry.
+        'action'            => '', // The activity action - e.g. "Jon Doe posted an update"
+        'content'           => '', // Optional: The content of the activity item e.g. "BuddyPress is awesome guys!"
+        'component'         => false, // The name/ID of the component e.g. groups, profile, mycomponent
+        'type'              => false, // The activity type e.g. activity_update, profile_updated
+        'primary_link'      => '', // Optional: The primary URL for this item in RSS feeds (defaults to activity permalink)
+        'user_id'           => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user.
+        'item_id'           => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id
         'secondary_item_id' => false, // Optional: A second ID used to further filter e.g. a comment_id
         'recorded_time' => gmdate( "Y-m-d H:i:s" ), // The GMT time that this activity was recorded
         'hide_sitewide' => false // Should this be hidden on the sitewide activity stream?
+        'recorded_time'     => bp_core_current_time(), // The GMT time that this activity was recorded
+        'hide_sitewide'     => false // Should this be hidden on the sitewide activity stream?
     );
 …
     /* Add this update to the "latest update" usermeta so it can be fetched anywhere. */
     update_usermeta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
+    update_user_meta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
     /* Require the notifications code so email notifications can be set on the 'bp_activity_posted_update' action. */
 …
         $user_id = $args['user_id'];
     $latest_update = get_usermeta( $user_id, 'bp_latest_update' );
+    $latest_update = get_user_meta( $user_id, 'bp_latest_update', true );
     if ( !empty( $latest_update ) ) {
         if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) )
             delete_usermeta( $user_id, 'bp_latest_update' );
+            delete_user_meta( $user_id, 'bp_latest_update' );
+    }
 …
 function bp_activity_get_user_favorites( $user_id ) {
     $my_favs = maybe_unserialize( get_usermeta( $user_id, 'bp_favorite_activities' ) );
+    $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
     $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) );
 …
     $new_favs = array_unique( (array)$new_favs );
     update_usermeta( $user_id, 'bp_favorite_activities', $new_favs );
+    update_user_meta( $user_id, 'bp_favorite_activities', $new_favs );
     return apply_filters( 'bp_activity_get_user_favorites', $new_favs );
 …
     /* Update the user's personal favorites */
     $my_favs = maybe_unserialize( get_usermeta( $bp->loggedin_user->id, 'bp_favorite_activities' ) );
+    $my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) );
     $my_favs[] = $activity_id;
 …
         $fav_count = 1;
     update_usermeta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs );
+    update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs );
     bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count );
 …
     /* Remove the fav from the user's favs */
     $my_favs = maybe_unserialize( get_usermeta( $user_id, 'bp_favorite_activities' ) );
+    $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
     $my_favs = array_flip( (array) $my_favs );
     unset( $my_favs[$activity_id] );
 …
+    }
     update_usermeta( $user_id, 'bp_favorite_activities', $my_favs );
+    update_user_meta( $user_id, 'bp_favorite_activities', $my_favs );
     do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id );
 …
     // Remove any usermeta
     delete_usermeta( $user_id, 'bp_latest_update' );
     delete_usermeta( $user_id, 'bp_favorite_activities' );
+    delete_user_meta( $user_id, 'bp_latest_update' );
+    delete_user_meta( $user_id, 'bp_favorite_activities' );
     do_action( 'bp_activity_remove_data', $user_id );
 …
 add_action( 'make_spam_user', 'bp_activity_remove_data' );
+/**
+ * updates_register_activity_actions()
+ *
+ * Register the activity stream actions for updates
+ *
+ * @global array $bp
+ */
+function updates_register_activity_actions() {
+    global $bp;
+    bp_activity_set_action( $bp->activity->id, 'activity_update', __( 'Posted an update', 'buddypress' ) );
+    do_action( 'updates_register_activity_actions' );
+}
+add_action( 'bp_register_activity_actions', 'updates_register_activity_actions' );
 /********************************************************************************
 …
     do_action( 'bp_register_activity_actions' );
+}
 add_action( 'plugins_loaded', 'bp_register_activity_actions' );
+add_action( 'bp_loaded', 'bp_register_activity_actions', 8 );

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

-                      r3236
+                      r3300
         $where_conditions = array();
+        /* Searching */
+        if ( $search_terms ) {
+            $search_terms = $wpdb->escape( $search_terms );
+            $where_conditions['search_sql'] = "a.content LIKE '%%" . like_escape( $search_terms ) . "%%'";
+        }
         /* Filtering */
         if ( $filter && $filter_sql = BP_Activity_Activity::get_filter_sql( $filter ) )
 …
         $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
-        /* Searching */
-        if ( $search_terms ) {
-            $search_terms = $wpdb->escape( $search_terms );
-            if ( !empty( $filter['user_id'] ) )
-                $where_sql .= ' OR ';
-            else if ( !empty( $where_conditions ) )
-                $where_sql .= ' AND ';
-            $where_sql .= "a.content LIKE '%%" . like_escape( $search_terms ) . "%%'";
+        }
         if ( $per_page && $page ) {
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
             $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) ) );
         } else
+        } else {
             $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $select_sql, $from_sql, $where_sql, $sort ) ) );
+        }
         $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(a.id) FROM {$bp->activity->table_name} a {$where_sql} ORDER BY a.date_recorded {$sort}" ) );
 …
         global $bp, $wpdb;
         return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded ASC LIMIT 1" ) );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" ) );
+    }
 …
         global $bp;
         if ( !$favorite_activity_entries = get_usermeta( $user_id, 'bp_favorite_activities' ) )
+        if ( !$favorite_activity_entries = get_user_meta( $user_id, 'bp_favorite_activities', true ) )
             return 0;

trunk/bp-activity/bp-activity-notifications.php

-                      r3232
+                      r3300
     /* Scan for @username strings in an activity update. Notify each user. */
     $pattern = '/[@]+([A-Za-z0-9-_]+)/';
+    $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
     preg_match_all( $pattern, $content, $usernames );
 …
     foreach( (array)$usernames as $username ) {
         if ( !$receiver_user_id = bp_core_get_userid($username) )
+        if ( !$receiver_user_id = bp_core_get_userid( $username ) )
             continue;
         // Now email the user with the contents of the message (if they have enabled email notifications)
         if ( 'no' != get_usermeta( $receiver_user_id, 'notification_activity_new_mention' ) ) {
+        if ( 'no' != get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
             $poster_name = bp_core_get_user_displayname( $poster_user_id );
 …
             // Set up and send the message
+            $ud = bp_core_get_core_userdata( $receiver_user_id );
+            $to = $ud->user_email;
+            $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
+            $ud       = bp_core_get_core_userdata( $receiver_user_id );
+            $to       = $ud->user_email;
+            $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+            $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
 $message = sprintf( __(
 …
     $original_activity = new BP_Activity_Activity( $activity_id );
     if ( $original_activity->user_id != $commenter_id && 'no' != get_usermeta( $original_activity->user_id, 'notification_activity_new_reply' ) ) {
+    if ( $original_activity->user_id != $commenter_id && 'no' != get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) {
         $poster_name = bp_core_get_user_displayname( $commenter_id );
         $thread_link = bp_activity_get_permalink( $activity_id );
 …
         // Set up and send the message
+        $ud = bp_core_get_core_userdata( $original_activity->user_id );
+        $to = $ud->user_email;
+        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
+        $ud       = bp_core_get_core_userdata( $original_activity->user_id );
+        $to       = $ud->user_email;
+        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+        $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
 $message = sprintf( __(
 …
     $parent_comment = new BP_Activity_Activity( $parent_id );
     if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != get_usermeta( $parent_comment->user_id, 'notification_activity_new_reply' ) ) {
+    if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) {
         $poster_name = bp_core_get_user_displayname( $commenter_id );
         $thread_link = bp_activity_get_permalink( $activity_id );
 …
         // Set up and send the message
+        $ud = bp_core_get_core_userdata( $parent_comment->user_id );
+        $to = $ud->user_email;
+        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
+        $ud       = bp_core_get_core_userdata( $parent_comment->user_id );
+        $to       = $ud->user_email;
+        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+        $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
         $poster_name = stripslashes( $poster_name );

trunk/bp-activity/bp-activity-templatetags.php

-                      r3263
+                      r3300
         // Get an array of the logged in user's favorite activities
         $this->my_favs = maybe_unserialize( get_usermeta( $bp->loggedin_user->id, 'bp_favorite_activities' ) );
+        $this->my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) );
         // Fetch specific activity items based on ID's
         if ( !empty( $include ) )
             $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments ) );
+        // Fetch all activity items
         else
             $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden ) );
 …
         $primary_id = $bp->groups->current_group->id;
         if ( 'public' != $bp->groups->current_group->status && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+        if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
             $show_hidden = true;
+    }
 …
         // are we displaying user specific activity?
         if ( is_numeric( $user_id ) ) {
             $show_hidden = ( $user_id == $bp->loggedin_user->id ) ? 1 : 0;
+            $show_hidden = ( $user_id == $bp->loggedin_user->id && $scope != 'friends' ) ? 1 : 0;
             switch ( $scope ) {
 …
         global $bp, $activities_template;
+        $from_num = bp_core_number_format( intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1 );
+        $to_num = bp_core_number_format( ( $from_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1 ) );
+        $start_num = intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1;
+        $from_num = bp_core_number_format( $start_num );
+        $to_num = bp_core_number_format( ( $start_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $start_num + ( $activities_template->pag_num - 1 ) );
         $total = bp_core_number_format( $activities_template->total_activity_count );
         return sprintf( __( 'Viewing item %s to %s (of %s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' &nbsp; <span class="ajax-loader"></span>';
+        return sprintf( __( 'Viewing item %1$s to %2$s (of %3$s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' &nbsp; <span class="ajax-loader"></span>';
+    }
 …
+    }
+/**
+ * bp_activity_avatar( $args )
+ *
+ * Output the avatar of the user that performed the action
+ *
+ * @param array $args
+ */
 function bp_activity_avatar( $args = '' ) {
     echo bp_get_activity_avatar( $args );
+}
+    /**
+     * bp_get_activity_avatar( $args )
+     *
+     * Return the avatar of the user that performed the action
+     *
+     * @global array $bp
+     * @global object $activities_template
+     * @param array $args optional
+     * @return string
+     */
     function bp_get_activity_avatar( $args = '' ) {
         global $bp, $activities_template;
         $defaults = array(
             'type' => 'thumb',
             'width' => 20,
+            'type'   => 'thumb',
+            'width'  => 20,
             'height' => 20,
             'class' => 'avatar',
             'alt' => __( 'Avatar', 'buddypress' ),
             'email' => false
+            'class'  => 'avatar',
+            'alt'    => __( 'Avatar', 'buddypress' ),
+            'email'  => false
         );
 …
         extract( $r, EXTR_SKIP );
+        $item_id = false;
+        if ( (int)$activities_template->activity->user_id )
+            $item_id = $activities_template->activity->user_id;
+        else if ( $activities_template->activity->item_id )
+            $item_id = $activities_template->activity->item_id;
+        $object = 'user';
+        if ( $bp->groups->id == $activities_template->activity->component && !(int) $activities_template->activity->user_id )
+            $object = 'group';
+        if ( $bp->blogs->id == $activities_template->activity->component && !(int) $activities_template->activity->user_id )
+            $object = 'blog';
+        $object = apply_filters( 'bp_get_activity_avatar_object_' . $activities_template->activity->component, $object );
+        /* If this is a user object pass the users' email address for Gravatar so we don't have to refetch it. */
+        if ( 'user' == $object && empty($email) )
+        // Primary activity avatar is always a user, but can be modified via a filter
+        $object  = apply_filters( 'bp_get_activity_avatar_object_' . $activities_template->activity->component, 'user' );
+        $item_id = apply_filters( 'bp_get_activity_avatar_item_id', $activities_template->activity->user_id );
+        // If this is a user object pass the users' email address for Gravatar so we don't have to refetch it.
+        if ( 'user' == $object && empty( $email ) )
             $email = $activities_template->activity->user_email;
         return apply_filters( 'bp_get_activity_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $email ) ) );
+    }
+/**
+ * bp_activity_secondary_avatar( $args )
+ *
+ * Output the avatar of the object that action was performed on
+ *
+ * @param array $args optional
+ */
+function bp_activity_secondary_avatar( $args = '' ) {
+    echo bp_get_activity_secondary_avatar( $args );
+}
+    /**
+     * bp_get_activity_secondary_avatar( $args )
+     *
+     * Return the avatar of the object that action was performed on
+     *
+     * @global array $bp
+     * @global object $activities_template
+     * @param array $args optional
+     * @return string
+     */
+    function bp_get_activity_secondary_avatar( $args = '' ) {
+        global $bp, $activities_template;
+        $defaults = array(
+            'type'   => 'thumb',
+            'width'  => 20,
+            'height' => 20,
+            'class'  => 'avatar',
+            'alt'    => __( 'Avatar', 'buddypress' ),
+            'email'  => false
+        );
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+        // Set item_id and object (default to user)
+        switch ( $activities_template->activity->component ) {
+            case 'groups' :
+                $object = 'group';
+                $item_id = $activities_template->activity->item_id;
+                break;
+            case 'blogs' :
+                $object = 'blog';
+                $item_id = $activities_template->activity->item_id;
+                break;
+            case 'friends' :
+                $object  = 'user';
+                $item_id = $activities_template->activity->secondary_item_id;
+                break;
+            default :
+                $object  = 'user';
+                $item_id = $activities_template->activity->user_id;
+                $email = $activities_template->activity->user_email;
+                break;
+        }
+        // Allow object and item_id to be filtered
+        $object  = apply_filters( 'bp_get_activity_secondary_avatar_object_' . $activities_template->activity->component, $object );
+        $item_id = apply_filters( 'bp_get_activity_secondary_avatar_item_id', $item_id );
+        // If we have no item_id or object, there is no avatar to display
+        if ( empty( $item_id ) || empty( $object ) )
+            return false;
+        return apply_filters( 'bp_get_activity_secondary_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $email ) ) );
+    }
 …
         $action = $activities_template->activity->action;
+        $action = apply_filters( 'bp_get_activity_action_pre_meta', $action, &$activities_template->activity );
         if ( !empty( $action ) )
 …
         global $activities_template, $bp;
+        $meta = '<span class="activity-actions">';
+        /* Strip any legacy time since placeholders -- TODO: Remove this in 1.3 */
+        $content = str_replace( '<span class="time-since">%s</span>', '', $content );
         /* Insert the time since. */
         $meta .= apply_filters( 'bp_activity_time_since', '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity );
+        $content .= ' ' . apply_filters( 'bp_activity_time_since', '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity );
         /* Insert the permalink */
         $meta .= apply_filters( 'bp_activity_permalink', ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', &$activities_template->activity );
+        $content .= apply_filters( 'bp_activity_permalink', ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', &$activities_template->activity );
         /* Add the delete link if the user has permission on this item */
+        if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || $bp->loggedin_user->is_site_admin )
+             $meta .= apply_filters( 'bp_activity_delete_link', ' &middot; ' . bp_get_activity_delete_link(), &$activities_template->activity );
+        $meta .= '</span>';
+        return apply_filters( 'bp_insert_activity_meta', $content . ' ' . $meta, $content, $meta );
+        if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || $bp->loggedin_user->is_super_admin )
+             $content .= apply_filters( 'bp_activity_delete_link', ' &middot; ' . bp_get_activity_delete_link(), &$activities_template->activity );
+        return apply_filters( 'bp_insert_activity_meta', $content );
+    }
 …
                 $content .= '<li id="acomment-' . $comment->id . '">';
                 $content .= '<div class="acomment-avatar"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => 25, 'height' => 25, 'email' => $comment->user_email ) ) . '</a></div>';
                 $content .= '<div class="acomment-meta"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . apply_filters( 'bp_get_member_name', $comment->user_fullname ) . '</a> &middot; ' . sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( strtotime( $comment->date_recorded ) ) );
+                $content .= '<div class="acomment-avatar"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => 20, 'height' => 20, 'email' => $comment->user_email ) ) . '</a></div>';
+                $content .= '<div class="acomment-meta"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . apply_filters( 'bp_acomment_name', $comment->user_fullname, $comment ) . '</a> &middot; ' . sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $comment->date_recorded ) );
                 /* Reply link - the span is so that threaded reply links can be hidden when JS is off. */
 …
                 /* Delete link */
                 if ( $bp->loggedin_user->is_site_admin || $bp->loggedin_user->id == $comment->user_id )
+                if ( $bp->loggedin_user->is_super_admin || $bp->loggedin_user->id == $comment->user_id )
                     $content .= ' &middot; <a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/?cid=' . $comment->id, 'bp_activity_delete_link' ) . '" class="delete acomment-delete">' . __( 'Delete', 'buddypress' ) . '</a>';
 …
             $user_id = $bp->displayed_user->id;
         if ( !$update = get_usermeta( $user_id, 'bp_latest_update' ) )
+        if ( !$update = get_user_meta( $user_id, 'bp_latest_update', true ) )
             return false;
         $latest_update = '&quot;' . trim( strip_tags( bp_create_excerpt( $update['content'], 40 ) ) ) . '&quot;';
+        $latest_update = '&quot;' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 40 ) ) ) ) . '&quot;';
         $latest_update .= ' &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $update['id'] . '/"> ' . __( 'View', 'buddypress' ) . '</a>';
 …
                 unset($selected);
             $component = attribute_escape( $component );
+            $component = esc_attr( $component );
             switch ( $style ) {
 …
             $translatable_components = array( __( 'profile', 'buddypress'), __( 'friends', 'buddypress' ), __( 'groups', 'buddypress' ), __( 'status', 'buddypress' ), __( 'blogs', 'buddypress' ) );
             $component_links[] = $before . '<a href="' . attribute_escape( $link ) . '">' . ucwords( __( $component, 'buddypress' ) ) . '</a>' . $after;
+            $component_links[] = $before . '<a href="' . esc_attr( $link ) . '">' . ucwords( __( $component, 'buddypress' ) ) . '</a>' . $after;
+        }
 …
         if ( isset( $_GET['afilter'] ) )
             $component_links[] = '<' . $tag . ' id="afilter-clear"><a href="' . attribute_escape( $link ) . '"">' . __( 'Clear Filter', 'buddypress' ) . '</a></' . $tag . '>';
+            $component_links[] = '<' . $tag . ' id="afilter-clear"><a href="' . esc_attr( $link ) . '"">' . __( 'Clear Filter', 'buddypress' ) . '</a></' . $tag . '>';
         return apply_filters( 'bp_get_activity_filter_links', implode( "\n", $component_links ) );
 …
+}
     function bp_get_total_mention_count_for_user( $user_id = false ) {
         return apply_filters( 'bp_get_total_mention_count_for_user', get_usermeta( $user_id, 'bp_new_mention_count' ) );
+        return apply_filters( 'bp_get_total_mention_count_for_user', get_user_meta( $user_id, 'bp_new_mention_count', true ) );
+    }

trunk/bp-activity/feeds/bp-activity-favorites-feed.php

r2600	r3300
15	15	xmlns:dc="http://purl.org/dc/elements/1.1/"
16	16	xmlns:atom="http://www.w3.org/2005/Atom"
17		<?php do_action('bp_activity_~~mention~~s_feed'); ?>
	17	<?php do_action('bp_activity_favorites_feed'); ?>
18	18	>
19	19

trunk/bp-blogs.php

-                      r3232
+                      r3300
     global $bp, $wpdb;
+    if ( !defined( 'BP_BLOGS_SLUG' ) )
+        define ( 'BP_BLOGS_SLUG', $bp->pages->blogs->slug );
     /* For internal identification */
     $bp->blogs->id = 'blogs';
 …
     /* Add 'Blogs' to the main navigation */
     bp_core_new_nav_item( array( 'name' => sprintf( __( 'Blogs <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ), 'slug' => $bp->blogs->name, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
     $blogs_link = $bp->loggedin_user->domain . $bp->blogs->name . '/';
+    bp_core_new_nav_item( array( 'name' => sprintf( __( 'Blogs <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
+    $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';
     /* Set up the component options navigation for Blog */
 …
+}
-function bp_blogs_screen_recent_posts() {
-    do_action( 'bp_blogs_screen_recent_posts' );
-    bp_core_load_template( apply_filters( 'bp_blogs_template_recent_posts', 'members/single/home' ) );
+}
-function bp_blogs_screen_recent_comments() {
-    do_action( 'bp_blogs_screen_recent_comments' );
-    bp_core_load_template( apply_filters( 'bp_blogs_template_recent_comments', 'members/single/home' ) );
+}
 function bp_blogs_screen_create_a_blog() {
     global $bp;
 …
         'item_id' => false,
         'secondary_item_id' => false,
         'recorded_time' => gmdate( "Y-m-d H:i:s" ),
+        'recorded_time' => bp_core_current_time(),
         'hide_sitewide' => false
     );
 …
     if ( !empty( $content ) )
         $content = apply_filters( 'bp_blogs_record_activity_content', bp_create_excerpt( $content ) );
+        $content = apply_filters( 'bp_blogs_record_activity_content', bp_create_excerpt( $content ), $content );
     /* Check for an existing entry and update if one exists. */
 …
+}
 function bp_blogs_record_existing_blogs() {
     global $bp, $wpdb;
 …
+}
+/**
+ * Makes BuddyPress aware of a new site so that it can track its activity.
+ *
+ * @global object $bp BuddyPress global settings
+ * @param int $blog_id
+ * @param int $user_id
+ * @param $bool $no_activity ; optional.
+ * @since 1.0
+ * @uses BP_Blogs_Blog
+ */
 function bp_blogs_record_blog( $blog_id, $user_id, $no_activity = false ) {
     global $bp;
 …
     bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'name', $name );
     bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'description', $description );
     bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
     /* Only record this activity if the blog is public */
+    bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', bp_core_current_time() );
+    // Only record this activity if the blog is public
     if ( (int)$_POST['blog_public'] && !$no_activity ) {
         /* Record this in activity streams */
+        // Record this in activity streams
         bp_blogs_record_activity( array(
             'user_id' => $recorded_blog->user_id,
             'action' => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%1$s created the blog %2$s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
             'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_blog_option( $recorded_blog->blog_id, 'siteurl' ), $recorded_blog->blog_id ),
             'type' => 'new_blog',
             'item_id' => $recorded_blog->blog_id
+            'user_id'      => $recorded_blog->user_id,
+            'action'       => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_site_url( $recorded_blog->blog_id ) . '">' . esc_attr( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
+            'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_site_url( $recorded_blog->blog_id ), $recorded_blog->blog_id ),
+            'type'         => 'new_blog',
+            'item_id'      => $recorded_blog->blog_id
         ) );
+    }
 …
+}
 add_action( 'wpmu_new_blog', 'bp_blogs_record_blog', 10, 2 );
+/**
+ * bp_blogs_update_option_blogname()
+ *
+ * Updates blogname in BuddyPress blogmeta table
+ *
+ * @global object $wpdb DB Layer
+ * @param string $oldvalue Value before save (not used)
+ * @param string $newvalue Value to change meta to
+ */
+function bp_blogs_update_option_blogname( $oldvalue, $newvalue ) {
+    global $wpdb;
+    bp_blogs_update_blogmeta( $wpdb->blogid, 'name', $newvalue );
+}
+add_action( 'update_option_blogname', 'bp_blogs_update_option_blogname', 10, 2 );
+/**
+ * bp_blogs_update_option_blogdescription()
+ *
+ * Updates blogdescription in BuddyPress blogmeta table
+ *
+ * @global object $wpdb DB Layer
+ * @param string $oldvalue Value before save (not used)
+ * @param string $newvalue Value to change meta to
+ */
+function bp_blogs_update_option_blogdescription( $oldvalue, $newvalue ) {
+    global $wpdb;
+    bp_blogs_update_blogmeta( $wpdb->blogid, 'description', $newvalue );
+}
+add_action( 'update_option_blogdescription', 'bp_blogs_update_option_blogdescription', 10, 2 );
 function bp_blogs_record_post( $post_id, $post, $user_id = false ) {
 …
         $user_id = (int)$post->post_author;
     /* This is to stop infinate loops with Donncha's sitewide tags plugin */
+    /* This is to stop infinite loops with Donncha's sitewide tags plugin */
     if ( (int)$bp->site_options['tags_blog_id'] == (int)$blog_id )
         return false;
 …
         return false;
+    if ( !$is_recorded = BP_Blogs_Post::is_recorded( $post_id, $blog_id, $user_id ) ) {
+        if ( 'publish' == $post->post_status && '' == $post->post_password ) {
+            /* If we're on a multiblog install, record this post */
+            if ( bp_core_is_multisite() ) {
+                $recorded_post = new BP_Blogs_Post;
+                $recorded_post->user_id = $user_id;
+                $recorded_post->blog_id = $blog_id;
+                $recorded_post->post_id = $post_id;
+                $recorded_post->date_created = strtotime( $post->post_date );
+                $recorded_post_id = $recorded_post->save();
+                bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+            }
+            if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
+                /* Record this in activity streams */
+                $post_permalink = get_permalink( $post_id );
+                $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+                $activity_content = $post->post_content;
+                bp_blogs_record_activity( array(
+                    'user_id' => (int)$post->post_author,
+                    'action' => apply_filters( 'bp_blogs_activity_new_post_action', $activity_action, &$post, $post_permalink ),
+                    'content' => apply_filters( 'bp_blogs_activity_new_post_content', $activity_content, &$post, $post_permalink ),
+                    'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
+                    'type' => 'new_blog_post',
+                    'item_id' => $blog_id,
+                    'secondary_item_id' => $post_id,
+                    'recorded_time' => $post->post_date_gmt
+                ));
+            }
+        }
+    } else {
+        $existing_post = new BP_Blogs_Post( null, $blog_id, $post_id );
+        /* Delete the recorded post if the status is not published or it is password protected */
+        if ( 'publish' != $post->post_status || '' != $post->post_password ) {
+            return bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
+        /* If the post author has changed, delete the post and re-add it. */
+        } else if ( (int)$existing_post->user_id != (int)$post->post_author ) {
+            // Delete the existing recorded post
+            bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
+            // Re-record the post with the new author.
+            bp_blogs_record_post( $post_id );
+        }
+        bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+    if ( 'publish' == $post->post_status && '' == $post->post_password ) {
         if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
             /* Now re-record the post in the activity streams */
+            /* Record this in activity streams */
             $post_permalink = get_permalink( $post_id );
             $activity_action = sprintf( __( '%1$s wrote a new blog post: %2$s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+            $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
             $activity_content = $post->post_content;
 …
                 'secondary_item_id' => $post_id,
                 'recorded_time' => $post->post_date_gmt
             ) );
+            ));
+        }
+    }
+    bp_blogs_update_blogmeta( $blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+    do_action( 'bp_blogs_new_blog_post', $existing_post, $is_private, $is_recorded );
+    } else
+        bp_blogs_remove_post( $post_id, $blog_id );
+    bp_blogs_update_blogmeta( $blog_id, 'last_activity', bp_core_current_time() );
+    do_action( 'bp_blogs_new_blog_post', $post_id, $post, $user_id );
+}
 add_action( 'save_post', 'bp_blogs_record_post', 10, 2 );
+/**
+ * bp_blogs_record_comment()
+ *
+ * Record blog comment activity. Checks if blog is public and post is not
+ * password protected.
+ *
+ * @global object $wpdb
+ * @global $bp $bp
+ * @param int $comment_id
+ * @param bool $is_approved
+ * @return mixed
+ */
 function bp_blogs_record_comment( $comment_id, $is_approved = true ) {
     global $wpdb, $bp;
 …
     // If blog is public allow activity to be posted
     if ( get_blog_option( $blog_id, 'blog_public' ) ) {
         // Get activity related links
         $post_permalink = get_permalink( $recorded_comment->comment_post_ID );
 …
         // Prepare to record in activity streams
         $activity_action        = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
         $activity_content       = $recorded_comment->comment_content;
+        $activity_action    = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
+        $activity_content   = $recorded_comment->comment_content;
         // Record in activity streams
 …
 add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog_for_user', 10, 2 );
 function bp_blogs_remove_post( $post_id, $blog_id = false, $existing_post = false ) {
+function bp_blogs_remove_post( $post_id, $blog_id = false ) {
     global $current_blog, $bp;
 …
         $blog_id = (int)$current_blog->blog_id;
-    if ( !$existing_post )
-        $existing_post = new BP_Blogs_Post( null, $blog_id, $post_id );
-    // Delete post from the bp_blogs table
-    BP_Blogs_Post::delete( $post_id, $blog_id );
     // Delete activity stream item
     bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'secondary_item_id' => $post_id, 'component' => $bp->blogs->slug, 'type' => 'new_blog_post' ) );
 …
 function bp_blogs_remove_comment( $comment_id ) {
     global $wpdb, $bp;
-    $recorded_comment = new BP_Blogs_Comment( false, $wpdb->blogid, $comment_id );
-    BP_Blogs_Comment::delete( $comment_id, $wpdb->blogid );
     // Delete activity stream item
 …
     /* If this is regular blog, delete all data for that blog. */
     BP_Blogs_Blog::delete_blog_for_all( $blog_id );
-    BP_Blogs_Post::delete_posts_for_blog( $blog_id );
-    BP_Blogs_Comment::delete_comments_for_blog( $blog_id );
     // Delete activity stream item
 …
+}
-/* DEPRECATED - scheduled for removal. Please use the activity stream with a 'new_blog_post' filter. */
-function bp_blogs_get_posts_for_user( $user_id ) {
-    return BP_Blogs_Post::get_posts_for_user( $user_id );
+}
-/* DEPRECATED - scheduled for removal. Please use the activity stream with a 'new_blog_comment' filter. */
-function bp_blogs_get_comments_for_user( $user_id ) {
-    return BP_Blogs_Comment::get_comments_for_user( $user_id );
+}
-function bp_blogs_get_latest_posts( $blog_id = null, $limit = 5 ) {
-    global $bp;
-    if ( !is_numeric( $limit ) )
-        $limit = 5;
-    return BP_Blogs_Post::get_latest_posts( $blog_id, $limit );
+}
 function bp_blogs_get_all_blogs( $limit = null, $page = null ) {
     return BP_Blogs_Blog::get_all( $limit, $page );
 …
+}
-function bp_blogs_get_all_posts( $limit = null, $page = null ) {
-    return BP_Blogs_Post::get_all( $limit, $page );
+}
-function bp_blogs_total_post_count( $blog_id ) {
-    return BP_Blogs_Post::total_post_count( $blog_id );
+}
-function bp_blogs_total_comment_count( $blog_id, $post_id = false ) {
-    return BP_Blogs_Post::total_comment_count( $blog_id, $post_id );
+}
 function bp_blogs_is_blog_hidden( $blog_id ) {
     return BP_Blogs_Blog::is_hidden( $blog_id );
 …
         $blog = bp_blogs_get_random_blogs( 1, 1 );
         bp_core_redirect( get_blog_option( $blog['blogs'][0]->blog_id, 'siteurl') );
+        bp_core_redirect( get_site_url( $blog['blogs'][0]->blog_id ) );
+    }
+}
 …
     global $wpdb, $bp;
     if ( !is_numeric( $blog_id ) )
+    if ( !is_numeric( $blog_id ) || !bp_core_is_multisite() )
         return false;
 …
     $blog_id = (int) $blog_id;
     if ( !$blog_id )
+    if ( !$blog_id || !bp_core_is_multisite() )
         return false;
 …
     global $wpdb, $bp;
     if ( !is_numeric( $blog_id ) )
+    if ( !is_numeric( $blog_id ) || !bp_core_is_multisite() )
         return false;
 …
 function bp_blogs_remove_data( $user_id ) {
+    if ( !bp_core_is_multisite() )
+        return false;
     /* If this is regular blog, delete all data for that blog. */
     BP_Blogs_Blog::delete_blogs_for_user( $user_id );
-    BP_Blogs_Post::delete_posts_for_user( $user_id );
-    BP_Blogs_Comment::delete_comments_for_user( $user_id );
     do_action( 'bp_blogs_remove_data', $user_id );
+}
+add_action( 'wpmu_delete_user', 'bp_blogs_remove_data', 1 );
+add_action( 'delete_user', 'bp_blogs_remove_data', 1 );
+add_action( 'wpmu_delete_user', 'bp_blogs_remove_data' );
+add_action( 'delete_user', 'bp_blogs_remove_data' );
+add_action( 'make_spam_user', 'bp_blogs_remove_data' );
 …
+}
-function bp_blogs_clear_post_object_cache( $blog_id, $post_id, $user_id ) {
-    wp_cache_delete( 'bp_user_posts_' . $user_id, 'bp' );
+}
-function bp_blogs_format_clear_post_cache( $recorded_post_obj ) {
-    bp_blogs_clear_post_object_cache( false, false, $recorded_post_obj->user_id );
-    /* Clear the sitewide activity cache */
-    wp_cache_delete( 'sitewide_activity', 'bp' );
+}
-function bp_blogs_clear_comment_object_cache( $blog_id, $comment_id, $user_id ) {
-    wp_cache_delete( 'bp_user_comments_' . $user_id, 'bp' );
+}
-function bp_blogs_format_clear_comment_cache( $recorded_comment_obj ) {
-    bp_blogs_clear_comment_object_cache( false, false, $recorded_comment_obj->user_id );
-    /* Clear the sitewide activity cache */
-    wp_cache_delete( 'sitewide_activity', 'bp' );
+}
 // List actions to clear object caches on
 add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_clear_blog_object_cache', 10, 2 );
-add_action( 'bp_blogs_remove_post', 'bp_blogs_clear_post_object_cache', 10, 3 );
-add_action( 'bp_blogs_remove_comment', 'bp_blogs_clear_comment_object_cache', 10, 3 );
 add_action( 'bp_blogs_new_blog', 'bp_blogs_format_clear_blog_cache', 10, 2 );
-add_action( 'bp_blogs_new_blog_post', 'bp_blogs_format_clear_post_cache', 10, 2 );
-add_action( 'bp_blogs_new_blog_comment', 'bp_blogs_format_clear_comment_cache', 10, 2 );
 // List actions to clear super cached pages on, if super cache is installed

trunk/bp-blogs/bp-blogs-classes.php

-                      r3232
+                      r3300
             bp_blogs_setup_globals();
         if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
             $hidden_sql = "AND wb.public = 1";
 …
         // Show logged in users their hidden blogs.
         if ( !bp_is_my_profile() && !$show_hidden )
             $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ORDER BY b.id", $user_id ) );
+            $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id, b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ORDER BY b.blog_id", $user_id ) );
         else
             $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ORDER BY b.id", $user_id ) );
+            $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id, b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ORDER BY b.blog_id", $user_id ) );
         $total_blog_count = BP_Blogs_Blog::total_blog_count_for_user( $user_id );
         foreach ( (array)$blogs as $blog ) {
+            $user_blogs[$blog->id] = new stdClass;
+            $user_blogs[$blog->id]->id = $blog->id;
+            $user_blogs[$blog->id]->siteurl = ( is_ssl() ) ? 'https://' . $blog->domain . $blog->path : 'http://' . $blog->domain . $blog->path;
+            $user_blogs[$blog->id]->name = $blog->name;
+            $user_blogs[$blog->blog_id] = new stdClass;
+            $user_blogs[$blog->blog_id]->id = $blog->id;
+            $user_blogs[$blog->blog_id]->blog_id = $blog->blog_id;
+            $user_blogs[$blog->blog_id]->siteurl = ( is_ssl() ) ? 'https://' . $blog->domain . $blog->path : 'http://' . $blog->domain . $blog->path;
+            $user_blogs[$blog->blog_id]->name = $blog->name;
+        }
 …
         // If the user is logged in return the blog count including their hidden blogs.
         if ( ( is_user_logged_in() && $user_id == $bp->loggedin_user->id ) || is_site_admin() )
+        if ( ( is_user_logged_in() && $user_id == $bp->loggedin_user->id ) || is_super_admin() )
             return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id) );
         else
 …
         $filter = like_escape( $wpdb->escape( $filter ) );
         if ( !is_site_admin() )
+        if ( !is_super_admin() )
             $hidden_sql = "AND wb.public = 1";
 …
             bp_blogs_setup_globals();
         if ( !is_site_admin() )
+        if ( !is_super_admin() )
             $hidden_sql = "AND wb.public = 1";
 …
         $letter = like_escape( $wpdb->escape( $letter ) );
         if ( !is_site_admin() )
+        if ( !is_super_admin() )
             $hidden_sql = "AND wb.public = 1";
 …
             return $paged_blogs;
-        /* Fetch lastest post for each blog. */
-        $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.blog_id IN ( {$blog_ids} ) GROUP BY p.blog_id ORDER BY p.date_created DESC" ) );
         for ( $i = 0; $i < count( $paged_blogs ); $i++ ) {
+            foreach ( (array)$post_ids as $post ) {
+                if ( $post->blog_id == $paged_blogs[$i]->blog_id ) {
+                    $paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT post_title, guid FROM {$wpdb->base_prefix}" . $post->blog_id . "_posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY id DESC LIMIT 1" );
+                }
+            }
+            $blog_prefix = $wpdb->get_blog_prefix( $paged_blogs[$i]->blog_id );
+            $paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT post_title, guid FROM {$blog_prefix}posts WHERE post_status = 'publish' AND post_type = 'post' AND id != 1 ORDER BY id DESC LIMIT 1" );
+        }
 …
+}
-/* DEPRECATED - Post DB recording is scheduled for removal. Please use the activity stream to fetch a user's posts. */
-Class BP_Blogs_Post {
-    var $id;
-    var $user_id;
-    var $blog_id;
-    var $post_id;
-    var $date_created;
-    function bp_blogs_post( $id = null, $blog_id = null, $post_id = null ) {
-        global $bp, $wpdb;
-        if ( $id || ( !$id && $blog_id && $post_id ) ) {
-            $this->id = $id;
-            $this->blog_id = $blog_id;
-            $this->post_id = $post_id;
-            $this->populate();
+        }
+    }
-    function populate() {
-        global $wpdb, $bp;
-        if ( $this->id )
-            $post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_posts} WHERE id = %d", $this->id ) );
-        else
-            $post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d AND post_id = %d", $this->blog_id, $this->post_id ) );
-        $this->id = $post->id;
-        $this->user_id = $post->user_id;
-        $this->blog_id = $post->blog_id;
-        $this->post_id = $post->post_id;
-        $this->date_created = $post->date_created;
+    }
-    function save() {
-        global $wpdb, $bp;
-        $this->post_id = apply_filters( 'bp_blogs_post_id_before_save', $this->post_id, $this->id );
-        $this->blog_id = apply_filters( 'bp_blogs_post_blog_id_before_save', $this->blog_id, $this->id );
-        $this->user_id = apply_filters( 'bp_blogs_post_user_id_before_save', $this->user_id, $this->id );
-        $this->date_created = apply_filters( 'bp_blogs_post_date_created_before_save', $this->date_created, $this->id );
-        do_action( 'bp_blogs_post_before_save', $this );
-        if ( $this->id ) {
-            // Update
-            $sql = $wpdb->prepare( "UPDATE {$bp->blogs->table_name_blog_posts} SET post_id = %d, blog_id = %d, user_id = %d, date_created = FROM_UNIXTIME(%d) WHERE id = %d", $this->post_id, $this->blog_id, $this->user_id, $this->date_created, $this->id );
-        } else {
-            // Save
-            $sql = $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name_blog_posts} ( post_id, blog_id, user_id, date_created ) VALUES ( %d, %d, %d, FROM_UNIXTIME(%d) )", $this->post_id, $this->blog_id, $this->user_id, $this->date_created );
+        }
-        if ( !$wpdb->query($sql) )
-            return false;
-        do_action( 'bp_blogs_post_after_save', $this );
-        if ( $this->id )
-            return $this->id;
-        else
-            return $wpdb->insert_id;
+    }
-    /* Static Functions */
-    function delete( $post_id, $blog_id ) {
-        global $wpdb, $bp, $current_user;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d AND post_id = %d", $blog_id, $post_id ) );
+    }
-    function delete_oldest( $user_id = null ) {
-        global $wpdb, $bp;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $current_user->ID;
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d ORDER BY date_created ASC LIMIT 1", $user_id ) );
+    }
-    function delete_posts_for_user( $user_id = null ) {
-        global $wpdb, $bp;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $bp->loggedin_user->id;
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d", $user_id ) );
+    }
-    function delete_posts_for_blog( $blog_id ) {
-        global $wpdb, $bp;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d", $blog_id ) );
+    }
-    function get_latest_posts( $blog_id = null, $limit = 5 ) {
-        global $wpdb, $bp;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( $blog_id )
-            $blog_sql = $wpdb->prepare( " AND p.blog_id = %d", $blog_id );
-        $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 $blog_sql ORDER BY p.date_created DESC LIMIT $limit" ) );
-        for ( $i = 0; $i < count($post_ids); $i++ ) {
-            $posts[$i] = BP_Blogs_Post::fetch_post_content($post_ids[$i]);
+        }
-        return $posts;
+    }
-    function get_posts_for_user( $user_id = null ) {
-        global $bp, $wpdb;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $bp->displayed_user->id;
-        // Show a logged in user their posts on private blogs, but not anyone else.
-        if ( !bp_is_my_profile() ) {
-            $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d ORDER BY p.date_created DESC", $user_id) );
-            $total_post_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(p.post_id) FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d", $user_id) );
-        } else {
-            $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d ORDER BY p.date_created DESC", $user_id) );
-            $total_post_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(p.post_id) FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d", $user_id) );
+        }
-        for ( $i = 0; $i < count($post_ids); $i++ ) {
-            $posts[$i] = BP_Blogs_Post::fetch_post_content($post_ids[$i]);
+        }
-        return array( 'posts' => $posts, 'count' => $total_post_count );
+    }
-    function fetch_post_content( $post_object ) {
-        // TODO: switch_to_blog() calls are expensive and this needs to be changed.
-        switch_to_blog( $post_object->blog_id );
-        $post = get_post($post_object->post_id);
-        $post->blog_id = $post_object->blog_id;
-        restore_current_blog();
-        return $post;
+    }
-    function get_total_recorded_for_user( $user_id = null ) {
-        global $bp, $wpdb;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $current_user->ID;
-        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(post_id) FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d", $user_id ) );
+    }
-    function is_recorded( $post_id, $blog_id, $user_id = null ) {
-        global $bp, $wpdb, $current_user;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $current_user->ID;
-        return $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM {$bp->blogs->table_name_blog_posts} WHERE post_id = %d AND blog_id = %d AND user_id = %d", $post_id, $blog_id, $user_id ) );
+    }
-    function total_post_count( $blog_id ) {
-        global $bp, $wpdb;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$blog_id )
-            return false;
-        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(post_id) FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d", $blog_id ) );
+    }
-    function get_all() {
-        global $bp, $wpdb;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        return $wpdb->get_col( $wpdb->prepare( "SELECT post_id, blog_id FROM " . $bp->blogs->table_name_blog_posts ) );
+    }
+}
-/* DEPRECATED - Comment DB recording is scheduled for removal. Please use the activity stream to fetch a user's comments. */
-Class BP_Blogs_Comment {
-    var $id;
-    var $user_id;
-    var $blog_id;
-    var $comment_id;
-    var $comment_post_id;
-    var $date_created;
-    function bp_blogs_comment( $id = false, $blog_id = false, $comment_id = false ) {
-        global $bp, $wpdb;
-        if ( !$user_id )
-            $user_id = $bp->displayed_user->id;
-        if ( $id || ( !$id && $blog_id && $comment_id ) ) {
-            $this->id = $id;
-            $this->blog_id = $blog_id;
-            $this->comment_id = $comment_id;
-            $this->populate();
+        }
+    }
-    function populate() {
-        global $wpdb, $bp;
-        if ( $this->id )
-            $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_comments} WHERE id = %d", $this->id ) );
-        else
-            $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_comments} WHERE blog_id = %d AND comment_id = %d", (int)$this->blog_id, (int)$this->comment_id ) );
-        $this->comment_id = $comment->comment_id;
-        $this->user_id = $comment->user_id;
-        $this->blog_id = $comment->blog_id;
-        $this->comment_post_id = $comment->comment_post_id;
-        $this->date_created = $comment->date_created;
+    }
-    function save() {
-        global $wpdb, $bp;
-        $this->comment_id = apply_filters( 'bp_blogs_comment_id_before_save', $this->comment_id, $this->id );
-        $this->comment_post_id = apply_filters( 'bp_blogs_comment_post_id_before_save', $this->comment_post_id, $this->id );
-        $this->blog_id = apply_filters( 'bp_blogs_comment_blog_id_before_save', $this->blog_id, $this->id );
-        $this->user_id = apply_filters( 'bp_blogs_comment_user_id_before_save', $this->user_id, $this->id );
-        $this->date_created = apply_filters( 'bp_blogs_comment_date_created_before_save', $this->date_created, $this->id );
-        do_action( 'bp_blogs_comment_before_save', $this );
-        if ( $this->id ) {
-            // Update
-            $sql = $wpdb->prepare( "UPDATE {$bp->blogs->table_name_blog_comments} SET comment_id = %d, comment_post_id = %d, blog_id = %d, user_id = %d, date_created = FROM_UNIXTIME(%d) WHERE id = %d", $this->comment_id, $this->comment_post_id, $this->blog_id, $this->user_id, $this->date_created, $this->id );
-        } else {
-            // Save
-            $sql = $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name_blog_comments} ( comment_id, comment_post_id, blog_id, user_id, date_created ) VALUES ( %d, %d, %d, %d, FROM_UNIXTIME(%d) )", $this->comment_id, $this->comment_post_id, $this->blog_id, $this->user_id, $this->date_created );
+        }
-        if ( !$wpdb->query($sql) )
-            return false;
-        do_action( 'bp_blogs_comment_after_save', $this );
-        if ( $this->id )
-            return $this->id;
-        else
-            return $wpdb->insert_id;
+    }
-    /* Static Functions */
-    function delete( $comment_id, $blog_id ) {
-        global $wpdb, $bp, $current_user;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE comment_id = %d AND blog_id = %d", $comment_id, $blog_id ) );
+    }
-    function delete_oldest( $user_id = null ) {
-        global $wpdb, $bp, $current_user;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $current_user->ID;
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d ORDER BY date_created ASC LIMIT 1", $user_id ) );
+    }
-    function delete_comments_for_user( $user_id = null ) {
-        global $wpdb, $bp;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $bp->loggedin_user->id;
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d", $user_id ) );
+    }
-    function delete_comments_for_blog( $blog_id ) {
-        global $wpdb, $bp;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE blog_id = %d", $blog_id ) );
+    }
-    function get_comments_for_user( $user_id = null ) {
-        global $bp, $wpdb;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $bp->displayed_user->id;
-        // Show the logged in user their comments on hidden blogs, but not to anyone else.
-        if ( !bp_is_my_profile() ) {
-            $comment_ids = $wpdb->get_results( $wpdb->prepare( "SELECT c.comment_id, c.blog_id FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d ORDER BY c.date_created ASC", $user_id) );
-            $total_comment_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(c.comment_id) FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d", $user_id) );
-        } else {
-            $comment_ids = $wpdb->get_results( $wpdb->prepare( "SELECT c.comment_id, c.blog_id FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d ORDER BY c.date_created ASC", $user_id) );
-            $total_comment_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(c.comment_id) FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d", $user_id) );
+        }
-        for ( $i = 0; $i < count($comment_ids); $i++ )
-            $comments[$i] = BP_Blogs_Comment::fetch_comment_content($comment_ids[$i]);
-        return array( 'comments' => $comments, 'count' => $total_comment_count );
+    }
-    function fetch_comment_content( $comment_object ) {
-        switch_to_blog($comment_object->blog_id);
-        $comment = get_comment($comment_object->comment_id);
-        $comment->blog_id = $comment_object->blog_id;
-        $comment->post = &get_post( $comment->comment_post_ID );
-        restore_current_blog();
-        return $comment;
+    }
-    function get_total_recorded_for_user( $user_id = null ) {
-        global $bp, $wpdb, $current_user;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $current_user->ID;
-        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_id) FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d", $user_id ) );
+    }
-    function total_comment_count( $blog_id, $post_id ) {
-        global $bp, $wpdb;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( $post_id )
-            $post_sql = $wpdb->prepare( " AND comment_post_id = %d", $post_id );
-        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_id) WHERE blog_id = %d{$post_sql}", $blog_id ) );
+    }
-    function is_recorded( $comment_id, $comment_post_id, $blog_id, $user_id = null ) {
-        global $bp, $wpdb, $current_user;
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        if ( !$user_id )
-            $user_id = $current_user->ID;
-        return $wpdb->get_var( $wpdb->prepare( "SELECT comment_id FROM {$bp->blogs->table_name_blog_comments} WHERE comment_id = %d AND blog_id = %d AND comment_post_id = %d AND user_id = %d", $comment_id, $blog_id, $comment_post_id, $user_id ) );
+    }
+}
 ?>

trunk/bp-blogs/bp-blogs-templatetags.php

-                      r3263
+                      r3300
         $this->pag_page = isset( $_REQUEST['bpage'] ) ? intval( $_REQUEST['bpage'] ) : $page;
         $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
         if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] )
 …
         if ( $max ) {
             if ( $max >= count( $this->blogs ) ) {
+            if ( $max >= count($this->blogs) ) {
                 $this->blog_count = count( $this->blogs );
             } else {
 …
     $blogs_template = new BP_Blogs_Template( $type, $page, $per_page, $max, $user_id, $search_terms );
     return $blogs_template->has_blogs();
+    return apply_filters( 'bp_has_blogs', $blogs_template->has_blogs(), &$blogs_template );
+}
 …
     global $bp, $blogs_template;
+    $from_num = bp_core_number_format( intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1 );
+    $to_num = bp_core_number_format( ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) );
+    $start_num = intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1;
+    $from_num = bp_core_number_format( $start_num );
+    $to_num = bp_core_number_format( ( $start_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $start_num + ( $blogs_template->pag_num - 1 ) );
     $total = bp_core_number_format( $blogs_template->total_blog_count );
     echo sprintf( __( 'Viewing blog %s to %s (of %s blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
+    echo sprintf( __( 'Viewing blog %1$s to %2$s (of %3$s blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
     <span class="ajax-loader"></span><?php
+}
 …
 function bp_blog_hidden_fields() {
     if ( isset( $_REQUEST['s'] ) ) {
         echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ). '" name="search_terms" />';
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['s'] ). '" name="search_terms" />';
+    }
     if ( isset( $_REQUEST['letter'] ) ) {
         echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+        echo '<input type="hidden" id="selected_letter" value="' . esc_attr( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
     if ( isset( $_REQUEST['blogs_search'] ) ) {
         echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['blogs_search'] ) . '" name="search_terms" />';
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['blogs_search'] ) . '" name="search_terms" />';
+    }
+}
 …
             <input type="hidden" name="stage" value="gimmeanotherblog" />
             <?php do_action( "signup_hidden_fields" ); ?>
+            <?php do_action( 'signup_hidden_fields' ); ?>
             <?php bp_blogs_signup_blog($blogname, $blog_title, $errors); ?>
 …
     // Blog name
     if( 'no' == constant( "VHOST" ) )
+    if( !is_subdomain_install() )
         echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
     else
 …
     <?php }
     if( 'no' == constant( "VHOST" ) ) {
+    if ( !is_subdomain_install() )
         echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span> <input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
     } else {
+    else
         echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /> <span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
+    }
     if ( !is_user_logged_in() ) {
         print '(<strong>' . __( 'Your address will be ' , 'buddypress');
+        if( 'no' == constant( "VHOST" ) ) {
+        if ( !is_subdomain_install() ) {
             print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
         } else {
             print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path;
+        }
         echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>';
+    }
 …
 function bp_blogs_blog_tabs() {
     global $bp;
+    global $bp, $groups_template;
     // Don't show these tabs on a user's own profile

trunk/bp-blogs/bp-blogs-widgets.php

-                      r2698
+                      r3300
         global $bp;
         extract( $args );
+        extract( $args );
         echo $before_widget;
+        echo $before_title
+           . $widget_name
+           . $after_title; ?>
+        echo $before_title . $widget_name . $after_title;
-        <?php
         if ( empty( $instance['max_posts'] ) || !$instance['max_posts'] )
             $instance['max_posts'] = 10; ?>
 …
         ?>
         <p><label for="bp-blogs-widget-posts-max"><?php _e('Max posts to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_posts' ); ?>" name="<?php echo $this->get_field_name( 'max_posts' ); ?>" type="text" value="<?php echo attribute_escape( $max_posts ); ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-blogs-widget-posts-max"><?php _e('Max posts to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_posts' ); ?>" name="<?php echo $this->get_field_name( 'max_posts' ); ?>" type="text" value="<?php echo esc_attr( $max_posts ); ?>" style="width: 30%" /></label></p>
     <?php
+    }

trunk/bp-core.php

-                      r3242
+                      r3300
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-catchuri.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-classes.php' );
+require ( BP_PLUGIN_DIR . '/bp-core/bp-core-filters.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-cssjs.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-avatars.php' );
 …
  */
 function bp_core_setup_globals() {
     global $bp, $wpdb;
+    global $bp;
     global $current_user, $current_component, $current_action, $current_blog;
     global $displayed_user_id, $bp_pages;
 …
     $current_user = wp_get_current_user();
+    /* Get the base database prefix */
+    $bp->table_prefix = bp_core_get_table_prefix();
     /* The domain for the root of the site where the main blog resides */
     $bp->root_domain = bp_core_get_root_domain();
-    /* Contains an array of all the active components. The key is the slug, value the internal ID of the component */
-    $bp->active_components = array();
     /* The names of the core WordPress pages used to display BuddyPress content */
 …
     $bp->loggedin_user->userdata = bp_core_get_core_userdata( $bp->loggedin_user->id );
+    /* is_site_admin() hits the DB on single WP installs, so we need to get this separately so we can call it in a loop. */
+    $bp->loggedin_user->is_site_admin = is_site_admin();
+    /* is_super_admin() hits the DB on single WP installs, so we need to get this separately so we can call it in a loop. */
+    $bp->loggedin_user->is_super_admin = is_super_admin();
+    $bp->loggedin_user->is_site_admin  = $bp->loggedin_user->is_super_admin; // deprecated 1.2.6
     /* The user id of the user currently being viewed, set in /bp-core/bp-core-catchuri.php */
 …
     $bp->bp_options_nav = array();
+    /* Contains an array of all the active components. The key is the slug, value the internal ID of the component */
+    $bp->active_components = array();
     /* Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar */
     $bp->grav_default->user = apply_filters( 'bp_user_gravatar_default', $bp->site_options['user-avatar-default'] );
+    $bp->grav_default->user  = apply_filters( 'bp_user_gravatar_default', $bp->site_options['user-avatar-default'] );
     $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', 'identicon' );
     $bp->grav_default->blog = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
+    $bp->grav_default->blog  = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
     /* Fetch the full name for the logged in and current user */
     $bp->loggedin_user->fullname = bp_core_get_user_displayname( $bp->loggedin_user->id );
+    $bp->loggedin_user->fullname  = bp_core_get_user_displayname( $bp->loggedin_user->id );
     $bp->displayed_user->fullname = bp_core_get_user_displayname( $bp->displayed_user->id );
 …
        generic variable so it can be used by other components. It can also be modified, so when viewing a group
        'is_item_admin' would be 1 if they are a group admin, 0 if they are not. */
     $bp->is_item_admin = bp_is_my_profile();
+    $bp->is_item_admin = bp_user_has_access();
     /* Used to determine if the logged in user is a moderator for the current content. */
     $bp->is_item_mod = false;
     $bp->core->table_name_notifications = $wpdb->base_prefix . 'bp_notifications';
+    $bp->core->table_name_notifications = $bp->table_prefix . 'bp_notifications';
     if ( !$bp->current_component && $bp->displayed_user->id )
 …
 /**
+ * bp_core_get_table_prefix()
+ *
+ * Allow filtering of database prefix. Intended for use in multinetwork installations.
+ *
+ * @global object $wpdb WordPress database object
+ * @return string Filtered database prefix
+ */
+function bp_core_get_table_prefix() {
+    global $wpdb;
+    return apply_filters( 'bp_core_get_table_prefix', $wpdb->base_prefix );
+}
+/**
  * bp_core_define_slugs()
+ *
 …
     if ( !defined( 'BP_ACTIVATION_SLUG' ) )
         define( 'BP_ACTIVATION_SLUG', $bp->pages->activate->slug );
+    if ( !defined( 'BP_SEARCH_SLUG' ) )
+        define( 'BP_SEARCH_SLUG', 'search' );
+}
 add_action( 'bp_setup_globals', 'bp_core_define_slugs' );
 …
+}
 /**
  * bp_core_admin_menu_init()
 …
+ *
  * @package BuddyPress Core
  * @uses is_site_admin() returns true if the current user is a site admin, false if not
+ * @uses is_super_admin() returns true if the current user is a site admin, false if not
  */
 function bp_core_admin_menu_init() {
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
 …
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ * @global $wpdb WordPress DB access object.
+ * @uses is_site_admin() returns true if the current user is a site admin, false if not
+ * @uses is_super_admin() returns true if the current user is a site admin, false if not
  * @uses add_submenu_page() WP function to add a submenu item
  */
 function bp_core_add_admin_menu() {
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
 …
 add_action( 'admin_menu', 'bp_core_add_admin_menu' );
+/**
+ * bp_core_is_root_component()
+ *
+ * Checks to see if a component's URL should be in the root, not under a member page:
+ * eg: http://domain.com/groups/the-group NOT http://domain.com/members/andy/groups/the-group
+ *
+ * @package BuddyPress Core
+ * @return true if root component, else false.
+ */
+function bp_core_is_root_component( $component_name ) {
+    global $bp;
+    foreach ( (array) $bp->pages as $key => $page ) {
+        if ( $key == $component_name || $page->slug == $component_name )
+            return true;
+    }
+    return false;
+}
 /**
 …
  */
 function bp_core_action_set_spammer_status() {
     global $bp, $wpdb;
     if ( !is_site_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
+    global $bp, $wpdb, $wp_version;
+    if ( !is_super_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
         return false;
 …
         /* Get the functions file */
         if ( file_exists( ABSPATH . 'wp-admin/includes/mu.php' ) && bp_core_is_multisite() )
             require( ABSPATH . 'wp-admin/includes/mu.php' );
+        if ( bp_core_is_multisite() )
+            require_once( ABSPATH . 'wp-admin/includes/ms.php' );
         if ( 'mark-spammer' == $bp->current_action )
 …
     global $bp;
     if ( !is_site_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
+    if ( !is_super_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
         return false;
 …
+        }
         do_action( 'bp_core_action_set_spammer_status', $errors );
+        do_action( 'bp_core_action_delete_user', $errors );
         if ( $errors )
 …
 add_action( 'wp', 'bp_core_action_delete_user', 3 );
 /********************************************************************************
  * Business Functions
 …
         'search_terms' => false, // Limit to users that match these search terms
+        'include' => false, // Pass comma separated list of user_ids to limit to only these users
         'per_page' => 20, // The number of results to return per page
         'page' => 1, // The page to return if limiting per page
 …
     extract( $params, EXTR_SKIP );
     return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $search_terms, $populate_extras ), &$params );
+    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras ), &$params );
+}
 …
  * @global $current_user WordPress global variable containing current logged in user information
  * @param user_id The ID of the user.
  * @uses get_usermeta() WordPress function to get the usermeta for a user.
+ * @uses get_user_meta() WordPress function to get the usermeta for a user.
  */
 function bp_core_get_user_domain( $user_id, $user_nicename = false, $user_login = false ) {
 …
     if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
         $domain = get_blog_option( $current_blog->blog_id, 'siteurl' );
+        $domain = get_blog_option( $current_blog->blog_id, 'home' );
     else
         $domain = get_blog_option( BP_ROOT_BLOG, 'siteurl' );
+        $domain = get_blog_option( BP_ROOT_BLOG, 'home' );
     return apply_filters( 'bp_core_get_root_domain', $domain );
 …
     /* If this is for site admins only and the user is not one, don't create the subnav item */
     if ( $site_admin_only && !is_site_admin() )
+    if ( $site_admin_only && !is_super_admin() )
         return false;
 …
      * looking at their own profile, don't create the nav item.
      */
     if ( !$show_for_displayed_user && !bp_is_my_profile() )
+    if ( !$show_for_displayed_user && !bp_user_has_access() )
         return false;
 …
      * default subnav function so we can display a directory or something else.
      */
     if ( !$bp->displayed_user->id )
+    if ( bp_core_is_root_component( $slug ) && !$bp->displayed_user->id )
         return;
 …
     /* If this is for site admins only and the user is not one, don't create the subnav item */
     if ( $site_admin_only && !is_site_admin() )
+    if ( $site_admin_only && !is_super_admin() )
         return false;
 …
     global $bp;
+    if ( $function = $bp->bp_options_nav[$parent_id][$slug]['screen_function'] ) {
+        if ( !is_object( $function[0] ) )
+            remove_action( 'wp', $function, 3 );
+    $screen_function = $bp->bp_options_nav[$parent_id][$slug]['screen_function'];
+    if ( $screen_function ) {
+        if ( !is_object( $screen_function[0] ) )
+            remove_action( 'wp', $screen_function, 3 );
         else
             remove_action( 'wp', array( &$function[0], $function[1] ), 3 );
+            remove_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
+    }
 …
 /**
  * bp_core_get_random_member()
+ *
+ * Returns the user_id for a user based on their username.
+ *
+ * @package BuddyPress Core
+ * @param $username str Username to check.
+ * @return false on no match
+ * @return int the user ID of the matched user.
+ */
+function bp_core_get_random_member() {
+    global $bp;
+    if ( isset( $_GET['random-member'] ) ) {
+        $user = bp_core_get_users( array( 'type' => 'random', 'per_page' => 1 ) );
+        bp_core_redirect( bp_core_get_user_domain( $user['users'][0]->id ) );
+    }
+}
+add_action( 'wp', 'bp_core_get_random_member' );
+/**
+ * bp_core_get_userid()
+ *
  * Returns the user_id for a user based on their username.
 …
  * @return int the user ID of the matched user.
  */
-function bp_core_get_random_member() {
-    global $bp, $wpdb;
-    if ( isset( $_GET['random-member'] ) ) {
-        $user = bp_core_get_users( array( 'type' => 'random', 'per_page' => 1 ) );
-        bp_core_redirect( bp_core_get_user_domain( $user['users'][0]->id ) );
+    }
+}
-add_action( 'wp', 'bp_core_get_random_member' );
-/**
- * bp_core_get_userid()
+ *
- * Returns the user_id for a user based on their username.
+ *
- * @package BuddyPress Core
- * @param $username str Username to check.
- * @global $wpdb WordPress DB access object.
- * @return false on no match
- * @return int the user ID of the matched user.
- */
 function bp_core_get_userid( $username ) {
     global $wpdb;
+    if ( !empty( $username ) )
+        return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
+    if ( empty( $username ) )
+        return false;
+    return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
+}
 …
+    }
     return apply_filters( 'bp_core_get_user_displayname', $fullname );
+    return apply_filters( 'bp_core_get_user_displayname', $fullname, $user_id );
+}
 add_filter( 'bp_core_get_user_displayname', 'strip_tags', 1 );
 …
 /**
+ * bp_core_format_time()
+ */
+function bp_core_format_time( $time, $just_date = false ) {
+    if ( !$time )
+        return false;
+    $date = date( "F j, Y ", $time );
+    if ( !$just_date ) {
+        $date .= __('at', 'buddypress') . date( ' g:iA', $time );
+    }
+    return $date;
+ * bp_core_current_time()
+ *
+ * Get the current GMT time to save into the DB
+ *
+ * @package BuddyPress Core
+ * @since 1.2.6
+ */
+function bp_core_current_time( $gmt = true ) {
+    // Get current time in MYSQL format
+    $current_time = current_time( 'mysql', $gmt );
+    return apply_filters( 'bp_core_current_time', $current_time );
+}
 …
     @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
+}
+add_action( 'bp_init', 'bp_core_setup_message' );
+add_action( 'wp', 'bp_core_setup_message', 2 );
 /**
 …
     ?>
         <div id="message" class="<?php echo $type; ?>">
             <p><?php echo stripslashes( attribute_escape( $bp->template_message ) ); ?></p>
+            <p><?php echo stripslashes( esc_attr( $bp->template_message ) ); ?></p>
         </div>
     <?php
 …
  */
 function bp_core_time_since( $older_date, $newer_date = false ) {
     // array of time period chunks
     $chunks = array(
     array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
     array( 60 * 60 * 24 * 30 , __( 'month', 'buddypress' ), __( 'months', 'buddypress' ) ),
     array( 60 * 60 * 24 * 7, __( 'week', 'buddypress' ), __( 'weeks', 'buddypress' ) ),
     array( 60 * 60 * 24 , __( 'day', 'buddypress' ), __( 'days', 'buddypress' ) ),
     array( 60 * 60 , __( 'hour', 'buddypress' ), __( 'hours', 'buddypress' ) ),
     array( 60 , __( 'minute', 'buddypress' ), __( 'minutes', 'buddypress' ) ),
     array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
+        array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
+        array( 60 * 60 * 24 * 30 , __( 'month', 'buddypress' ), __( 'months', 'buddypress' ) ),
+        array( 60 * 60 * 24 * 7, __( 'week', 'buddypress' ), __( 'weeks', 'buddypress' ) ),
+        array( 60 * 60 * 24 , __( 'day', 'buddypress' ), __( 'days', 'buddypress' ) ),
+        array( 60 * 60 , __( 'hour', 'buddypress' ), __( 'hours', 'buddypress' ) ),
+        array( 60 , __( 'minute', 'buddypress' ), __( 'minutes', 'buddypress' ) ),
+        array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
     );
 …
     /* $newer_date will equal false if we want to know the time elapsed between a date and the current time */
     /* $newer_date will have a value if we want to work out time elapsed between two known dates */
     $newer_date = ( !$newer_date ) ? gmmktime( gmdate( 'H' ), gmdate( 'i' ), gmdate( 's' ), gmdate( 'n' ), gmdate( 'j' ), gmdate( 'Y' ) ) : $newer_date;
+    $newer_date = ( !$newer_date ) ? strtotime( bp_core_current_time() ) : $newer_date;
     /* Difference in seconds */
 …
         if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
             /* Add to output var */
             $output .= ( 1 == $count2 ) ? _c( ',|Separator in time since', 'buddypress' ) . ' 1 '. $chunks[$i + 1][1] : _c( ',|Separator in time since', 'buddypress' ) . ' ' . $count2 . ' ' . $chunks[$i + 1][2];
+            $output .= ( 1 == $count2 ) ? _x( ',', 'Separator in time since', 'buddypress' ) . ' 1 '. $chunks[$i + 1][1] : _x( ',', 'Separator in time since', 'buddypress' ) . ' ' . $count2 . ' ' . $chunks[$i + 1][2];
+        }
+    }
 …
  * @package BuddyPress Core
  * @global $userdata WordPress user data for the current logged in user.
  * @uses update_usermeta() WordPress function to update user metadata in the usermeta table.
+ * @uses update_user_meta() WordPress function to update user metadata in the usermeta table.
  */
 function bp_core_record_activity() {
 …
         return false;
     $activity = get_usermeta( $bp->loggedin_user->id, 'last_activity' );
+    $activity = get_user_meta( $bp->loggedin_user->id, 'last_activity', true );
     if ( !is_numeric( $activity ) )
         $activity = strtotime( $activity );
+    if ( '' == $activity || strtotime( gmdate( "Y-m-d H:i:s" ) ) >= strtotime( '+5 minutes', $activity ) )
+        update_usermeta( $bp->loggedin_user->id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+    // Get current time
+    $current_time = bp_core_current_time();
+    if ( '' == $activity || strtotime( $current_time ) >= strtotime( '+5 minutes', $activity ) )
+        update_user_meta( $bp->loggedin_user->id, 'last_activity', $current_time );
+}
 add_action( 'wp_head', 'bp_core_record_activity' );
 …
         return $number;
     return apply_filters( 'bp_core_bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
+    return apply_filters( 'bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
+}
 …
+ *
  * @package BuddyPress Core
+ * @global $comment WordPress comment global for the current comment.
+ * @uses bp_core_get_userlink_by_email() Fetches a userlink via email address.
+ *
+ * @global $bp $bp
+ * @global object $current_site
+ * @return string
  */
 function bp_core_get_site_path() {
 …
             unset( $site_path[2] );
+            $site_path = '/' . implode( '/', $site_path ) . '/';
+            if ( !count( $site_path ) )
+                $site_path = '/';
+            else
+                $site_path = '/' . implode( '/', $site_path ) . '/';
+        }
+    }
 …
     if ( bp_core_is_multisite() )
         $meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys})" );
+        $meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys}) AND site_id = {$wpdb->siteid}" );
     else
         $meta = $wpdb->get_results( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ({$meta_keys})" );
 …
     // Make sure we don't call status_header() in bp_core_do_catch_uri()
     // as this conflicts with wp_redirect()
+    // as this conflicts with wp_redirect()
     $bp_no_status_set = true;
 …
 /**
- * bp_core_email_from_name_filter()
+ *
- * Sets the "From" name in emails sent to the name of the site and not "WordPress"
+ *
- * @package BuddyPress Core
- * @uses get_blog_option() fetches the value for a meta_key in the wp_X_options table
- * @return The blog name for the root blog
- */
-function bp_core_email_from_name_filter() {
-    return apply_filters( 'bp_core_email_from_name_filter', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
+}
-add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
-/**
- * bp_core_email_from_name_filter()
+ *
- * Sets the "From" address in emails sent
+ *
- * @package BuddyPress Core
- * @global $current_site Object containing current site metadata
- * @return noreply@sitedomain email address
- */
-function bp_core_email_from_address_filter() {
-    $domain = (array) explode( '/', site_url() );
-    return apply_filters( 'bp_core_email_from_address_filter', __( 'noreply', 'buddypress' ) . '@' . $domain[2] );
+}
-add_filter( 'wp_mail_from', 'bp_core_email_from_address_filter' );
-/**
  * bp_core_delete_account()
+ *
 …
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
  * @uses is_site_admin() Checks to see if the user is a site administrator.
+ * @uses is_super_admin() Checks to see if the user is a site administrator.
  * @uses wpmu_delete_user() Deletes a user from the system on multisite installs.
  * @uses wp_delete_user() Deletes a user from the system on singlesite installs.
 …
 function bp_core_ucfirst( $str ) {
     if ( function_exists( 'mb_strtoupper' ) && function_exists( 'mb_substr' ) ) {
         $fc = mb_strtoupper( mb_substr( $str, 0, 1 ) );
         return $fc.mb_substr( $str, 1 );
+        $fc = mb_strtoupper( mb_substr( $str, 0, 1 ) );
+        return $fc.mb_substr( $str, 1 );
     } else {
         return ucfirst( $str );
 …
  */
 function bp_core_print_generation_time() {
+    global $wpdb;
+    ?>
+?>
 <!-- Generated in <?php timer_stop(1); ?> seconds. (<?php echo get_num_queries(); ?> q) -->
 …
     $user = get_userdatabylogin( $username );
     if ( (int)$user->spam )
+    if ( ( bp_core_is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
         bp_core_redirect( $bp->root_domain );
     else
 …
  * @package BuddyPress Core
  * @param $user_id The user id for the user to delete usermeta for
  * @uses delete_usermeta() deletes a row from the wp_usermeta table based on meta_key
+ * @uses delete_user_meta() deletes a row from the wp_usermeta table based on meta_key
  */
 function bp_core_remove_data( $user_id ) {
     /* Remove usermeta */
     delete_usermeta( $user_id, 'last_activity' );
+    delete_user_meta( $user_id, 'last_activity' );
     /* Flush the cache to remove the user from all cached objects */
     wp_cache_flush();
+}
 add_action( 'wpmu_delete_user', 'bp_core_remove_data', 1 );
 add_action( 'delete_user', 'bp_core_remove_data', 1 );
 add_action( 'make_spam_user', 'bp_core_remove_data', 1 );
+add_action( 'wpmu_delete_user', 'bp_core_remove_data' );
+add_action( 'delete_user', 'bp_core_remove_data' );
+add_action( 'make_spam_user', 'bp_core_remove_data' );
 /**
 …
         load_textdomain( 'buddypress', $mofile );
+}
 add_action ( 'plugins_loaded', 'bp_core_load_buddypress_textdomain', 5 );
+add_action ( 'bp_loaded', 'bp_core_load_buddypress_textdomain', 2 );
 function bp_core_add_ajax_hook() {
 …
 /**
- * bp_core_filter_parent_theme()
+ *
- * Remove social network parent theme from the theme list.
+ *
- * @package BuddyPress Core
- */
-function bp_core_filter_parent_theme() {
-    global $wp_themes, $pagenow;
-    if ( is_admin() && 'themes.php' == $pagenow )
-        $wp_themes = get_themes();
-    unset( $wp_themes['BuddyPress Classic Parent'] );
+}
-add_filter( 'admin_menu', 'bp_core_filter_parent_theme' );
-/**
- * bp_core_allow_default_theme()
+ *
- * On multiblog installations you must first allow themes to be activated and show
- * up on the theme selection screen. This function will let the BuddyPress bundled
- * themes show up on the root blog selection screen and bypass this step. It also
- * means that the themes won't show for selection on other blogs.
+ *
- * @package BuddyPress Core
- */
-function bp_core_allow_default_theme( $themes ) {
-    global $bp, $current_blog;
-    if ( !is_site_admin() )
-        return $themes;
-    if ( $current_blog->ID == $bp->root_blog ) {
-        $themes['bp-default'] = 1;
-        $themes['bp-classic'] = 1;
+    }
-    return $themes;
+}
-add_filter( 'allowed_themes', 'bp_core_allow_default_theme' );
-/**
  * bp_core_activation_notice()
+ *
 …
         return false;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
 …
 add_action( 'admin_notices', 'bp_core_activation_notice' );
+/**
+ * bp_core_filter_comments()
+ *
+ * Filter the blog post comments array and insert BuddyPress URLs for users.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_filter_comments( $comments, $post_id ) {
+    global $wpdb;
+    foreach( (array)$comments as $comment ) {
+        if ( $comment->user_id )
+            $user_ids[] = $comment->user_id;
+    }
+    if ( empty( $user_ids ) )
+        return $comments;
+    $user_ids = implode( ',', $user_ids );
+    if ( !$userdata = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_login, user_nicename FROM {$wpdb->users} WHERE ID IN ({$user_ids})" ) ) )
+        return $comments;
+    foreach( (array)$userdata as $user )
+        $users[$user->user_id] = bp_core_get_user_domain( $user->user_id, $user->user_nicename, $user->user_login );
+    foreach( (array)$comments as $i => $comment ) {
+        if ( !empty( $comment->user_id ) ) {
+            if ( !empty( $users[$comment->user_id] ) )
+                $comments[$i]->comment_author_url = $users[$comment->user_id];
+/**
+ * bp_core_activate_site_options()
+ *
+ * When switching from single to multisite we need to copy blog options to
+ * site options.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_activate_site_options( $keys = array() ) {
+    global $bp;
+    if ( !empty( $keys ) && is_array( $keys ) ) {
+        $errors = false;
+        foreach ( $keys as $key => $default ) {
+            if ( empty( $bp->site_options[ $key ] ) ) {
+                $bp->site_options[ $key ] = get_blog_option( BP_ROOT_BLOG, $key, $default );
+                if ( !update_site_option( $key, $bp->site_options[ $key ] ) )
+                    $errors = true;
+            }
+        }
+    }
+    return $comments;
+}
+add_filter( 'comments_array', 'bp_core_filter_comments', 10, 2 );
+/**
+ * bp_core_login_redirect()
+ *
+ * When a user logs in, always redirect them back to the previous page. NOT the admin area.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_login_redirect( $redirect_to ) {
+    global $bp, $current_blog;
+    if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
+        return $redirect_to;
+    if ( !empty( $_REQUEST['redirect_to'] ) || strpos( $_REQUEST['redirect_to'], 'wp-admin' ) )
+        return $redirect_to;
+    if ( false === strpos( wp_get_referer(), 'wp-login.php' ) && false === strpos( wp_get_referer(), 'activate' ) && empty( $_REQUEST['nr'] ) )
+        return wp_get_referer();
+    return $bp->root_domain;
+}
+add_filter( 'login_redirect', 'bp_core_login_redirect' );
+        if ( empty( $errors ) )
+            return true;
+    }
+    return false;
+}
 /********************************************************************************
 …
  * hook in to.
  */
+/* Allow core components and dependent plugins to set globals */
+/**
+ * bp_include()
+ *
+ * Allow plugins to include their files ahead of core filters
+ */
+function bp_include() {
+    do_action( 'bp_include' );
+}
+add_action( 'bp_loaded', 'bp_include', 2 );
+/**
+ * bp_setup_root_components()
+ *
+ * Allow core components and dependent plugins to set root components
+ */
+function bp_setup_root_components() {
+    do_action( 'bp_setup_root_components' );
+}
+add_action( 'bp_loaded', 'bp_setup_root_components', 2 );
+/**
+ * bp_setup_globals()
+ *
+ * Allow core components and dependent plugins to set globals
+ */
 function bp_setup_globals() {
     do_action( 'bp_setup_globals' );
+}
+add_action( 'plugins_loaded', 'bp_setup_globals', 5 );
+/* Allow core components and dependent plugins to set root components */
+function bp_setup_root_components() {
+    do_action( 'bp_setup_root_components' );
+}
+add_action( 'plugins_loaded', 'bp_setup_root_components', 2 );
+/* Allow core components and dependent plugins to set their nav */
+add_action( 'bp_loaded', 'bp_setup_globals', 6 );
+/**
+ * bp_setup_nav()
+ *
+ * Allow core components and dependent plugins to set their nav
+ */
 function bp_setup_nav() {
     do_action( 'bp_setup_nav' );
 …
 add_action( 'bp_loaded', 'bp_setup_nav', 8 );
+/* Allow core components and dependent plugins to register widgets */
+/**
+ * bp_setup_widgets()
+ *
+ * Allow core components and dependent plugins to register widgets
+ */
 function bp_setup_widgets() {
     do_action( 'bp_register_widgets' );
+}
+add_action( 'plugins_loaded', 'bp_setup_widgets' );
+add_action( 'bp_loaded', 'bp_setup_widgets', 8 );
+/**
+ * bp_init()
+ *
+ * Allow components to initialize themselves cleanly
+ */
+function bp_init() {
+    do_action( 'bp_init' );
+}
+add_action( 'bp_loaded', 'bp_init' );
 …
  * actions throughout BuddyPress.
  */
+/**
+ * bp_core_add_global_group()
+ *
+ * Add's 'bp' to global group of network wide cachable objects
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_add_global_group() {
+    wp_cache_init();
+    if ( function_exists( 'wp_cache_add_global_groups' ) )
+        wp_cache_add_global_groups( array( 'bp' ) );
+}
+add_action( 'init', 'bp_core_add_global_group' );
 /**
 …
     update_site_option( 'bp-pages', $page_ids );
+}
-function bp_core_is_root_component( $component_name ) {
-    global $bp;
-    foreach ( (array) $bp->pages as $key => $page ) {
-        if ( $key == $component_name || $page->slug == $component_name )
-            return true;
+    }
-    return false;
+}
 ?>

trunk/bp-core/bp-core-adminbar.php

r3232	r3300
109	109	}
110	110
111		echo '<li id="bp-adminbar-blogs-menu"><a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/~~my-blogs~~">';
	111	echo '<li id="bp-adminbar-blogs-menu"><a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/">';
112	112
113	113	_e( 'My Blogs', 'buddypress' );

trunk/bp-core/bp-core-avatars.php

-                      r3232
+                      r3300
 function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt ) {
     global $pagenow;
     // Do not filter if inside WordPress options page
     if ( 'options-discussion.php' == $pagenow )
         return $avatar;
     // If passed an object, assume $user->user_id
     if ( is_object( $user ) )

trunk/bp-core/bp-core-catchuri.php

-                      r3234
+                      r3300
+    }
+    // Ajax or not?
     if ( strpos( $_SERVER['REQUEST_URI'], 'wp-load.php' ) )
         $path = bp_core_referrer();
     else
         $path = clean_url( $_SERVER['REQUEST_URI'] );
+        $path = esc_url( $_SERVER['REQUEST_URI'] );
     $path = apply_filters( 'bp_uri', $path );
     // Firstly, take GET variables off the URL to avoid problems,
     // they are still registered in the global $_GET variable */
+    // Take GET variables off the URL to avoid problems,
+    // they are still registered in the global $_GET variable
     $noget = substr( $path, 0, strpos( $path, '?' ) );
+    if ( $noget != '' ) $path = $noget;
+    /* Fetch the current URI and explode each part separated by '/' into an array */
+    if ( $noget != '' )
+        $path = $noget;
+    // Fetch the current URI and explode each part separated by '/' into an array
     $bp_uri = explode( "/", $path );
     /* Loop and remove empties */
+    // Loop and remove empties
     foreach ( (array)$bp_uri as $key => $uri_chunk )
         if ( empty( $bp_uri[$key] ) ) unset( $bp_uri[$key] );
+    if ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) {
+        /* If we are running BuddyPress on any blog, not just a root blog, we need to first
+           shift off the blog name if we are running a subdirectory install of WPMU. */
+        if ( $current_blog->path != '/' )
+            array_shift( $bp_uri );
+    }
+    /* Set the indexes, these are incresed by one if we are not on a VHOST install */
+    $component_index = 0;
+    $action_index = $component_index + 1;
+    /* Get site path items */
+    // Running off blog other than root
+    if ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) {
+        // Any subdirectory names must be removed from $bp_uri.
+        // This includes two cases: (1) when WP is installed in a subdirectory,
+        // and (2) when BP is running on secondary blog of a subdirectory
+        // multisite installation. Phew!
+        if ( $chunks = explode( '/', $current_blog->path ) ) {
+            foreach( $chunks as $key => $chunk ) {
+                $bkey = array_search( $chunk, $bp_uri );
+                if ( $bkey !== false )
+                    unset( $bp_uri[$bkey] );
+                $bp_uri = array_values( $bp_uri );
+            }
+        }
+    }
+    // Set the indexes, these are incresed by one if we are not on a VHOST install
+    $component_index    = 0;
+    $action_index       = $component_index + 1;
+    // Get site path items
     $paths = explode( '/', bp_core_get_site_path() );
     /* Take empties off the end of path */
+    // Take empties off the end of path
     if ( empty( $paths[count($paths) - 1] ) )
         array_pop( $paths );
     /* Take empties off the start of path */
+    // Take empties off the start of path
     if ( empty( $paths[0] ) )
         array_shift( $paths );
 …
+    }
     /* Reset the keys by merging with an empty array */
     $bp_uri = array_merge( array(), $bp_uri );
     $bp_unfiltered_uri = $bp_uri;
     /* Find a match within registered BuddyPress controlled WP pages (check members first) */
+    // Reset the keys by merging with an empty array
+    $bp_uri             = array_merge( array(), $bp_uri );
+    $bp_unfiltered_uri  = $bp_uri;
+    // Find a match within registered BuddyPress controlled WP pages (check members first)
     foreach ( (array)$bp_pages as $page_key => $bp_page ) {
         if ( in_array( $bp_page->name, (array)$bp_uri ) ) {
             /* Match found, now match the slug to make sure. */
+            // Match found, now match the slug to make sure.
             $uri_chunks = explode( '/', $bp_page->slug );
 …
+    }
     /* This is not a BuddyPress page, so just return. */
+    // This is not a BuddyPress page, so just return.
     if ( in_array( 0, (array) $matches ) )
         return false;
     /* Find the offset */
+    // Find the offset
     $uri_offset = 0;
     $slug = explode( '/', $match->slug );
 …
+    }
     /* Global the unfiltered offset to use in bp_core_load_template() */
+    // Global the unfiltered offset to use in bp_core_load_template()
     $bp_unfiltered_uri_offset = $uri_offset;
     /* This is a members page so lets check if we have a displayed member */
+    // This is a members page so lets check if we have a displayed member
     if ( 'members' == $match->key ) {
         if ( !empty( $bp_uri[$uri_offset + 1] ) ) {
 …
             $uri_offset = $uri_offset + 2;
             /* Remove everything from the URI up to the offset and take it from there. */
+            // Remove everything from the URI up to the offset and take it from there.
             for ( $i = 0; $i < $uri_offset; $i++ )
                 unset( $bp_uri[$i] );
 …
+    }
     /* Reset the keys by merging with an empty array */
+    // Reset the keys by merging with an empty array
     $bp_uri = array_merge( array(), $bp_uri );
     /* Set the current component */
+    // Set the current component
     if ( empty( $current_component ) ) {
         for ( $i = 0; $i <= $uri_offset; $i++ ) {
 …
         $i = 1;
     /* Set the current action */
+    // Set the current action
     $current_action = $bp_uri[$i];
     /* Unset the current_component and action from action_variables */
+    // Unset the current_component and action from action_variables
     for ( $j = 0; $j <= $i; $j++ )
         unset( $bp_uri[$j] );
     /* Set the entire URI as the action variables, we will unset the current_component and action in a second */
+    // Set the entire URI as the action variables, we will unset the current_component and action in a second
     $action_variables = $bp_uri;
     /* Remove the username from action variables if this is not a VHOST install */
+    // Remove the username from action variables if this is not a VHOST install
     if ( 'no' == VHOST && !$is_root_component )
         array_shift($bp_uri);
     /* Reset the keys by merging with an empty array */
+    // Reset the keys by merging with an empty array
     $action_variables = array_merge( array(), $action_variables );
-    //var_dump($current_component, $current_action, $bp_uri);
+}
 add_action( 'plugins_loaded', 'bp_core_set_uri_globals', 3 );
+add_action( 'bp_loaded', 'bp_core_set_uri_globals', 4 );
 /**

trunk/bp-core/bp-core-classes.php

-                      r3267
+                      r3300
      * @uses bp_core_get_userlink() Returns a HTML formatted link for a user with the user's full name as the link text
      * @uses bp_core_get_user_email() Returns the email address for the user based on user ID
      * @uses get_usermeta() WordPress function returns the value of passed usermeta name from usermeta table
+     * @uses get_user_meta() WordPress function returns the value of passed usermeta name from usermeta table
      * @uses bp_core_fetch_avatar() Returns HTML formatted avatar for a user
      * @uses bp_profile_last_updated_date() Returns the last updated date for a user.
 …
         if ( $this->profile_data ) {
             $this->user_url = bp_core_get_user_domain( $this->id, $this->profile_data['user_nicename'], $this->profile_data['user_login'] );
             $this->fullname = attribute_escape( $this->profile_data[BP_XPROFILE_FULLNAME_FIELD_NAME]['field_data'] );
+            $this->fullname = esc_attr( $this->profile_data[BP_XPROFILE_FULLNAME_FIELD_NAME]['field_data'] );
             $this->user_link = "<a href='{$this->user_url}' title='{$this->fullname}'>{$this->fullname}</a>";
             $this->email = attribute_escape( $this->profile_data['user_email'] );
+            $this->email = esc_attr( $this->profile_data['user_email'] );
         } else {
             $this->user_url = bp_core_get_user_domain( $this->id );
             $this->user_link = bp_core_get_userlink( $this->id );
             $this->fullname = attribute_escape( bp_core_get_user_displayname( $this->id ) );
             $this->email = attribute_escape( bp_core_get_user_email( $this->id ) );
+            $this->fullname = esc_attr( bp_core_get_user_displayname( $this->id ) );
+            $this->email = esc_attr( bp_core_get_user_email( $this->id ) );
+        }
 …
         $this->avatar_mini = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) );
         $this->last_active = bp_core_get_last_activity( get_usermeta( $this->id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) );
+        $this->last_active = bp_core_get_last_activity( get_user_meta( $this->id, 'last_activity', true ), __( 'active %s ago', 'buddypress' ) );
+    }
 …
     /* Static Functions */
     function get_users( $type, $limit = null, $page = 1, $user_id = false, $search_terms = false, $populate_extras = true ) {
+    function get_users( $type, $limit = null, $page = 1, $user_id = false, $include = false, $search_terms = false, $populate_extras = true ) {
         global $wpdb, $bp;
         $sql = array();
         $sql['select_main'] = "SELECT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
+        $sql['select_main'] = "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
         if ( 'active' == $type || 'online' == $type )
 …
         $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
+        if ( $search_terms && function_exists( 'xprofile_install' ) || 'alphabetical' == $type )
+            $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
         $sql['where'] = 'WHERE ' . bp_core_get_status_sql( 'u.' );
 …
         if ( 'online' == $type )
             $sql['where_online'] = "AND DATE_ADD( um.meta_value, INTERVAL 5 MINUTE ) >= NOW()";
+            $sql['where_online'] = "AND DATE_ADD( um.meta_value, INTERVAL 5 MINUTE ) >= UTC_TIMESTAMP()";
         if ( 'alphabetical' == $type )
             $sql['where_alpha'] = "AND pd.field_id = 1";
+        if ( $user_id && function_exists( 'friends_install' ) ) {
+        if ( $include ) {
+            if ( is_array( $include ) )
+                $uids = $wpdb->escape( implode( ',', (array)$include ) );
+            else
+                $uids = $wpdb->escape( $include );
+            if ( !empty( $uids ) )
+                $sql['where_users'] = "AND u.ID IN ({$uids})";
+        }
+        else if ( $user_id && function_exists( 'friends_install' ) ) {
             $friend_ids = friends_get_friend_user_ids( $user_id );
             $friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );
 …
+        }
         if ( $search_terms ) {
+        if ( $search_terms && function_exists( 'xprofile_install' ) ) {
             $search_terms = like_escape( $wpdb->escape( $search_terms ) );
             $sql['where_searchterms'] = "AND u.display_name LIKE '%%$search_terms%%'";
+            $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
+        }
 …
                 break;
             case 'alphabetical':
                 $sql[] = "ORDER BY u.display_name ASC";
+                $sql[] = "ORDER BY pd.value ASC";
                 break;
             case 'random':
 …
         /* Get paginated results */
+        $paged_users = $wpdb->get_results( join( ' ', (array)$sql ) );
+        $paged_users_sql = apply_filters( 'bp_core_get_paged_users_sql', join( ' ', (array)$sql ), $sql );
+        $paged_users     = $wpdb->get_results( $paged_users_sql );
         /* Re-jig the SQL so we can get the total user count */
 …
         /* Get total user results */
+        $total_users = $wpdb->get_var( join( ' ', (array)$sql ) );
+        $total_users_sql = apply_filters( 'bp_core_get_total_users_sql', join( ' ', (array)$sql ), $sql );
+        $total_users     = $wpdb->get_var( $total_users_sql );
         /***
 …
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( strlen($letter) > 1 || is_numeric($letter) || !$letter )
+            return false;
+        // Multibyte compliance
+        if ( function_exists( 'mb_strlen' ) ) {
+            if ( mb_strlen( $letter, 'UTF-8' ) > 1 || is_numeric( $letter ) || !$letter ) {
+                return false;
+            }
+        } else {
+            if ( strlen( $letter ) > 1 || is_numeric( $letter ) || !$letter ) {
+                return false;
+            }
+        }
         $letter = like_escape( $wpdb->escape( $letter ) );
 …
         /* Fetch the user's full name */
         if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
+            /* Ensure xprofile globals are set */
+            if ( !defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) )
+                xprofile_setup_globals();
             $names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
             for ( $i = 0; $i < count( $paged_users ); $i++ ) {
 …
         if ( $this->id ) {
             // Update
             $sql = $wpdb->prepare( "UPDATE {$bp->core->table_name_notifications} SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = FROM_UNIXTIME(%d), is_new = %d ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
+            $sql = $wpdb->prepare( "UPDATE {$bp->core->table_name_notifications} SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = %s, is_new = %d ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
         } else {
             // Save
             $sql = $wpdb->prepare( "INSERT INTO {$bp->core->table_name_notifications} ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
+            $sql = $wpdb->prepare( "INSERT INTO {$bp->core->table_name_notifications} ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %d, %s, %s, %s, %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
+        }

trunk/bp-core/bp-core-cssjs.php

-                      r3280
+                      r3300
     <style type="text/css">
         ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { background-image: url( <?php echo BP_PLUGIN_URL . '/bp-core/images/admin_menu_icon.png' ?> ) !important; background-position: -1px -32px; }
         ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a { background-position: -1px 0; }
+        ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a, ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a { background-position: -1px 0; }
         ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { display: none; }
     </style>
 …
     global $current_blog;
     if ( $current_blog->blog_id != BP_ROOT_BLOG )
+    if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
         return false;
 ?>
 …
     global $bp;
     $image = apply_filters( 'bp_inline_cropper_image', getimagesize( $bp->avatar_admin->image->dir ) );
+    $image = apply_filters( 'bp_inline_cropper_image', getimagesize( BP_AVATAR_UPLOAD_PATH . $bp->avatar_admin->image->dir ) );
     $aspect_ratio = 1;
     /* Calculate Aspect Ratio */
+    // Calculate Aspect Ratio
     if ( (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) && ( (int) constant( 'BP_AVATAR_FULL_WIDTH' ) != (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ) )
         $aspect_ratio = (int) constant( 'BP_AVATAR_FULL_WIDTH' ) / (int) constant( 'BP_AVATAR_FULL_HEIGHT' );

trunk/bp-core/bp-core-filters.php

-                      r2941
+                      r3300
  */
 function bp_core_email_from_name_filter() {
     return apply_filters( 'bp_core_email_from_name_filter', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
+    return apply_filters( 'bp_core_email_from_name_filter', wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES ) );
+}
 add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
 …
     global $bp, $current_blog;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return $themes;
 …
  * Replace the generated password in the welcome email.
  * This will not filter when the site admin registers a user.
+ *
+ * @uses locate_template To see if custom registration files exist
+ * @param string $welcome_email Complete email passed through WordPress
+ * @return string Filtered $welcome_email with 'PASSWORD' replaced by [User Set]
  */
 function bp_core_filter_user_welcome_email( $welcome_email ) {
 …
         return $welcome_email;
+    // [User Set] Replaces 'PASSWORD' in welcome email; Represents value set by user
     return str_replace( 'PASSWORD', __( '[User Set]', 'buddypress' ), $welcome_email );
+}
 …
  * Replace the generated password in the welcome email.
  * This will not filter when the site admin registers a user.
+ *
+ * @uses locate_template To see if custom registration files exist
+ * @param string $welcome_email Complete email passed through WordPress
+ * @param integer $blog_id ID of the blog user is joining
+ * @param integer $user_id ID of the user joining
+ * @param string $password Password of user
+ * @return string Filtered $welcome_email with $password replaced by [User Set]
  */
 function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
 …
         return $welcome_email;
+    // [User Set] Replaces $password in welcome email; Represents value set by user
     return str_replace( $password, __( '[User Set]', 'buddypress' ), $welcome_email );
+}
 …
     // Send email with activation link.
     $activate_url = bp_get_activation_page() ."?key=$key";
     $activate_url = clean_url($activate_url);
+    $activate_url = esc_url($activate_url);
     $admin_email = get_site_option( "admin_email" );
 …
     $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
     $message = sprintf(__("Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%1$s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%2$s", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}" ) );
     $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), clean_url('http://' . $domain . $path));
+    $message = sprintf(__("Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%1$s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%2$s", 'buddypress' ), $activate_url, esc_url("http://{$domain}{$path}" ) );
+    $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), esc_url('http://' . $domain . $path));
     /* Send the message */
 …
     $activate_url = bp_get_activation_page() ."?key=$key";
     $activate_url = clean_url($activate_url);
+    $activate_url = esc_url($activate_url);
     $admin_email = get_site_option( "admin_email" );
 …
     $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
     $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email, clean_url("http://{$domain}{$path}" ) );
+    $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email, esc_url( "http://{$domain}{$path}" ) );
     $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );

trunk/bp-core/bp-core-notifications.php

r2576	r3300
5	5
6	6	if ( !$date_notified )
7		$date_notified = time();
	7	$date_notified = bp_core_current_time();
8	8
9	9	$notification = new BP_Core_Notification;

trunk/bp-core/bp-core-settings.php

-                      r2717
+                      r3300
     bp_core_new_subnav_item( array( 'name' => __( 'Notifications', 'buddypress' ), 'slug' => 'notifications', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_notification_settings', 'position' => 20, 'user_has_access' => bp_is_my_profile() ) );
     if ( !is_site_admin() && !(int) $bp->site_options['bp-disable-account-deletion'] )
+    if ( !is_super_admin() && !(int) $bp->site_options['bp-disable-account-deletion'] )
         bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_my_profile() ) );
+}
+add_action( 'wp', 'bp_core_add_settings_nav', 2 );
+add_action( 'admin_menu', 'bp_core_add_settings_nav', 2 );
+add_action( 'bp_setup_nav', 'bp_core_add_settings_nav' );
 /**** GENERAL SETTINGS ****/
 …
     <form action="<?php echo $bp->loggedin_user->domain . BP_SETTINGS_SLUG . '/general' ?>" method="post" class="standard-form" id="settings-form">
         <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
         <input type="text" name="email" id="email" value="<?php echo attribute_escape( $current_user->user_email ); ?>" class="settings-input" />
+        <input type="text" name="email" id="email" value="<?php echo esc_attr( $current_user->user_email ); ?>" class="settings-input" />
         <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label>
 …
         <div class="submit">
             <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+            <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto" />
         </div>
 …
         if ( $_POST['notifications'] ) {
             foreach ( (array)$_POST['notifications'] as $key => $value ) {
                 update_usermeta( (int)$current_user->id, $key, $value );
+                update_user_meta( (int)$current_user->id, $key, $value );
+            }
+        }
 …
         <div class="submit">
             <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+            <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto" />
         </div>
 …
         <div class="submit">
             <input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ) ?> &rarr;" id="delete-account-button" name="delete-account-button" /></p>
+            <input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ) ?> &rarr;" id="delete-account-button" name="delete-account-button" />
         </div>

trunk/bp-core/bp-core-signup.php

r3277	r3300
181	181
182	182	/* Make sure we include the jQuery jCrop file for image cropping */
183		add_action( 'wp', 'bp_core_add_jquery_cropper' );
	183	add_action( 'wp_print_scripts', 'bp_core_add_jquery_cropper' );
184	184	}
185	185	}

trunk/bp-core/bp-core-templatetags.php

-                      r3286
+                      r3300
             $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page, $populate_extras );
         else
             $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
+            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
         if ( !$max || $max >= (int)$this->members['total'] )
 …
     $search_terms = false;
     /* User filtering */
+    // User filtering
     if ( !empty( $bp->displayed_user->id ) )
         $user_id = $bp->displayed_user->id;
     /* Pass a filter if ?s= is set. */
     if ( $_REQUEST['s'] )
+    // Pass a filter if ?s= is set.
+    if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
         $search_terms = $_REQUEST['s'];
 …
+    }
     /* Make sure we return no members if we looking at friendship requests and there are none. */
+    // Make sure we return no members if we looking at friendship requests and there are none.
     if ( empty( $include ) && $bp->friends->slug == $bp->current_component && 'requests' == $bp->current_action )
         return false;
     $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );
+    return $members_template->has_members();
+    return apply_filters( 'bp_has_members', $members_template->has_members(), &$members_template );
+}
 …
         global $bp, $members_template;
+        $from_num = bp_core_number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
+        $to_num = bp_core_number_format( ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1) );
+        $start_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
+        $from_num = bp_core_number_format( $start_num );
+        $to_num = bp_core_number_format( ( $start_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $start_num + ( $members_template->pag_num - 1 ) );
         $total = bp_core_number_format( $members_template->total_member_count );
 …
             $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total );
         return apply_filters( 'bp_members_pagination_count', $pag );
+        return apply_filters( 'bp_members_pagination_count', $pag . '<span class="ajax-loader"></span>' );
+    }
 …
+    }
+/**
+ * bp_member_user_id()
+ *
+ * Echo id from bp_get_member_user_id()
+ *
+ * @uses bp_get_member_user_id()
+ */
 function bp_member_user_id() {
     echo bp_get_member_user_id();
+}
+    /**
+     * bp_get_member_user_id()
+     *
+     * Get the id of the user in a members loop
+     *
+     * @global object $members_template
+     * @return string Members id
+     */
     function bp_get_member_user_id() {
         global $members_template;
 …
         return apply_filters( 'bp_get_member_user_id', $members_template->member->id );
+    }
+/**
+ * bp_member_user_nicename()
+ *
+ * Echo nicename from bp_get_member_user_nicename()
+ *
+ * @uses bp_get_member_user_nicename()
+ */
+function bp_member_user_nicename() {
+    echo bp_get_member_user_nicename();
+}
+    /**
+     * bp_get_member_user_nicename()
+     *
+     * Get the nicename of the user in a members loop
+     *
+     * @global object $members_template
+     * @return string Members nicename
+     */
+    function bp_get_member_user_nicename() {
+        global $members_template;
+        return apply_filters( 'bp_get_member_user_nicename', $members_template->member->user_nicename );
+    }
+/**
+ * bp_member_user_login()
+ *
+ * Echo login from bp_get_member_user_login()
+ *
+ * @uses bp_get_member_user_login()
+ */
+function bp_member_user_login() {
+    echo bp_get_member_user_login();
+}
+    /**
+     * bp_get_member_user_login()
+     *
+     * Get the login of the user in a members loop
+     *
+     * @global object $members_template
+     * @return string Members login
+     */
+    function bp_get_member_user_login() {
+        global $members_template;
+        return apply_filters( 'bp_get_member_user_login', $members_template->member->user_login );
+    }
+/**
+ * bp_member_user_email()
+ *
+ * Echo email address from bp_get_member_user_email()
+ *
+ * @uses bp_get_member_user_email()
+ */
+function bp_member_user_email() {
+    echo bp_get_member_user_email();
+}
+    /**
+     * bp_get_member_user_email()
+     *
+     * Get the email address of the user in a members loop
+     *
+     * @global object $members_template
+     * @return string Members email address
+     */
+    function bp_get_member_user_email() {
+        global $members_template;
+        return apply_filters( 'bp_get_member_user_email', $members_template->member->user_email );
+    }
+function bp_member_is_loggedin_user() {
+    global $bp, $members_template;
+    return apply_filters( 'bp_member_is_loggedin_user', $bp->loggedin_user->id == $members_template->member->id ? true : false );
+}
 function bp_member_avatar( $args = '' ) {
 …
         // Populate the user if it hasn't been already.
         if ( empty( $members_template->member->profile_data ) )
             $members_template->member = new BP_Core_User( $members_template->member->id );
+        if ( empty( $members_template->member->profile_data ) && method_exists( 'BP_XProfile_ProfileData', 'get_all_for_user' ) )
+            $members_template->member->profile_data = BP_XProfile_ProfileData::get_all_for_user( $members_template->member->id );
         $data = xprofile_format_profile_field( $members_template->member->profile_data[$field]['field_type'], $members_template->member->profile_data[$field]['field_data'] );
 …
         global $members_template;
         $registered = attribute_escape( bp_core_get_last_activity( $members_template->member->user_registered, __( 'registered %s ago', 'buddypress' ) ) );
+        $registered = esc_attr( bp_core_get_last_activity( $members_template->member->user_registered, __( 'registered %s ago', 'buddypress' ) ) );
         return apply_filters( 'bp_member_last_active', $registered );
 …
 function bp_member_hidden_fields() {
     if ( isset( $_REQUEST['s'] ) ) {
         echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
     if ( isset( $_REQUEST['letter'] ) ) {
         echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+        echo '<input type="hidden" id="selected_letter" value="' . esc_attr( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
     if ( isset( $_REQUEST['members_search'] ) ) {
         echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['members_search'] ) . '" name="search_terms" />';
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['members_search'] ) . '" name="search_terms" />';
+    }
+}
 …
     ?>
     <form action="" method="get" id="search-members-form">
         <label><input type="text" name="s" id="members_search" value="<?php echo attribute_escape( $search_value ) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+        <label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
         <input type="submit" id="members_search_submit" name="members_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
     </form>
 …
         $bp->bp_options_title = __( 'Options', 'buddypress' );
     echo apply_filters( 'bp_get_options_title', attribute_escape( $bp->bp_options_title ) );
+    echo apply_filters( 'bp_get_options_title', esc_attr( $bp->bp_options_title ) );
+}
 …
         $defaults = array(
+            'type' => 'thumb',
+            'width' => false,
+            'height' => false
+            'type'      => 'thumb',
+            'width'     => false,
+            'height'    => false,
+            'html'      => true
         );
 …
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->loggedin_user->id, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+        return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->loggedin_user->id, 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html ) ) );
+    }
 …
         $defaults = array(
+            'type' => 'thumb',
+            'width' => false,
+            'height' => false
+            'type'      => 'thumb',
+            'width'     => false,
+            'height'    => false,
+            'html'      => true
         );
 …
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+        return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html ) ) );
+    }
 …
+}
-function bp_is_my_profile() {
-    global $bp;
-    if ( is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
-        return true;
-    return false;
+}
-function bp_is_home() { return bp_is_my_profile(); }
-function bp_get_loggedin_user_link() {
-    global $bp;
-    return $bp->loggedin_user->domain;
+}
-function bp_get_displayed_user_link() {
-    global $bp;
-    return $bp->displayed_user->domain;
+}
-function bp_last_activity( $user_id = false, $echo = true ) {
-    global $bp;
-    if ( !$user_id )
-        $user_id = $bp->displayed_user->id;
-    $last_activity = bp_core_get_last_activity( get_usermeta( $user_id, 'last_activity' ), __('active %s ago', 'buddypress') );
-    if ( $echo )
-        echo apply_filters( 'bp_last_activity', $last_activity );
-    else
-        return apply_filters( 'bp_last_activity', $last_activity );
+}
-function bp_user_firstname() {
-    echo bp_get_user_firstname();
+}
-    function bp_get_user_firstname( $name = false ) {
-        global $bp;
-        if ( !$name )
-            $name = $bp->loggedin_user->fullname;
-        $fullname = (array)explode( ' ', $name );
-        return apply_filters( 'bp_get_user_firstname', $fullname[0], $fullname );
+    }
-function bp_user_link() {
-    global $bp;
-    echo apply_filters( 'bp_the_avatar_thumbnail', $bp->displayed_user->domain );
+}
 function bp_core_get_wp_profile() {
     global $bp;
 …
     <h4><?php _e( 'My Profile' ) ?></h4>
     <table class="wp-profile-fields">
+    <table class="wp-profile-fields zebra">
         <?php if ( $ud->display_name ) { ?>
         <tr id="wp_displayname">
 …
 function bp_format_time( $time, $just_date = false ) {
+    $date = date( get_option('date_format'), $time );
+    if ( !$time )
+        return false;
+    // Get GMT offset from root blog
+    $root_blog_offset = get_blog_option( BP_ROOT_BLOG, 'gmt_offset' );
+    // Calculate offset time
+    $time_offset = $time + ( $root_blog_offset * 3600 );
+    // Current date (January 1, 2010)
+    $date = date( 'F j, Y ', $time_offset );
+    // Should we show the time also?
     if ( !$just_date ) {
+        $date .= ' ' . __( 'at', 'buddypress' ) . date( ' ' . get_option('time_format'), $time );
+        // Current time (9:50pm)
+        $time = date( ' g:ia', $time_offset );
+        // Return string formatted with date and time
+        $date = sprintf( __( '%1$s at %2$s', 'buddypress' ), $date, $time );
+    }
 …
+}
-function bp_loggedinuser_link() {
-    global $bp;
-    if ( $link = bp_core_get_userlink( $bp->loggedin_user->id ) ) {
-        echo apply_filters( 'bp_loggedinuser_link', $link );
+    }
+}
 function bp_get_plugin_sidebar() {
     locate_template( array( 'plugin-sidebar.php' ), true );
+}
-function bp_is_blog_page() {
-    global $bp, $is_member_page, $wp_query;
-    if ( $wp_query->is_home && !$bp->is_directory )
-        return true;
-    if ( !$bp->displayed_user->id && !$bp->is_single_item && !$bp->is_directory && !bp_core_is_root_component( $bp->current_component ) )
-        return true;
-    return false;
+}
 function bp_page_title() {
     echo bp_get_page_title();
 …
     global $bp, $post, $wp_query, $current_blog;
     if ( is_front_page() || !bp_current_component() || ( is_home() && bp_is_page( 'home' ) ) ) {
+    if ( is_front_page() || ( is_home() && bp_is_page( 'home' ) ) ) {
         $title = __( 'Home', 'buddypress' );
 …
     } else if ( $bp->is_directory ) {
+        $title = get_the_title();
+        if ( !$bp->current_component )
+            $title = sprintf( __( '%s Directory', 'buddypress' ), ucwords( BP_MEMBERS_SLUG ) );
+        else
+            $title = sprintf( __( '%s Directory', 'buddypress' ), ucwords( $bp->current_component ) );
     } else if ( bp_is_register_page() ) {
         $title = __( 'Create an Account', 'buddypress' );
     } else if ( bp_is_activation_page() ) {
         $title = __( 'Activate your Account', 'buddypress' );
+    } else if ( bp_is_group_create() ) {
+        $title = __( 'Create a Group', 'buddypress' );
+    } else if ( bp_is_create_blog() ) {
+        $title = __( 'Create a Blog', 'buddypress' );
+    }
 …
+    }
+/**
+ * bp_search_form_available()
+ *
+ * Only show the search form if there are available objects to search for.
+ *
+ * @global array $bp
+ * @uses function_exists
+ * @uses bp_core_is_multisite()
+ * @return bool Filterable result
+ */
+function bp_search_form_enabled() {
+    global $bp;
+    if ( function_exists( 'xprofile_install' )
+         || function_exists( 'groups_install' )
+         || ( function_exists( 'bp_blogs_install' ) && bp_core_is_multisite() )
+         || ( function_exists( 'bp_forums_setup' ) && !(int)$bp->site_options['bp-disable-forum-directory'] )
+        ) {
+        $search_enabled = true;
+    } else {
+        $search_enabled = false;
+    }
+    return apply_filters( 'bp_search_form_enabled', $search_enabled );
+}
 function bp_search_form_action() {
     global $bp;
 …
 function bp_search_form_type_select() {
+    global $bp;
     // Eventually this won't be needed and a page will be built to integrate all search results.
     $selection_box = '<select name="search-which" id="search-which" style="width: auto">';
 …
 function bp_custom_profile_sidebar_boxes() {
     do_action( 'bp_custom_profile_sidebar_boxes' );
+}
-function bp_is_directory() {
-    global $bp;
-    return $bp->is_directory;
+}
 …
 function bp_registration_needs_activation() {
     return apply_filters( 'bp_registration_needs_activation', bp_core_is_multisite() );
+    return apply_filters( 'bp_registration_needs_activation', true );
+}
 …
    also means we dont have to use the $bp variable in the template (looks messy) */
+function bp_last_activity( $user_id = false, $echo = true ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = $bp->displayed_user->id;
+    $last_activity = bp_core_get_last_activity( get_user_meta( $user_id, 'last_activity', true ), __('active %s ago', 'buddypress') );
+    if ( $echo )
+        echo apply_filters( 'bp_last_activity', $last_activity );
+    else
+        return apply_filters( 'bp_last_activity', $last_activity );
+}
+function bp_user_has_access() {
+    global $bp;
+    if ( is_super_admin() || is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
+        $has_access = true;
+    else
+        $has_access = false;
+    return apply_filters( 'bp_user_has_access', $has_access );
+}
+function bp_user_firstname() {
+    echo bp_get_user_firstname();
+}
+    function bp_get_user_firstname( $name = false ) {
+        global $bp;
+        // Try to get displayed user
+        if ( empty( $name ) )
+            $name = $bp->displayed_user->fullname;
+        // Fall back on logged in user
+        if ( empty( $name ) )
+            $name = $bp->loggedin_user->fullname;
+        $fullname = (array)explode( ' ', $name );
+        return apply_filters( 'bp_get_user_firstname', $fullname[0], $fullname );
+    }
+function bp_loggedin_user_link() {
+    echo bp_get_loggedin_user_link();
+}
+    function bp_get_loggedin_user_link() {
+        global $bp;
+        return apply_filters( 'bp_get_loggedin_user_link', $bp->loggedin_user->domain );
+    }
+/* @todo Deprecate incorrectly named function? */
+function bp_loggedinuser_link() {
+    global $bp;
+    if ( $link = bp_core_get_userlink( $bp->loggedin_user->id ) )
+        echo apply_filters( 'bp_loggedin_user_link', $link );
+}
+function bp_displayed_user_link() {
+    echo bp_get_displayed_user_link();
+}
+    function bp_get_displayed_user_link() {
+        global $bp;
+        return apply_filters( 'bp_get_displayed_user_link', $bp->displayed_user->domain );
+    }
+    function bp_user_link() { bp_displayed_user_link(); } // Deprecated.
 function bp_displayed_user_id() {
     global $bp;
 …
         global $bp;
         return $bp->root_domain;
+        return apply_filters( 'bp_get_root_domain', $bp->root_domain );
+    }
 /* Template is_() functions to determine the current page */
+function bp_is_blog_page() {
+    global $bp, $is_member_page, $wp_query;
+    if ( $wp_query->is_home && !$bp->is_directory )
+        return true;
+    if ( !$bp->displayed_user->id && !$bp->is_single_item && !$bp->is_directory && !bp_core_is_root_component( $bp->current_component ) )
+        return true;
+    return false;
+}
+function bp_is_my_profile() {
+    global $bp;
+    if ( is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
+        $my_profile = true;
+    else
+        $my_profile = false;
+    return apply_filters( 'bp_is_my_profile', $my_profile );
+}
+function bp_is_home() { return bp_is_my_profile(); }
 function bp_is_front_page() {
 …
 function bp_is_activity_front_page() {
+    return ( 'page' == get_option('show_on_front') && 'activity' == get_option('page_on_front') && $_SERVER['REQUEST_URI'] == bp_core_get_site_path() );
+    global $current_blog;
+    if ( bp_core_is_main_site() )
+        $path = bp_core_get_site_path();
+    else
+        $path = $current_blog->path;
+    return ( 'page' == get_option('show_on_front') && 'activity' == get_option('page_on_front') && $_SERVER['REQUEST_URI'] == $path );
+}
+function bp_is_directory() {
+    global $bp;
+    return $bp->is_directory;
+}

trunk/bp-core/bp-core-widgets.php

-                      r3263
+                      r3300
             </ul>
             <?php wp_nonce_field( 'bp_core_widget_members', '_wpnonce-members' ); ?>
             <input type="hidden" name="members_widget_max" id="members_widget_max" value="<?php echo attribute_escape( $instance['max_members'] ); ?>" />
+            <input type="hidden" name="members_widget_max" id="members_widget_max" value="<?php echo esc_attr( $instance['max_members'] ); ?>" />
         <?php else: ?>
 …
         ?>
         <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo attribute_escape( $max_members ); ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
     <?php
+    }
 …
         ?>
         <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo attribute_escape( $max_members ); ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
     <?php
+    }
 …
         global $bp;
         extract( $args );
+        extract( $args );
         echo $before_widget;
 …
         ?>
         <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo attribute_escape( $max_members ); ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
     <?php
+    }
 …
             $type = 'newest';
             break;
         case 'recently-active-members':
             $type = 'active';
             break;
         case 'popular-members':
             if ( bp_is_active( 'friends' ) )

trunk/bp-core/bp-core-wpabstraction.php

-                      r3284
+                      r3300
     return true;
+}
+/**
+ * bp_core_is_main_site
+ *
+ * Checks if current blog is root blog of site
+ *
+ * @since 1.2.6
+ * @package BuddyPress
+ *
+ * @param int $blog_id optional blog id to test (default current blog)
+ * @return bool True if not multisite or $blog_id is main site
+ */
+function bp_core_is_main_site( $blog_id = '' ) {
+    global $current_site, $current_blog;
+    if ( !bp_core_is_multisite() )
+        return true;
+    if ( empty( $blog_id ) )
+        $blog_id = $current_blog->blog_id;
+    return $blog_id == $current_site->blog_id;
+}
 …
+}
+if ( !function_exists( 'wpmu_validate_user_signup' ) ) {
+    function wpmu_validate_user_signup( $user_name, $user_email ) {
+        global $wpdb;
+if ( !function_exists( 'is_subdomain_install' ) ) {
+    function is_subdomain_install() {
+        if ( ( defined( 'VHOST' ) && 'yes' == VHOST ) || ( defined( 'SUBDOMAIN_INSTALL' ) && SUBDOMAIN_INSTALL ) )
+            return true;
+        $errors = new WP_Error();
+        $user_email = sanitize_email( $user_email );
+        if ( empty( $user_name ) )
+            $errors->add('user_name', __("Please enter a username"));
+        $maybe = array();
+        preg_match( "/[a-z0-9]+/", $user_name, $maybe );
+        $illegal_names = get_site_option( "illegal_names" );
+        if( is_array( $illegal_names ) == false ) {
+            $illegal_names = array(  "www", "web", "root", "admin", "main", "invite", "administrator" );
+            add_site_option( "illegal_names", $illegal_names );
+        }
+        if ( !validate_username( $user_name ) || in_array( $user_name, $illegal_names ) == true || $user_name != $maybe[0] ) {
+            $errors->add('user_name', __("Only lowercase letters and numbers allowed"));
+        }
+        if( strlen( $user_name ) < 4 ) {
+            $errors->add('user_name',  __("Username must be at least 4 characters"));
+        }
+        if ( strpos( " " . $user_name, "_" ) != false )
+            $errors->add('user_name', __("Sorry, usernames may not contain the character '_'!"));
+        // all numeric?
+        $match = array();
+        preg_match( '/[0-9]*/', $user_name, $match );
+        if ( $match[0] == $user_name )
+            $errors->add('user_name', __("Sorry, usernames must have letters too!"));
+        if ( !is_email( $user_email ) )
+            $errors->add('user_email', __("Please check your email address."));
+        $limited_email_domains = get_site_option( 'limited_email_domains' );
+        if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
+            $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
+            if( in_array( $emaildomain, $limited_email_domains ) == false ) {
+                $errors->add('user_email', __("Sorry, that email address is not allowed!"));
+            }
+        }
+        // Check if the username has been used already.
+        if ( username_exists($user_name) )
+            $errors->add('user_name', __("Sorry, that username already exists!"));
+        // Check if the email address has been used already.
+        if ( email_exists($user_email) )
+            $errors->add('user_email', __("Sorry, that email address is already used!"));
+        $result = array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors);
+        return apply_filters('wpmu_validate_user_signup', $result);
+        return false;
+    }
+}
+// Deprecated - 1.2.6
+if ( !function_exists( 'is_site_admin' ) ) {
+    function is_site_admin( $user_id = false ) {
+        return is_super_admin( $user_id );
+    }
+}
 ?>

trunk/bp-forums.php

-                      r3232
+                      r3300
 <?php
 /* Define the parent forum ID */
 if ( !defined( 'BP_FORUMS_PARENT_FORUM_ID' ) )
     define( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
+if ( !defined( 'BP_FORUMS_SLUG' ) )
+    define( 'BP_FORUMS_SLUG', 'forums' );
 if ( !defined( 'BB_PATH' ) )
     require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress.php' );
 …
     global $bp;
-    if ( !defined( 'BP_FORUMS_SLUG' ) )
-        define ( 'BP_FORUMS_SLUG', $bp->pages->forums->slug );
     /* For internal identification */
     $bp->forums->id = 'forums';
-    $bp->forums->name = $bp->pages->forums->name;
-    $bp->forums->slug = BP_FORUMS_SLUG;
     $bp->forums->image_base = BP_PLUGIN_URL . '/bp-forums/images';
     $bp->forums->bbconfig = $bp->site_options['bb-config-location'];
+    $bp->forums->slug = BP_FORUMS_SLUG;
     /* Register this in the active components array */
 …
+}
+function bp_forums_setup_root_component() {
+    /* Register 'forums' as a root component */
+    bp_core_add_root_component( BP_FORUMS_SLUG );
+}
+add_action( 'bp_setup_root_components', 'bp_forums_setup_root_component' );
 function bp_forums_directory_forums_setup() {
     global $bp;
     if ( $bp->current_component == $bp->forums->slug ) {
         if ( (int) $bp->site_options['bp-disable-forum-directory'] || !bp_is_active( 'groups' ) )
+        if ( (int) $bp->site_options['bp-disable-forum-directory'] || !function_exists( 'groups_install' ) )
             return false;
 …
             if ( $bp->groups->current_group = groups_get_group( array( 'group_id' => $_POST['topic_group_id'] ) ) ) {
                 /* Auto join this user if they are not yet a member of this group */
                 if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                if ( !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                     groups_join_group( $bp->groups->current_group->id, $bp->groups->current_group->id );
 …
                     bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug . '/' );
+                } else {
+                    bp_core_add_message( __( 'Please pick the group forum where you would like to post this topic.', 'buddypress' ), 'error' );
+                }
+            }
 …
     global $bp;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
 …
     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_update_forum( $args = '' ) {
+    do_action( 'bbpress_init' );
+    $defaults = array(
+        'forum_id'          => '',
+        'forum_name'        => '',
+        'forum_desc'        => '',
+        'forum_slug'        => '',
+        '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_update_forum( array( 'forum_id' => (int)$forum_id, 'forum_name' => stripslashes( $forum_name ), 'forum_desc' => stripslashes( $forum_desc ), 'forum_slug' => stripslashes( $forum_slug ), 'forum_parent' => $forum_parent_id, 'forum_order' => $forum_order, 'forum_is_category' => $forum_is_category ) );
+}
 …
     /* Fetch fullname for the topic's last poster */
     if ( bp_is_active( 'xprofile' ) ) {
+    if ( function_exists( 'xprofile_install' ) ) {
         $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, pd.value FROM {$bp->profile->table_name_data} pd, {$bbdb->topics} t WHERE pd.user_id = t.topic_last_poster AND pd.field_id = 1 AND t.topic_id IN ( {$topic_ids} )" ) );
         for ( $i = 0; $i < count( $topics ); $i++ ) {
 …
         $post_position = $post->post_position;
     $post = bb_insert_post( array( 'post_id' => $post_id, 'topic_id' => $topic_id, 'post_text' => stripslashes( trim( $post_text ) ), 'post_time' => $post_time, 'poster_id' => $poster_id, 'poster_ip' => $poster_ip, 'post_status' => $post_status, 'post_position' => $post_position ) );
     if ( $post )
+    $post_id = bb_insert_post( array( 'post_id' => $post_id, 'topic_id' => $topic_id, 'post_text' => stripslashes( trim( $post_text ) ), 'post_time' => $post_time, 'poster_id' => $poster_id, 'poster_ip' => $poster_ip, 'post_status' => $post_status, 'post_position' => $post_position ) );
+    if ( $post_id )
         do_action( 'bp_forums_new_post', $post_id );
     return $post;
+    return $post_id;
+}
 …
     /* Fetch fullname for each poster. */
     if ( bp_is_active( 'xprofile' ) ) {
+    if ( function_exists( 'xprofile_install' ) ) {
         $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id, pd.value FROM {$bp->profile->table_name_data} pd WHERE pd.user_id IN ( {$user_ids} )" ) );
         for ( $i = 0; $i < count( $posts ); $i++ ) {
 …
     global $bp, $wp_roles, $bb_table_prefix;
     $bb_cap = get_usermeta( $bp->loggedin_user->id, $bb_table_prefix . 'capabilities' );
+    $bb_cap = get_user_meta( $bp->loggedin_user->id, $bb_table_prefix . 'capabilities', true );
     if ( empty( $bb_cap ) )

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

-                      r2665
+                      r3300
 function bp_forums_bbpress_install() {
     global $wpdb, $bbdb;
+    global $wpdb, $bbdb, $bp;
     check_admin_referer( 'bp_forums_new_install_init' );
 …
             "define( 'BB_LOGGED_I"          => array( "'put your unique phrase here'",  "'" . addslashes( LOGGED_IN_KEY ) . "'" ),
             "define( 'BB_NONCE_KE"          => array( "'put your unique phrase here'",  "'" . addslashes( NONCE_KEY ) . "'" ),
             "\$bb_table_prefix = '"         => array( "'bb_'",                          "'" . $wpdb->base_prefix . "bb_'" ),
+            "\$bb_table_prefix = '"         => array( "'bb_'",                          "'" . $bp->table_prefix . "bb_'" ),
             "define( 'BB_LANG', '"          => array( "''",                             "'" . WPLANG . "'" )
+        )
 …
     $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->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' ) . '\';';
     if ( bp_core_is_multisite() )
 …
     if ( defined( 'AUTH_SALT' ) )
         $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', "' . addslashes( AUTH_SALT ) . '");';
+        $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', \'' . addslashes( AUTH_SALT ) . '\');';
     if ( defined( 'LOGGED_IN_SALT' ) )
         $file .= "\n" .   'define(\'BB_LOGGED_IN_SALT\', "' . addslashes( LOGGED_IN_SALT ) . '");';
+        $file .= "\n" .   'define(\'BB_LOGGED_IN_SALT\', \'' . addslashes( LOGGED_IN_SALT ) . '\');';
     if ( defined( 'SECURE_AUTH_SALT' ) )
         $file .= "\n" .   'define(\'BB_SECURE_AUTH_SALT\', "' . addslashes( SECURE_AUTH_SALT ) . '");';
+        $file .= "\n" .   'define(\'BB_SECURE_AUTH_SALT\', \'' . addslashes( SECURE_AUTH_SALT ) . '\');';
     $file .= "\n\n" . 'define(\'WP_AUTH_COOKIE_VERSION\', 2);';

trunk/bp-forums/bp-forums-bbpress.php

-                      r2209
+                      r3300
     /* This must be loaded before functionss.bb-admin.php otherwise we get a function conflict. */
     if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) )
         require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
     require_once( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
     if ( is_object( $wp_roles ) ) {
         $bb_roles =& $wp_roles;
+        $bb_roles = $wp_roles;
         bb_init_roles( $bb_roles );
+    }
 …
         $site_admins = get_site_option( 'site_admins', array('admin') );
         foreach ( (array)$site_admins as $site_admin )
             update_usermeta( bp_core_get_userid( $site_admin ), $bb_table_prefix . 'capabilities', array( 'keymaster' => true ) );
+            update_user_meta( bp_core_get_userid( $site_admin ), $bb_table_prefix . 'capabilities', array( 'keymaster' => true ) );
         // Create the first forum.
 …
         extract( $args, EXTR_SKIP );
         return update_usermeta( $id, $meta_key, $meta_value );
+        return update_user_meta( $id, $meta_key, $meta_value );
+    }
+}

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

-                      r2770
+                      r3300
 /* Apply WordPress defined filters */
 add_filter( 'bp_forums_bbconfig_location', 'wp_filter_kses', 1 );
 add_filter( 'bp_forums_bbconfig_location', 'attribute_escape', 1 );
+add_filter( 'bp_forums_bbconfig_location', 'esc_attr', 1 );
 add_filter( 'bp_get_the_topic_title', 'wp_filter_kses', 1 );
 add_filter( 'bp_get_the_topic_latest_post_excerpt', 'bp_forums_filter_kses', 1 );
 add_filter( 'bp_get_the_topic_post_content', 'bp_forums_filter_kses', 1 );
+add_filter( 'bp_get_the_topic_title', 'force_balance_tags' );
+add_filter( 'bp_get_the_topic_latest_post_excerpt', 'force_balance_tags' );
+add_filter( 'bp_get_the_topic_post_content', 'force_balance_tags' );
 add_filter( 'bp_get_the_topic_title', 'wptexturize' );
 …
 add_filter( 'bp_get_the_topic_poster_name', 'stripslashes_deep' );
 add_filter( 'bp_get_the_topic_last_poster_name', 'stripslashes_deep' );
+add_filter( 'bp_get_the_topic_object_name', 'stripslashes_deep' );
 add_filter( 'bp_get_the_topic_post_content', 'make_clickable' );
 …
+    }
+/**
+ * bp_forums_add_forum_topic_to_page_title( $title )
+ *
+ * Append forum topic to page title
+ *
+ * @global object $bp
+ * @param string $title
+ * @return string
+ */
+function bp_forums_add_forum_topic_to_page_title( $title ) {
+    global $bp;
+    if ( $bp->current_action == 'forum' && $bp->action_variables[0] == 'topic' ) {
+        if ( bp_has_forum_topic_posts() ) {
+            $title .= ' &#124; ' . bp_get_the_topic_title();
+        }
+    }
+    return $title;
+}
+add_filter( 'bp_page_title', 'bp_forums_add_forum_topic_to_page_title' );
 ?>

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

-                      r3247
+                      r3300
     var $topic;
+    var $forum_id;
     var $in_the_loop;
 …
         $this->type         = $type;
         $this->search_terms = $search_terms;
+        $this->forum_id     = $forum_id;
         switch ( $type ) {
 …
         if ( !(int)$this->topics ) {
             $this->topic_count = 0;
+            $this->topic_count       = 0;
             $this->total_topic_count = 0;
         } else {
 …
+            }
             if ( !$max || $max >= $topic_count )
+            if ( !$max || $max >= $topic_count ) {
                 $this->total_topic_count = $topic_count;
             else
+            } else {
                 $this->total_topic_count = (int)$max;
+            }
             if ( $max ) {
                 if ( $max >= count( $this->topics ) ) {
+                if ( $max >= count($this->topics) ) {
                     $this->topic_count = count( $this->topics );
                 } else {
 …
                 'base'      => add_query_arg( array( 'p' => '%#%', 'n' => $this->pag_num ) ),
                 'format'    => '',
                 'total'     => ceil( (int)$this->total_topic_count / (int)$this->pag_num ),
+                'total'     => ceil( (int)$this->total_topic_count / (int)$this->pag_num),
                 'current'   => $this->pag_page,
                 'prev_text' => '&larr;',
 …
         $post = bb_get_first_post( (int)$forum_template->topic->topic_id, false );
         return apply_filters( 'bp_get_the_topic_text', attribute_escape( $post->post_text ) );
+        return apply_filters( 'bp_get_the_topic_text', esc_attr( $post->post_text ) );
+    }
 …
         global $forum_template;
+        if ( !$name = bp_core_get_userlink( $forum_template->topic->poster_id ) )
+        $poster_id = ( empty( $forum_template->topic->poster_id ) ) ? $forum_template->topic->topic_poster : $forum_template->topic->poster_id;
+        if ( !$name = bp_core_get_userlink( $poster_id ) )
             return __( 'Deleted User', 'buddypress' );
 …
         global $forum_template;
         return $forum_template->topic->topic_posts;
+        return apply_filters( 'bp_get_the_topic_total_posts', $forum_template->topic->topic_posts );
+    }
 …
         $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit Topic', 'buddypress' ) . '</a>';
         if ( $bp->is_item_admin || $bp->is_item_mod || is_site_admin() ) {
+        if ( $bp->is_item_admin || $bp->is_item_mod || is_super_admin() ) {
             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 Topic', 'buddypress' ) . '</a>';
 …
             $class .= ' closed';
         return trim( $class );
+        return apply_filters( 'bp_get_the_topic_css_class', trim( $class ) );
+    }
 …
         global $bp, $forum_template;
+        $from_num = bp_core_number_format( intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1 );
+        $to_num = bp_core_number_format( ( $from_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 ) );
+        $start_num = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
+        $from_num = bp_core_number_format( $start_num );
+        $to_num = bp_core_number_format( ( $start_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $start_num + ( $forum_template->pag_num - 1 ) );
         $total = bp_core_number_format( $forum_template->total_topic_count );
 …
             $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
         return apply_filters( 'bp_get_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (of %s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) );
+        return apply_filters( 'bp_get_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (of %s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) . '<span class="ajax-loader"></span>' );
+    }
 …
     var $post;
+    var $forum_id;
     var $topic_id;
     var $topic;
 …
     var $order;
     function BP_Forums_Template_Topic( $topic_id, $per_page, $max ) {
+    function BP_Forums_Template_Topic( $topic_id, $per_page, $max, $order ) {
         global $bp, $current_user, $forum_template;
 …
         $this->topic_id        = $topic_id;
         $forum_template->topic = (object) bp_forums_get_topic_details( $this->topic_id );
+        $this->forum_id        = $forum_template->topic->forum_id;
         $this->posts           = bp_forums_get_topic_posts( array( 'topic_id' => $this->topic_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'order' => $this->order ) );
         if ( !$this->posts ) {
             $this->post_count = 0;
+            $this->post_count       = 0;
             $this->total_post_count = 0;
         } else {
             if ( !$max || $max >= (int) $forum_template->topic->topic_posts ) {
                 $this->total_post_count = (int) $forum_template->topic->topic_posts;
+            if ( !$max || $max >= (int)$forum_template->topic->topic_posts ) {
+                $this->total_post_count = (int)$forum_template->topic->topic_posts;
             } else {
                 $this->total_post_count = (int)$max;
 …
         'topic_id' => false,
         'per_page' => 15,
+        'max' => false
+        'max'      => false,
+        'order'    => 'ASC'
     );
 …
         $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
+    if ( is_numeric( $topic_id ) )
+        $topic_template = new BP_Forums_Template_Topic( $topic_id, $per_page, $max );
+    else
+    if ( is_numeric( $topic_id ) ) {
+        $topic_template = new BP_Forums_Template_Topic( $topic_id, $per_page, $max, $order );
+        // Current topic forum_id needs to match current_group forum_id
+        if ( $bp->current_component == $bp->groups->slug && $topic_template->forum_id != groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) )
+            return false;
+    } else {
         return false;
+    }
     return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), &$topic_template );
 …
         return apply_filters( 'bp_get_the_topic_post_content', stripslashes( $topic_template->post->post_text ) );
+    }
+function bp_the_topic_post_css_class() {
+    echo bp_get_the_topic_post_css_class();
+}
+    function bp_get_the_topic_post_css_class() {
+        global $topic_template;
+        $class = false;
+        if ( $topic_template->current_post % 2 == 1 )
+            $class .= 'alt';
+        if ( 1 == (int)$topic_template->post->post_status )
+            $class .= ' deleted';
+        if ( 0 == (int)$topic_template->post->post_status )
+            $class .= ' open';
+        return apply_filters( 'bp_get_the_topic_post_css_class', trim( $class ) );
+    }
 …
             $query_vars = '?' . $_SERVER['QUERY_STRING'];
         $links  = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . $topic_template->post->id . 'edit/post/' . $topic_template->post->post_id . '/' . $query_vars, 'bp_forums_edit_post' ) . '">' . __( 'Edit', 'buddypress' ) . '</a> ' . $seperator . ' ';
+        $links  = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit/post/' . $topic_template->post->post_id . '/' . $query_vars, 'bp_forums_edit_post' ) . '">' . __( 'Edit', 'buddypress' ) . '</a> ' . $seperator . ' ';
         $links .= '<a class="confirm" id="post-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'delete/post/' . $topic_template->post->post_id, 'bp_forums_delete_post' ) . '">' . __( 'Delete', 'buddypress' ) . '</a> | ';
 …
         $post = bp_forums_get_post( $bp->action_variables[4] );
         return apply_filters( 'bp_get_the_topic_post_edit_text', attribute_escape( $post->post_text ) );
+        return apply_filters( 'bp_get_the_topic_post_edit_text', esc_attr( $post->post_text ) );
+    }
 …
     global $bp, $topic_template;
+    $from_num = intval( ( $topic_template->pag_page - 1 ) * $topic_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $topic_template->pag_num - 1  ) > $topic_template->total_post_count ) ? $topic_template->total_post_count : $from_num + ( $topic_template->pag_num - 1 );
+    echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $topic_template->total_post_count ) );
+    $start_num = intval( ( $topic_template->pag_page - 1 ) * $topic_template->pag_num ) + 1;
+    $from_num = bp_core_number_format( $start_num );
+    $to_num = bp_core_number_format( ( $start_num + ( $topic_template->pag_num - 1  ) > $topic_template->total_post_count ) ? $topic_template->total_post_count : $start_num + ( $topic_template->pag_num - 1 ) );
+    $total = bp_core_number_format( $topic_template->total_post_count );
+    echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post %1$s to %2$s (%3$s total posts)', 'buddypress' ), $from_num, $to_num, $total ) );
 ?>
     <span class="ajax-loader"></span>
 …
 ?>
     <form action="" method="get" id="search-forums-form">
         <label><input type="text" name="s" id="forums_search" value="<?php echo attribute_escape($search_value) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+        <label><input type="text" name="s" id="forums_search" value="<?php echo esc_attr($search_value) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
         <input type="submit" id="forums_search_submit" name="forums_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
     </form>
 …
         global $topic_template;
         return apply_filters( 'bp_get_forum_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
+        return apply_filters( 'bp_get_forum_action', $bp->root_domain . esc_attr( $_SERVER['REQUEST_URI'] ) );
+    }
 …
         global $bp;
         return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
+        return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . esc_attr( $_SERVER['REQUEST_URI'] ) );
+    }

trunk/bp-friends.php

-                      r3232
+                      r3300
 <?php
+define ( 'BP_FRIENDS_DB_VERSION', '1800' );
+/* Define the slug for the component */
+if ( !defined( 'BP_FRIENDS_SLUG' ) )
+    define ( 'BP_FRIENDS_SLUG', 'friends' );
 require ( BP_PLUGIN_DIR . '/bp-friends/bp-friends-classes.php' );
 require ( BP_PLUGIN_DIR . '/bp-friends/bp-friends-templatetags.php' );
 function friends_setup_globals() {
+    global $bp, $wpdb;
+    if ( !defined( 'BP_FRIENDS_SLUG' ) )
+        define( 'BP_FRIENDS_SLUG', 'friends' );
+    global $bp;
     /* For internal identification */
     $bp->friends->id = 'friends';
+    $bp->friends->table_name = $wpdb->base_prefix . 'bp_friends';
+    $bp->friends->slug = BP_FRIENDS_SLUG;
+    $bp->friends->table_name = $bp->table_prefix . 'bp_friends';
     $bp->friends->format_notification_function = 'friends_format_notifications';
-    $bp->friends->slug = BP_FRIENDS_SLUG;
     /* Register this in the active components array */
 …
 function friends_screen_notification_settings() {
     global $current_user; ?>
+    <table class="notification-settings" id="friends-notification-settings">
+        <tr>
+            <th class="icon"></th>
+            <th class="title"><?php _e( 'Friends', 'buddypress' ) ?></th>
+            <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+            <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_request') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_request') ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_usermeta( $current_user->id,'notification_friends_friendship_request') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_accepted') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <?php do_action( 'friends_screen_notification_settings' ); ?>
+    <table class="notification-settings zebra" id="friends-notification-settings">
+        <thead>
+            <tr>
+                <th class="icon"></th>
+                <th class="title"><?php _e( 'Friends', 'buddypress' ) ?></th>
+                <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+                <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td></td>
+                <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <?php do_action( 'friends_screen_notification_settings' ); ?>
+        </tbody>
     </table>
 <?php
 …
         'item_id' => false,
         'secondary_item_id' => false,
         'recorded_time' => gmdate( "Y-m-d H:i:s" ),
+        'recorded_time' => bp_core_current_time(),
         'hide_sitewide' => false
     );
 …
     $friendship->is_confirmed = 0;
     $friendship->is_limited = 0;
     $friendship->date_created = time();
+    $friendship->date_created = bp_core_current_time();
     if ( $force_accept )
 …
         friends_update_friend_totals( $friendship->initiator_user_id, $friendship->friend_user_id );
         /* Remove the friend request notice */
+        // Remove the friend request notice
         bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
         /* Add a friend accepted notice for the initiating user */
+        // Add a friend accepted notice for the initiating user
         bp_core_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_accepted' );
 …
         $friend_link = bp_core_get_userlink( $friendship->friend_user_id );
         /* Record in activity streams for the initiator */
+        // Record in activity streams for the initiator
         friends_record_activity( array(
+            'user_id' => $friendship->initiator_user_id,
+            'type' => 'friendship_created',
+            'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
+            'item_id' => $friendship_id
+            'user_id'           => $friendship->initiator_user_id,
+            'type'              => 'friendship_created',
+            'action'            => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
+            'item_id'           => $friendship_id,
+            'secondary_item_id' => $friendship->friend_user_id
         ) );
         /* Record in activity streams for the friend */
+        // Record in activity streams for the friend
         friends_record_activity( array(
+            'user_id' => $friendship->friend_user_id,
+            'type' => 'friendship_created',
+            'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
+            'item_id' => $friendship_id,
+            'hide_sitewide' => true /* We've already got the first entry site wide */
+            'user_id'           => $friendship->friend_user_id,
+            'type'              => 'friendship_created',
+            'action'            => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
+            'item_id'           => $friendship_id,
+            'secondary_item_id' => $friendship->initiator_user_id,
+            'hide_sitewide'     => true // We've already got the first entry site wide
         ) );
         /* Send the email notification */
+        // Send the email notification
         require_once( BP_PLUGIN_DIR . '/bp-friends/bp-friends-notifications.php' );
         friends_notification_accepted_request( $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
 …
     if ( !$count = wp_cache_get( 'bp_total_friend_count_' . $user_id, 'bp' ) ) {
         $count = get_usermeta( $user_id, 'total_friend_count' );
+        $count = get_user_meta( $user_id, 'total_friend_count', true );
         if ( empty( $count ) ) $count = 0;
         wp_cache_set( 'bp_total_friend_count_' . $user_id, $count, 'bp' );
 …
 function friends_update_friend_totals( $initiator_user_id, $friend_user_id, $status = 'add' ) {
     if ( 'add' == $status ) {
         update_usermeta( $initiator_user_id, 'total_friend_count', (int)get_usermeta( $initiator_user_id, 'total_friend_count' ) + 1 );
         update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) + 1 );
+        update_user_meta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count', true ) + 1 );
+        update_user_meta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count', true ) + 1 );
     } else {
         update_usermeta( $initiator_user_id, 'total_friend_count', (int)get_usermeta( $initiator_user_id, 'total_friend_count' ) - 1 );
         update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) - 1 );
+        update_user_meta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count', true ) - 1 );
+        update_user_meta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count', true ) - 1 );
+    }
+}
 …
     /* Remove usermeta */
     delete_usermeta( $user_id, 'total_friend_count' );
+    delete_user_meta( $user_id, 'total_friend_count' );
     /* Remove friendship requests FROM user */
 …
     do_action( 'friends_remove_data', $user_id );
+}
 add_action( 'wpmu_delete_user', 'friends_remove_data', 1 );
 add_action( 'delete_user', 'friends_remove_data', 1 );
 add_action( 'make_spam_user', 'friends_remove_data', 1 );
+add_action( 'wpmu_delete_user', 'friends_remove_data' );
+add_action( 'delete_user', 'friends_remove_data' );
+add_action( 'make_spam_user', 'friends_remove_data' );
 …
     global $bp;
     if ( isset($_GET['new']) )
         bp_core_delete_notifications_for_user_by_type( $bp->displayed_user->id, $bp->friends->id, 'friendship_accepted' );
+    if ( isset( $_GET['new'] ) )
+        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->friends->id, 'friendship_accepted' );
+}
 add_action( 'bp_activity_screen_my_activity', 'friends_clear_friend_notifications' );

trunk/bp-friends/bp-friends-classes.php

-                      r2919
+                      r3300
         if ( $this->id ) {
             // Update
             $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET initiator_user_id = %d, friend_user_id = %d, is_confirmed = %d, is_limited = %d, date_created = FROM_UNIXTIME(%d) ) WHERE id = %d", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created, $this->id ) );
+            $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET initiator_user_id = %d, friend_user_id = %d, is_confirmed = %d, is_limited = %d, date_created = %s ) WHERE id = %d", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created, $this->id ) );
         } else {
             // Save
             $result = $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->friends->table_name} ( initiator_user_id, friend_user_id, is_confirmed, is_limited, date_created ) VALUES ( %d, %d, %d, %d, FROM_UNIXTIME(%d) )", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created ) );
+            $result = $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->friends->table_name} ( initiator_user_id, friend_user_id, is_confirmed, is_limited, date_created ) VALUES ( %d, %d, %d, %d, %s )", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created ) );
             $this->id = $wpdb->insert_id;
+        }
 …
         $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d OR friend_user_id = %d) AND is_confirmed = 1", $user_id, $user_id ) );
+        if ( !$count )
+        // Do not update meta if user has never had friends
+        if ( !$count && !get_user_meta( $user_id, 'total_friend_count', true ) )
             return 0;
         update_usermeta( $user_id, 'total_friend_count', $count );
         return $count;
+        update_user_meta( $user_id, 'total_friend_count', (int)$count );
+        return (int)$count;
+    }
 …
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = FROM_UNIXTIME(%d) WHERE id = %d AND friend_user_id = %d", time(), $friendship_id, $bp->loggedin_user->id ) );
+        return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", bp_core_current_time(), $friendship_id, $bp->loggedin_user->id ) );
+    }
 …
         global $wpdb, $bp;
+        // Get friends of $user_id
+        $friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
+        // Delete all friendships related to $user_id
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE friend_user_id = %d OR initiator_user_id = %d", $user_id, $user_id ) );
         // Delete friend request notifications for members who have a notification from this user.
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE component_name = 'friends' AND ( component_action = 'friendship_request' OR component_action = 'friendship_accepted' ) AND item_id = %d", $user_id ) );
+        // Loop through friend_ids and update their counts
+        foreach ( (array)$friend_ids as $friend_id ) {
+            BP_Friends_Friendship::total_friend_count( $friend_id );
+        }
+    }
+}

trunk/bp-friends/bp-friends-notifications.php

-                      r2941
+                      r3300
     $initiator_name = bp_core_get_user_displayname( $initiator_id );
     if ( 'no' == get_usermeta( (int)$friend_id, 'notification_friends_friendship_request' ) )
+    if ( 'no' == get_user_meta( (int)$friend_id, 'notification_friends_friendship_request', true ) )
         return false;
 …
     // Set up and send the message
+    $to = $ud->user_email;
+    $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
+    $to       = $ud->user_email;
+    $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+    $subject  = '[' . $sitename . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
     $message = sprintf( __(
 …
     $friend_name = bp_core_get_user_displayname( $friend_id );
     if ( 'no' == get_usermeta( (int)$initiator_id, 'notification_friends_friendship_accepted' ) )
+    if ( 'no' == get_user_meta( (int)$initiator_id, 'notification_friends_friendship_accepted', true ) )
         return false;
 …
     // Set up and send the message
+    $to = $ud->user_email;
+    $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
+    $to       = $ud->user_email;
+    $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+    $subject  = '[' . $sitename . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
     $message = sprintf( __(

trunk/bp-friends/bp-friends-templatetags.php

-                      r3263
+                      r3300
         <form action="<?php echo $action ?>" id="friend-search-form" method="post">
         <label for="friend-search-box" id="friend-search-label"><?php echo $label ?></label>
         <input type="search" name="friend-search-box" id="friend-search-box" value="<?php echo $value ?>"<?php echo $disabled ?> />
         <?php wp_nonce_field( 'friends_search', '_wpnonce_friend_search' ) ?>
         <input type="hidden" name="initiator" id="initiator" value="<?php echo attribute_escape( $bp->displayed_user->id ) ?>" />
+            <label for="friend-search-box" id="friend-search-label"><?php echo $label ?></label>
+            <input type="search" name="friend-search-box" id="friend-search-box" value="<?php echo $value ?>"<?php echo $disabled ?> />
+            <?php wp_nonce_field( 'friends_search', '_wpnonce_friend_search' ) ?>
+            <input type="hidden" name="initiator" id="initiator" value="<?php echo esc_attr( $bp->displayed_user->id ) ?>" />
         </form>

trunk/bp-groups.php

-                      r3273
+                      r3300
     $bp->groups->slug = BP_GROUPS_SLUG;
+    $bp->groups->table_name = $wpdb->base_prefix . 'bp_groups';
+    $bp->groups->table_name_members = $wpdb->base_prefix . 'bp_groups_members';
+    $bp->groups->table_name_groupmeta = $wpdb->base_prefix . 'bp_groups_groupmeta';
+    $bp->groups->table_name           = $bp->table_prefix . 'bp_groups';
+    $bp->groups->table_name_members   = $bp->table_prefix . 'bp_groups_members';
+    $bp->groups->table_name_groupmeta = $bp->table_prefix . 'bp_groups_groupmeta';
     $bp->groups->format_notification_function = 'groups_format_notifications';
 …
     $bp->groups->valid_status = apply_filters( 'groups_valid_status', array( 'public', 'private', 'hidden' ) );
+    // Auto join group when non group member performs group activity
+    $bp->groups->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? false : true;
     do_action( 'groups_setup_globals' );
+}
 …
     global $bp;
     if ( $group_id = BP_Groups_Group::group_exists($bp->current_action) ) {
+    if ( $bp->current_component == $bp->groups->slug && $group_id = BP_Groups_Group::group_exists($bp->current_action) ) {
         /* This is a single group page. */
 …
         /* Using "item" not "group" for generic support in other components. */
         if ( is_site_admin() )
+        if ( is_super_admin() )
             $bp->is_item_admin = 1;
         else
 …
             if ( !$bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'type' => 'thumb', 'avatar_dir' => 'group-avatars', 'alt' => __( 'Group Avatar', 'buddypress' ) ) ) )
                 $bp->bp_options_avatar = '<img src="' . attribute_escape( $group->avatar_full ) . '" class="avatar" alt="' . attribute_escape( $group->name ) . '" />';
+                $bp->bp_options_avatar = '<img src="' . esc_attr( $group->avatar_full ) . '" class="avatar" alt="' . esc_attr( $group->name ) . '" />';
             $group_link = $bp->root_domain . '/' . $bp->groups->slug . '/' . $bp->groups->current_group->slug . '/';
 …
             // If this is a private or hidden group, does the user have access?
             if ( 'private' == $bp->groups->current_group->status || 'hidden' == $bp->groups->current_group->status ) {
                 if ( $bp->groups->current_group->is_user_member && is_user_logged_in() || is_site_admin() )
+                if ( $bp->groups->current_group->is_user_member && is_user_logged_in() || is_super_admin() )
                     $bp->groups->current_group->user_has_access = true;
                 else
 …
             // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
             if ( !is_site_admin() && is_user_logged_in() && !$bp->groups->current_group->is_user_member && !groups_check_for_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) && $bp->groups->current_group->status == 'private' )
+            if ( !is_super_admin() && is_user_logged_in() && !$bp->groups->current_group->is_user_member && !groups_check_for_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) && $bp->groups->current_group->status == 'private' )
                 bp_core_new_subnav_item( array( 'name' => __( 'Request Membership', 'buddypress' ), 'slug' => 'request-membership', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_request_membership', 'position' => 30 ) );
 …
     /* Don't show this menu to non site admins or if you're viewing your own profile */
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
     ?>
 …
             groups_record_activity( array(
                 'action' => apply_filters( 'groups_activity_accepted_invite_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),
+                'action' => apply_filters( 'groups_activity_accepted_invite_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),
                 'type' => 'joined_group',
                 'item_id' => $group->id
 …
                 /* Auto join this user if they are not yet a member of this group */
                 if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                if ( $bp->groups->auto_join && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                     groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
 …
                 /* Auto join this user if they are not yet a member of this group */
                 if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                if ( $bp->groups->auto_join && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                     groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
 …
     if ( $bp->is_single_item ) {
+        /* Refresh the group member count meta */
+        groups_update_groupmeta( $bp->groups->current_group->id, 'total_member_count', groups_get_total_member_count( $bp->groups->current_group->id ) );
         do_action( 'groups_screen_group_members', $bp->groups->current_group->id );
         bp_core_load_template( apply_filters( 'groups_template_group_members', 'groups/single/home' ) );
 …
             $status = $bp->action_variables[2];
             /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_promote_member' ) )
                 return false;
             // Promote a user.
             if ( !groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) ) {
+            if ( !groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) )
                 bp_core_add_message( __( 'There was an error when promoting that user, please try again', 'buddypress' ), 'error' );
             } else {
+            else
                 bp_core_add_message( __( 'User promoted successfully', 'buddypress' ) );
+            }
             do_action( 'groups_promoted_member', $user_id, $bp->groups->current_group->id );
 …
             $user_id = $bp->action_variables[2];
             /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_demote_member' ) )
                 return false;
             // Demote a user.
             if ( !groups_demote_member( $user_id, $bp->groups->current_group->id ) ) {
+            if ( !groups_demote_member( $user_id, $bp->groups->current_group->id ) )
                 bp_core_add_message( __( 'There was an error when demoting that user, please try again', 'buddypress' ), 'error' );
             } else {
+            else
                 bp_core_add_message( __( 'User demoted successfully', 'buddypress' ) );
+            }
             do_action( 'groups_demoted_member', $user_id, $bp->groups->current_group->id );
 …
             $user_id = $bp->action_variables[2];
             /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_ban_member' ) )
                 return false;
             // Ban a user.
             if ( !groups_ban_member( $user_id, $bp->groups->current_group->id ) ) {
+            if ( !groups_ban_member( $user_id, $bp->groups->current_group->id ) )
                 bp_core_add_message( __( 'There was an error when banning that user, please try again', 'buddypress' ), 'error' );
             } else {
+            else
                 bp_core_add_message( __( 'User banned successfully', 'buddypress' ) );
+            }
             do_action( 'groups_banned_member', $user_id, $bp->groups->current_group->id );
 …
             $user_id = $bp->action_variables[2];
             /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_unban_member' ) )
                 return false;
             // Remove a ban for user.
             if ( !groups_unban_member( $user_id, $bp->groups->current_group->id ) ) {
+            if ( !groups_unban_member( $user_id, $bp->groups->current_group->id ) )
                 bp_core_add_message( __( 'There was an error when unbanning that user, please try again', 'buddypress' ), 'error' );
             } else {
+            else
                 bp_core_add_message( __( 'User ban removed successfully', 'buddypress' ) );
+            }
             do_action( 'groups_unbanned_member', $user_id, $bp->groups->current_group->id );
 …
+        }
+        if ( 'remove' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
+            $user_id = $bp->action_variables[2];
+            // Check the nonce first.
+            if ( !check_admin_referer( 'groups_remove_member' ) )
+                return false;
+            // Remove a user.
+            if ( !groups_remove_member( $user_id, $bp->groups->current_group->id ) )
+                bp_core_add_message( __( 'There was an error removing that user from the group, please try again', 'buddypress' ), 'error' );
+            else
+                bp_core_add_message( __( 'User removed successfully', 'buddypress' ) );
+            do_action( 'groups_removed_member', $user_id, $bp->groups->current_group->id );
+            bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . 'admin/manage-members/' );
+        }
         do_action( 'groups_screen_group_admin_manage_members', $bp->groups->current_group->id );
 …
     if ( $bp->current_component == $bp->groups->slug && 'membership-requests' == $bp->action_variables[0] ) {
+        /* Ask for a login if the user is coming here via an email notification */
+        if ( !is_user_logged_in() )
+            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/membership-requests/' ) );
         if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
 …
     if ( $bp->current_component == $bp->groups->slug && 'delete-group' == $bp->action_variables[0] ) {
         if ( !$bp->is_item_admin && !is_site_admin() )
+        if ( !$bp->is_item_admin && !is_super_admin() )
             return false;
 …
 function groups_screen_notification_settings() {
     global $current_user; ?>
+    <table class="notification-settings" id="groups-notification-settings">
+        <tr>
+            <th class="icon"></th>
+            <th class="title"><?php _e( 'Groups', 'buddypress' ) ?></th>
+            <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+            <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_invite') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_group_updated') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_admin_promotion') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_membership_request') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <?php do_action( 'groups_screen_notification_settings' ); ?>
+    <table class="notification-settings zebra" id="groups-notification-settings">
+        <thead>
+            <tr>
+                <th class="icon"></th>
+                <th class="title"><?php _e( 'Groups', 'buddypress' ) ?></th>
+                <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+                <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td></td>
+                <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_invite', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_invite', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_invite', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_group_updated', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_group_updated', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_group_updated', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_admin_promotion', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_admin_promotion', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_admin_promotion', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <?php do_action( 'groups_screen_notification_settings' ); ?>
+        </tbody>
     </table>
 <?php
 …
+            }
             if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title($_POST['group-name']) ), 'date_created' => gmdate( "Y-m-d H:i:s" ), 'status' => 'public' ) ) ) {
+            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => gmdate( "Y-m-d H:i:s" ), 'status' => 'public' ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
 …
             /* Once we compelete all steps, record the group creation in the activity stream. */
             groups_record_activity( array(
                 'action' => apply_filters( 'groups_activity_created_group_action', sprintf( __( '%1$s created the group %2$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>' ) ),
+                'action' => apply_filters( 'groups_activity_created_group_action', sprintf( __( '%1$s created the group %2$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' ) ),
                 'type' => 'created_group',
                 'item_id' => $bp->groups->new_group_id
 …
         return false;
+    // user wants to join a group
+    // Nonce check
+    if ( !check_admin_referer( 'groups_join_group' ) )
+        return false;
+    // Skip if banned or already a member
     if ( !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) && !groups_is_user_banned( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+        if ( !groups_join_group($bp->groups->current_group->id) ) {
+            bp_core_add_message( __('There was an error joining the group.', 'buddypress'), 'error' );
+        // User wants to join a group that is not public
+        if ( $bp->groups->current_group->status != 'public' ) {
+            if ( !groups_check_user_has_invite( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+                bp_core_add_message( __( 'There was an error joining the group.', 'buddypress' ), 'error' );
+                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+            }
+        }
+        // User wants to join any group
+        if ( !groups_join_group( $bp->groups->current_group->id ) )
+            bp_core_add_message( __( 'There was an error joining the group.', 'buddypress' ), 'error' );
+        else
+            bp_core_add_message( __( 'You joined the group!', 'buddypress' ) );
+        bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+    }
+    bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+}
+add_action( 'wp', 'groups_action_join_group', 3 );
+function groups_action_leave_group() {
+    global $bp;
+    if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != 'leave-group' )
+        return false;
+    // Nonce check
+    if ( !check_admin_referer( 'groups_leave_group' ) )
+        return false;
+    // User wants to leave any group
+    if ( groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+        if ( !groups_leave_group( $bp->groups->current_group->id ) ) {
+            bp_core_add_message( __( 'There was an error leaving the group.', 'buddypress' ), 'error' );
         } else {
             bp_core_add_message( __('You joined the group!', 'buddypress') );
+            bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );
+        }
         bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
 …
     bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+}
+add_action( 'wp', 'groups_action_join_group', 3 );
+add_action( 'wp', 'groups_action_leave_group', 3 );
 function groups_action_sort_creation_steps() {
 …
         'item_id' => false,
         'secondary_item_id' => false,
         'recorded_time' => gmdate( "Y-m-d H:i:s" ),
+        'recorded_time' => bp_core_current_time(),
         'hide_sitewide' => $hide_sitewide
     );
 …
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/?n=1" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%1$d new membership requests for the group "%2$s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );
+                return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/?n=1" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __( '%1$d new membership requests for the group "%2$s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );
             } else {
                 $user_fullname = bp_core_get_user_displayname( $requesting_user_id );
                 return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . 'admin/membership-requests/?n=1" title="' . $user_fullname .' requests group membership">' . sprintf( __('%1$s requests membership for the group "%2$s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
+                return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . 'admin/membership-requests/?n=1" title="' . sprintf( __( '%s requests group membership', 'buddypress' ), $user_fullname ) . '">' . sprintf( __( '%1$s requests membership for the group "%2$s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
+            }
         break;
 …
             $group_link = bp_get_group_permalink( $group );
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name );
             } else {
                 return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name );
+            }
+            if ( (int)$total_items > 1 )
+                return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __( '%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name );
+            else
+                return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'Membership for group "%s" accepted', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name );
         break;
 …
             $group_link = bp_get_group_permalink( $group );
+            if ( (int)$total_items > 1 ) {
+                return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . $bp->members->slug . '/' . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );
+            } else {
+                return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name );
+            }
+            if ( (int)$total_items > 1 )
+                return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . $bp->members->slug . '/' . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __( '%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );
+            else
+                return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'Membership for group "%s" rejected', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name );
         break;
 …
             $group_link = bp_get_group_permalink( $group );
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
             } else {
                 return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
+            }
+            if ( (int)$total_items > 1 )
+                return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __( 'You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+            else
+                return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'You were promoted to an admin in the group %s', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name );
         break;
 …
             $group_link = bp_get_group_permalink( $group );
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
             } else {
                 return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
+            }
+            if ( (int)$total_items > 1 )
+                return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __( 'You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+            else
+                return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'You were promoted to a mod in the group %s', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name );
         break;
 …
             $user_url = bp_core_get_user_domain( $user_id );
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
             } else {
                 return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );
+            }
+            if ( (int)$total_items > 1 )
+                return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __( 'You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+            else
+                return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __( 'You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );
         break;
+    }
 …
         $member->user_title = __( 'Group Admin', 'buddypress' );
         $member->is_confirmed = 1;
         $member->date_modified = gmdate( "Y-m-d H:i:s" );
+        $member->date_modified = bp_core_current_time();
         $member->save();
         do_action( 'groups_create_group', $group->id, $member, $group );
     } else {
         do_action( 'groups_update_group', $group->id, $group );
 …
+}
+/**
+ * Delete a group and all of its associated meta
+ *
+ * @global object $bp BuddyPress global settings
+ * @param int $group_id
+ * @since 1.0
+ */
 function groups_delete_group( $group_id ) {
     global $bp;
 …
     // Get the group object
     $group = new BP_Groups_Group( $group_id );
     if ( !$group->delete() )
         return false;
     /* Delete all group activity from activity streams */
     if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
+    // Delete all group activity from activity streams
+    if ( bp_is_active( 'activity' ) )
         bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component' => $bp->groups->id ) );
+    }
     // Remove all outstanding invites for this group
 …
     bp_core_delete_all_notifications_by_type( $group_id, $bp->groups->slug );
+    do_action( 'groups_delete_group', $group_id );
+    // Remove forum if component is active and current group has one
+    if ( bp_is_active( 'forums' ) && $forum_id = groups_get_groupmeta( $group_id, 'forum_id' ) ) {
+        do_action( 'bbpress_init' );
+        bb_delete_forum( $forum_id );
+    }
+    do_action( 'groups_delete_group', $group_id);
     return true;
 …
     /* Modify user's group memberhip count */
     update_usermeta( $user_id, 'total_group_count', (int) get_usermeta( $user_id, 'total_group_count') - 1 );
+    update_user_meta( $user_id, 'total_group_count', (int) get_user_meta( $user_id, 'total_group_count', true ) - 1 );
     /* If the user joined this group less than five minutes ago, remove the joined_group activity so
 …
     /* Record this in activity streams */
     groups_record_activity( array(
         'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%1$s joined the group %2$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>' ) ),
+        'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' ) ),
         'type' => 'joined_group',
         'item_id' => $group_id
 …
+}
+function groups_get_total_member_count( $group_id ) {
+    return BP_Groups_Group::get_total_member_count( $group_id );
+}
 /*** Group Fetching, Filtering & Searching  *************************************/
 …
         'type' => 'active', // active, newest, alphabetical, random, popular, most-forum-topics or most-forum-posts
         'user_id' => false, // Pass a user_id to limit to only groups that this user is a member of
-        'include' => false, // Only include these specific groups (group_ids)
         'search_terms' => false, // Limit to groups that match these search terms
 …
     extract( $params, EXTR_SKIP );
+    $groups = BP_Groups_Group::get( $type, $per_page, $page, $user_id, $search_terms, $include, $populate_extras );
+    switch ( $type ) {
+        case 'active': default:
+            $groups = BP_Groups_Group::get_active( $per_page, $page, $user_id, $search_terms, $populate_extras );
+            break;
+        case 'newest':
+            $groups = BP_Groups_Group::get_newest( $per_page, $page, $user_id, $search_terms, $populate_extras );
+            break;
+        case 'popular':
+            $groups = BP_Groups_Group::get_popular( $per_page, $page, $user_id, $search_terms, $populate_extras );
+            break;
+        case 'alphabetical':
+            $groups = BP_Groups_Group::get_alphabetically( $per_page, $page, $user_id, $search_terms, $populate_extras );
+            break;
+        case 'random':
+            $groups = BP_Groups_Group::get_random( $per_page, $page, $user_id, $search_terms, $populate_extras );
+            break;
+        case 'most-forum-topics':
+            $groups = BP_Groups_Group::get_by_most_forum_topics( $per_page, $page, $user_id, $search_terms, $populate_extras );
+            break;
+        case 'most-forum-posts':
+            $groups = BP_Groups_Group::get_by_most_forum_posts( $per_page, $page, $user_id, $search_terms, $populate_extras );
+            break;
+    }
     return apply_filters( 'groups_get_groups', $groups, &$params );
 …
         @wp_mkdir_p( $path );
     $newurl = str_replace( BP_AVATAR_UPLOAD_PATH, BP_AVATAR_URL, $path );
+    $newurl = BP_AVATAR_URL . '/group-avatars/' . $group_id;
     $newburl = $newurl;
     $newsubdir = '/group-avatars/' . $group_id;
 …
 function groups_is_user_banned( $user_id, $group_id ) {
     return BP_Groups_Member::check_is_banned( $user_id, $group_id );
+}
+/**
+ * Is the specified user the creator of the group?
+ *
+ * @param int $user_id
+ * @param int $group_id
+ * @since 1.2.6
+ * @uses BP_Groups_Member
+ */
+function groups_is_user_creator( $user_id, $group_id ) {
+    return BP_Groups_Member::check_is_creator( $user_id, $group_id );
+}
 …
     /* Be sure the user is a member of the group before posting. */
     if ( !is_site_admin() && !groups_is_user_member( $user_id, $group_id ) )
+    if ( !is_super_admin() && !groups_is_user_member( $user_id, $group_id ) )
         return false;
     /* Record this in activity streams */
     $activity_action = sprintf( __( '%1$s posted an update in the group %2$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>' );
+    $activity_action = sprintf( __( '%1$s posted an update in the group %2$s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
     $activity_content = $content;
 …
     groups_update_groupmeta( $group_id, 'forum_id', $forum_id );
+    do_action( 'groups_new_group_forum', $forum, $group_id );
+}
+    do_action( 'groups_new_group_forum', $forum_id, $group_id );
+}
+function groups_update_group_forum( $group_id ) {
+    $group = new BP_Groups_Group( $group_id );
+    if ( !$group->enable_forum || !function_exists( 'bp_forums_setup' ) )
+        return false;
+    $args = array(
+        'forum_id'      => groups_get_groupmeta( $group_id, 'forum_id' ),
+        'forum_name'    => $group->name,
+        'forum_desc'    => $group->desc,
+        'forum_slug'    => $group->slug
+    );
+    bp_forums_update_forum( apply_filters( 'groups_update_group_forum', $args ) );
+}
+add_action( 'groups_details_updated', 'groups_update_group_forum' );
 function groups_new_group_forum_post( $post_text, $topic_id, $page = false ) {
 …
         $topic = bp_forums_get_topic_details( $topic_id );
         $activity_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$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_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$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 .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
         $activity_content = bp_create_excerpt( $post_text );
         $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
 …
         $topic = bp_forums_get_topic_details( $topic_id );
         $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$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_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$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 .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
         $activity_content = bp_create_excerpt( $topic_text );
 …
             bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
         $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$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_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
         $activity_content = bp_create_excerpt( $topic_text );
 …
         $topic = bp_forums_get_topic_details( $topic_id );
         $activity_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$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_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
         $activity_content = bp_create_excerpt( $post_text );
         $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
 …
         return false;
+    /* Remove request to join */
+    if ( $member->check_for_membership_request( $user_id, $group_id ) )
+        $member->delete_request( $user_id, $group_id );
     /* Modify group meta */
     groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') + 1 );
 …
     do_action( 'groups_ban_member', $group_id, $user_id );
+    if ( !$member->ban() )
+        return false;
+    update_usermeta( $user_id, 'total_group_count', (int)$total_count - 1 );
+    return $member->ban();
+}
 …
     return $member->unban();
+}
+/*** Group Removal *******************************************************/
+function groups_remove_member( $user_id, $group_id ) {
+    global $bp;
+    if ( !$bp->is_item_admin )
+        return false;
+    $member = new BP_Groups_Member( $user_id, $group_id );
+    do_action( 'groups_remove_member', $group_id, $user_id );
+    return $member->remove();
+}
 …
         return false;
+    /* Check if the user has an outstanding invite, if so delete it. */
+    if ( groups_check_user_has_invite( $membership->user_id, $membership->group_id ) )
+        groups_delete_invite( $membership->user_id, $membership->group_id );
     /* Modify group member count */
     groups_update_groupmeta( $membership->group_id, 'total_member_count', (int) groups_get_groupmeta( $membership->group_id, 'total_member_count') + 1 );
     /* Record this in activity streams */
     $group = new BP_Groups_Group( $group_id );
+    $group = new BP_Groups_Group( $membership->group_id );
     groups_record_activity( array(
         'action' => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $user_id, &$group ),
         'type' => 'joined_group',
         'item_id' => $group->id,
         'user_id' => $user_id
+        'action'    => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $membership->user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( $group->name ) . '</a>' ), $membership->user_id, &$group ),
+        'type'      => 'joined_group',
+        'item_id'   => $membership->group_id,
+        'user_id'   => $membership->user_id
     ) );
 …
     do_action( 'groups_remove_data_for_user', $user_id );
+}
 add_action( 'wpmu_delete_user', 'groups_remove_data_for_user', 1 );
 add_action( 'delete_user', 'groups_remove_data_for_user', 1 );
 add_action( 'make_spam_user', 'groups_remove_data_for_user', 1 );
+add_action( 'wpmu_delete_user', 'groups_remove_data_for_user' );
+add_action( 'delete_user', 'groups_remove_data_for_user' );
+add_action( 'make_spam_user', 'groups_remove_data_for_user' );

trunk/bp-groups/bp-groups-classes.php

-                      r3232
+                      r3300
             /* Get group admins and mods */
             $admin_mods = $wpdb->get_results( apply_filters( 'bp_group_admin_mods_user_join_filter', $wpdb->prepare( "SELECT u.ID as user_id, u.user_login, u.user_email, u.user_nicename, m.is_admin, m.is_mod FROM {$wpdb->users} u, {$bp->groups->table_name_members} m WHERE u.ID = m.user_id AND m.group_id = %d AND ( m.is_admin = 1 OR m.is_mod = 1 )", $this->id ), $this->id ) );
+            $admin_mods = $wpdb->get_results( $wpdb->prepare( "SELECT u.ID as user_id, u.user_login, u.user_email, u.user_nicename, m.is_admin, m.is_mod FROM {$wpdb->users} u, {$bp->groups->table_name_members} m WHERE u.ID = m.user_id AND m.group_id = %d AND ( m.is_admin = 1 OR m.is_mod = 1 )", $this->id ) );
             foreach( (array)$admin_mods as $user ) {
                 if ( (int)$user->is_admin )
 …
+        }
         if ( !is_site_admin() )
+        if ( !is_super_admin() )
             $hidden_sql = "AND status != 'hidden'";
 …
+    }
+    function get( $type = 'newest', $per_page = null, $page = null, $user_id = false, $search_terms = false, $include = false, $populate_extras = true ) {
+        global $wpdb, $bp;
+        $sql = array();
+        $sql['select'] = "SELECT g.*, gm1.meta_value AS total_member_count, gm2.meta_value AS last_activity";
+        $sql['from']   = " FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2,";
+        if ( !empty( $user_id ) )
+            $sql['members_from'] = " {$bp->groups->table_name_members} m,";
+        $sql['group_from'] = " {$bp->groups->table_name} g WHERE";
+        if ( !empty( $user_id ) )
+            $sql['user_where'] = " g.id = m.group_id AND";
+        $sql['where'] = " g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'";
+        if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+            $sql['hidden'] = " AND g.status != 'hidden'";
+    /* TODO: Merge all these get_() functions into one. */
+    function get_newest( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+            $hidden_sql = "AND g.status != 'hidden'";
         if ( $search_terms ) {
             $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $sql['search'] = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( !empty( $user_id ) )
+            $sql['user'] = $wpdb->prepare( " AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id );
+        if ( !empty( $include ) ) {
+            $include = $wpdb->escape( $include );
+            $sql['include'] = " AND g.id IN ({$include})";
+        }
+        switch ( $type ) {
+            case 'newest': default:
+                $sql['order'] = " ORDER BY g.date_created DESC";
+                break;
+            case 'active':
+                $sql[] = "ORDER BY last_activity DESC";
+                break;
+            case 'popular':
+                $sql[] = "ORDER BY CONVERT(gm1.meta_value, SIGNED) DESC";
+                break;
+            case 'alphabetical':
+                $sql[] = "ORDER BY g.name ASC";
+                break;
+            case 'random':
+                $sql[] = "ORDER BY rand()";
+                break;
+        }
+        if ( $per_page && $page )
+            $sql['pagination'] = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page), intval( $per_page ) );
+        /* Get paginated results */
+        $paged_groups = $wpdb->get_results( join( ' ', (array)$sql ) );
+        $total_sql['select'] = "SELECT COUNT(g.id) FROM {$bp->groups->table_name} g";
+        if ( !empty( $user_id ) )
+            $total_sql['select'] .= ", {$bp->groups->table_name_members} m";
+        if ( !empty( $sql['hidden'] ) )
+            $total_sql['where'][] = "g.status != 'hidden'";
+        if ( !empty( $sql['search'] ) )
+            $total_sql['where'][] = "( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        if ( !empty( $user_id ) )
+            $total_sql['where'][] = "m.group_id = g.id AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0";
+        $t_sql = $total_sql['select'];
+        if ( !empty( $total_sql['where'] ) )
+            $t_sql .= " WHERE " . join( ' AND ', (array)$total_sql['where'] );
+        /* Get total group results */
+        $total_groups = $wpdb->get_var( join( ' ', (array)$t_sql ) );
+        /* Populate some extra information instead of querying each time in the loop */
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $user_id = $wpdb->escape( $user_id );
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY g.date_created DESC {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
+        } else {
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY g.date_created DESC {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm INNER JOIN {$bp->groups->table_name} g ON gm.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql}" );
+        }
         if ( !empty( $populate_extras ) ) {
             foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
             $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, $type );
+        }
+        unset( $sql, $total_sql );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_active( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+            $hidden_sql = "AND g.status != 'hidden'";
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $user_id = $wpdb->escape( $user_id );
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY last_activity DESC {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
+        } else {
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY last_activity DESC {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm INNER JOIN {$bp->groups->table_name} g ON gm.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql}" );
+        }
+        if ( !empty( $populate_extras ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_popular( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
+        global $wpdb, $bp;
+        if ( $limit && $page ) {
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        }
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+            $hidden_sql = "AND g.status != 'hidden'";
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $user_id = $wpdb->escape( $user_id );
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY CONVERT(gm1.meta_value, SIGNED) DESC {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
+        } else {
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY CONVERT(gm1.meta_value, SIGNED) DESC {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql}" );
+        }
+        if ( !empty( $populate_extras ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_alphabetically( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+            $hidden_sql = " AND g.status != 'hidden'";
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $user_id = $wpdb->escape( $user_id );
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY g.name ASC {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
+        } else {
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql}" );
+        }
+        if ( !empty( $populate_extras ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
 …
+        }
         if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
             $hidden_sql = " AND g.status != 'hidden'";
 …
+        }
         if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
             $hidden_sql = " AND g.status != 'hidden'";
 …
+    }
+    function get_all( $limit = null, $page = null, $only_public = true, $sort_by = false, $order = false ) {
+        global $wpdb, $bp;
+        // Default sql WHERE conditions are blank. TODO: generic handler function.
+        $where_sql = null;
+        $where_conditions = array();
+        // Limit results to public status
+        if ( $only_public )
+            $where_conditions[] = $wpdb->prepare( "g.status = 'public'" );
+        if ( !is_super_admin() )
+            $where_conditions[] = $wpdb->prepare( "g.status != 'hidden'");
+        // Build where sql statement if necessary
+        if ( !empty( $where_conditions ) )
+            $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $sort_by && $order ) {
+            $sort_by = $wpdb->escape( $sort_by );
+            $order = $wpdb->escape( $order );
+            $order_sql = "ORDER BY g.$sort_by $order";
+            switch ( $sort_by ) {
+                default:
+                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
+                    break;
+                case 'members':
+                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'total_member_count' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
+                    break;
+                case 'last_active':
+                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'last_activity' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
+                    break;
+            }
+        } else {
+            $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
+        }
+        return $wpdb->get_results($sql);
+    }
     function get_by_letter( $letter, $limit = null, $page = null, $populate_extras = true ) {
         global $wpdb, $bp;
+        if ( strlen($letter) > 1 || is_numeric($letter) || !$letter )
+            return false;
+        if ( !is_site_admin() )
+        // Multibyte compliance
+        if ( function_exists( 'mb_strlen' ) ) {
+            if ( mb_strlen( $letter, 'UTF-8' ) > 1 || is_numeric( $letter ) || !$letter ) {
+                return false;
+            }
+        } else {
+            if ( strlen( $letter ) > 1 || is_numeric( $letter ) || !$letter ) {
+                return false;
+            }
+        }
+        if ( !is_super_admin() )
             $hidden_sql = $wpdb->prepare( " AND status != 'hidden'");
 …
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}"  ) );
+        if ( !empty( $populate_extras ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_random( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+            $hidden_sql = "AND g.status != 'hidden'";
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $user_id = $wpdb->escape( $user_id );
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY rand() {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
+        } else {
+            $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY rand() {$pag_sql}" );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm INNER JOIN {$bp->groups->table_name} g ON gm.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql}" );
+        }
         if ( !empty( $populate_extras ) ) {
 …
         global $wpdb, $bp;
         if ( !is_site_admin() )
+        if ( !is_super_admin() )
             $hidden_sql = "WHERE status != 'hidden'";
 …
     function accept_invite() {
         $this->inviter_id = 0;
         $this->is_confirmed = 1;
+        $this->inviter_id    = 0;
+        $this->is_confirmed  = 1;
         $this->date_modified = bp_core_current_time();
+        update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
+    }
 …
         $this->is_confirmed = 1;
         $this->date_modified = bp_core_current_time();
+    }
+    function remove( $user_id, $group_id ) {
+        global $wpdb, $bp;
+        $sql = $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id );
+        update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
+    }
+    function remove() {
+        global $wpdb, $bp;
+        $sql = $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $this->user_id, $this->group_id );
         if ( !$result = $wpdb->query( $sql ) )

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

r2770	r3300
93	93	global $bp;
94	94
95		if ( is_s~~ite~~_admin() )
	95	if ( is_super_admin() )
96	96	return true;
97	97

trunk/bp-groups/bp-groups-notifications.php

-                      r2941
+                      r3300
     global $bp;
+    $group = new BP_Groups_Group( $group_id );
+    $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . __( 'Group Details Updated', 'buddypress' );
+    $group    = new BP_Groups_Group( $group_id );
+    $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+    $subject  = '[' . $sitename . '] ' . __( 'Group Details Updated', 'buddypress' );
     $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
     foreach ( (array)$user_ids as $user_id ) {
         if ( 'no' == get_usermeta( $user_id, 'notification_groups_group_updated' ) ) continue;
+        if ( 'no' == get_user_meta( $user_id, 'notification_groups_group_updated', true ) ) continue;
         $ud = bp_core_get_core_userdata( $user_id );
 …
     bp_core_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id );
     if ( 'no' == get_usermeta( $admin_id, 'notification_groups_membership_request' ) )
+    if ( 'no' == get_user_meta( $admin_id, 'notification_groups_membership_request', true ) )
         return false;
 …
     // Set up and send the message
+    $to = $ud->user_email;
+    $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
+    $to       = $ud->user_email;
+    $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
 $message = sprintf( __(
 …
         bp_core_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' );
     if ( 'no' == get_usermeta( $requesting_user_id, 'notification_membership_request_completed' ) )
+    if ( 'no' == get_user_meta( $requesting_user_id, 'notification_membership_request_completed', true ) )
         return false;
 …
     // Set up and send the message
+    $to = $ud->user_email;
+    $to       = $ud->user_email;
+    $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     if ( $accepted ) {
         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
+        $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
         $message = sprintf( __(
 'Your membership request for the group "%1$s" has been accepted.
 …
     } else {
         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
+        $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
         $message = sprintf( __(
 'Your membership request for the group "%1$s" has been rejected.
 …
     bp_core_add_notification( $group_id, $user_id, 'groups', $type );
     if ( 'no' == get_usermeta( $user_id, 'notification_groups_admin_promotion' ) )
+    if ( 'no' == get_user_meta( $user_id, 'notification_groups_admin_promotion', true ) )
         return false;
 …
     // Set up and send the message
     $to = $ud->user_email;
     $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
+    $to       = $ud->user_email;
+    $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+    $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
     $message = sprintf( __(
 …
         bp_core_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' );
         if ( 'no' == get_usermeta( $invited_user_id, 'notification_groups_invite' ) )
+        if ( 'no' == get_user_meta( $invited_user_id, 'notification_groups_invite', true ) )
             return false;
 …
         // Set up and send the message
         $to = $invited_ud->user_email;
         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
+        $to       = $invited_ud->user_email;
+        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+        $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
         $message = sprintf( __(
 …
     /* Scan for @username strings in an activity update. Notify each user. */
     $pattern = '/[@]+([A-Za-z0-9-_]+)/';
+    $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
     preg_match_all( $pattern, $content, $usernames );
 …
     foreach( (array)$usernames as $username ) {
         if ( !$receiver_user_id = bp_core_get_userid($username) )
+        if ( !$receiver_user_id = bp_core_get_userid( $username ) )
             continue;
 …
         // Now email the user with the contents of the message (if they have enabled email notifications)
         if ( 'no' != get_usermeta( $user_id, 'notification_activity_new_mention' ) ) {
+        if ( 'no' != get_user_meta( $user_id, 'notification_activity_new_mention', true ) ) {
             $poster_name = bp_core_get_user_displayname( $poster_user_id );
 …
             $ud = bp_core_get_core_userdata( $receiver_user_id );
             $to = $ud->user_email;
+            $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name );
+            $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+            $subject  = '[' . $sitename . '] ' . sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name );
 $message = sprintf( __(

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

-                      r3263
+                      r3300
     var $single_group = false;
+    var $sort_by;
+    var $order;
     function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras ) {
 …
         if ( (int)$this->total_group_count && (int)$this->pag_num ) {
             $this->pag_links = paginate_links( array(
                 'base'      => add_query_arg( array( 'grpage' => '%#%' ) ),
+                'base'      => add_query_arg( array( 'grpage' => '%#%', 'num' => $this->pag_num, 's' => $search_terms, 'sortby' => $this->sort_by, 'order' => $this->order ) ),
                 'format'    => '',
                 'total'     => ceil( (int)$this->total_group_count / (int)$this->pag_num ),
 …
     global $bp, $groups_template;
     if ( $bp->loggedin_user->is_site_admin )
+    if ( $bp->loggedin_user->is_super_admin )
         return true;
 …
         /* Fetch the avatar from the folder, if not provide backwards compat. */
         if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height ) ) )
             $avatar = '<img src="' . attribute_escape( $groups_template->group->avatar_thumb ) . '" class="avatar" alt="' . attribute_escape( $groups_template->group->name ) . '" />';
+            $avatar = '<img src="' . esc_attr( $groups_template->group->avatar_thumb ) . '" class="avatar" alt="' . esc_attr( $groups_template->group->name ) . '" />';
         return apply_filters( 'bp_get_group_avatar', $avatar );
 …
         global $bp, $groups_template;
+        $from_num = bp_core_number_format( intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1 );
+        $to_num = bp_core_number_format( ( $from_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $from_num + ( $groups_template->pag_num - 1 ) );
+        $start_num = intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1;
+        $from_num = bp_core_number_format( $start_num );
+        $to_num = bp_core_number_format( ( $start_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $start_num + ( $groups_template->pag_num - 1 ) );
         $total = bp_core_number_format( $groups_template->total_group_count );
+        return apply_filters( 'bp_get_groups_pagination_count', sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ) );
+    }
+        return apply_filters( 'bp_get_groups_pagination_count', sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ) . '<span class="ajax-loader"></span>' );
+    }
+function bp_groups_auto_join() {
+    global $bp;
+    return apply_filters( 'bp_groups_auto_join', (bool)$bp->groups->auto_join );
+}
 function bp_group_total_members() {
 …
+}
     function bp_get_group_member_unban_link( $user_id = false, $group = false ) {
         global $members_template;
+        global $members_template, $groups_template;
         if ( !$user_id )
 …
         return apply_filters( 'bp_get_group_member_unban_link', wp_nonce_url( bp_get_group_permalink( $group ) . 'admin/manage-members/unban/' . $user_id, 'groups_unban_member' ) );
+    }
+function bp_group_member_remove_link( $user_id = false ) {
+    global $members_template;
+    if ( !$user_id )
+        $user_id = $members_template->member->user_id;
+    echo bp_get_group_member_remove_link( $user_id );
+}
+    function bp_get_group_member_remove_link( $user_id = false, $group = false ) {
+        global $members_template, $groups_template;
+        if ( !$group )
+            $group =& $groups_template->group;
+        return apply_filters( 'bp_get_group_member_remove_link', wp_nonce_url( bp_get_group_permalink( $group ) . 'admin/manage-members/remove/' . $user_id, 'groups_remove_member' ) );
+    }
 …
+}
+/**
+ * bp_group_is_member()
+ *
+ * Checks if current user is member of a group.
+ *
+ * @uses is_super_admin Check if current user is super admin
+ * @uses apply_filters Creates bp_group_is_member filter and passes $is_member
+ * @usedby groups/activity.php, groups/single/forum/edit.php, groups/single/forum/topic.php to determine template part visibility
+ * @global array $bp BuddyPress Master global
+ * @global object $groups_template Current Group (usually in template loop)
+ * @param object $group Group to check is_member
+ * @return bool If user is member of group or not
+ */
 function bp_group_is_member( $group = false ) {
     global $bp, $groups_template;
+    if ( is_site_admin() )
+    // Site admins always have access
+    if ( is_super_admin() )
         return true;
+    // Load group if none passed
     if ( !$group )
         $group =& $groups_template->group;
+    // Check membership
     if ( null == $group->is_member )
+        return false;
+    return true;
+        $is_member = false;
+    else
+        $is_member = true;
+    // Return
+    return apply_filters( 'bp_group_is_member', $is_member );
+}
 …
     return true;
+}
 function bp_group_new_topic_button() {
     if ( bp_is_group_forum() && is_user_logged_in() && !bp_is_group_forum_topic() ) {
 …
 function bp_group_hidden_fields() {
     if ( isset( $_REQUEST['s'] ) ) {
         echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
     if ( isset( $_REQUEST['letter'] ) ) {
         echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+        echo '<input type="hidden" id="selected_letter" value="' . esc_attr( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
     if ( isset( $_REQUEST['groups_search'] ) ) {
         echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['groups_search'] ) . '" name="search_terms" />';
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['groups_search'] ) . '" name="search_terms" />';
+    }
+}
 …
+    }
+function bp_group_member_css_class() {
+    global $members_template;
+    if ( $members_template->member->is_banned )
+        echo apply_filters( 'bp_group_member_css_class', 'banned-user' );
+}
 function bp_group_member_joined_since() {
     echo bp_get_group_member_joined_since();
 …
         global $members_template;
+        $from_num = bp_core_number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
+        $to_num = bp_core_number_format( ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 ) );
+        $start_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
+        $from_num = bp_core_number_format( $start_num );
+        $to_num = bp_core_number_format( ( $start_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $start_num + ( $members_template->pag_num - 1 ) );
         $total = bp_core_number_format( $members_template->total_member_count );
         return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total ) );
+        return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total ) );
+    }
 …
+                }
                 $items[] = '<' . $separator . '><input' . $checked . ' type="checkbox" name="friends[]" id="f-' . $friends[$i]['id'] . '" value="' . attribute_escape( $friends[$i]['id'] ) . '" /> ' . $friends[$i]['full_name'] . '</' . $separator . '>';
+                $items[] = '<' . $separator . '><input' . $checked . ' type="checkbox" name="friends[]" id="f-' . $friends[$i]['id'] . '" value="' . esc_attr( $friends[$i]['id'] ) . '" /> ' . $friends[$i]['full_name'] . '</' . $separator . '>';
+            }
+        }
 …
 ?>
     <form action="" method="get" id="search-groups-form">
         <label><input type="text" name="s" id="groups_search" value="<?php echo attribute_escape($search_value) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+        <label><input type="text" name="s" id="groups_search" value="<?php echo esc_attr($search_value) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
         <input type="submit" id="groups_search_submit" name="groups_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
     </form>
 …
     if ( $bp->groups->current_group->avatar_full ) { ?>
         <img src="<?php echo attribute_escape( $bp->groups->current_group->avatar_full ) ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
+        <img src="<?php echo esc_attr( $bp->groups->current_group->avatar_full ) ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
     <?php } else { ?>
         <img src="<?php echo $bp->groups->image_base . '/none.gif' ?>" alt="<?php _e( 'No Group Avatar', 'buddypress' ) ?>" class="avatar" />

trunk/bp-groups/bp-groups-widgets.php

-                      r2656
+                      r3300
             </ul>
             <?php wp_nonce_field( 'groups_widget_groups_list', '_wpnonce-groups' ); ?>
             <input type="hidden" name="groups_widget_max" id="groups_widget_max" value="<?php echo attribute_escape( $instance['max_groups'] ); ?>" />
+            <input type="hidden" name="groups_widget_max" id="groups_widget_max" value="<?php echo esc_attr( $instance['max_groups'] ); ?>" />
         <?php else: ?>
 …
         ?>
         <p><label for="bp-groups-widget-groups-max"><?php _e('Max groups to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_groups' ); ?>" name="<?php echo $this->get_field_name( 'max_groups' ); ?>" type="text" value="<?php echo attribute_escape( $max_groups ); ?>" style="width: 30%" /></label></p>
+        <p><label for="bp-groups-widget-groups-max"><?php _e('Max groups to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_groups' ); ?>" name="<?php echo $this->get_field_name( 'max_groups' ); ?>" type="text" value="<?php echo esc_attr( $max_groups ); ?>" style="width: 30%" /></label></p>
     <?php
+    }
 …
         </ul>
         <?php wp_nonce_field( 'groups_widget_groups_list', '_wpnonce-groups' ); ?>
         <input type="hidden" name="groups_widget_max" id="groups_widget_max" value="<?php echo attribute_escape( $_POST['max_groups'] ); ?>" />
+        <input type="hidden" name="groups_widget_max" id="groups_widget_max" value="<?php echo esc_attr( $_POST['max_groups'] ); ?>" />
     <?php else: ?>

trunk/bp-loader.php

-                      r3282
+                      r3300
 Version: 1.3-bleeding
 Author URI: http://buddypress.org/community/members/
+Network: true
 */
 …
         include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
-    /**
-    * bp_loaded()
+    *
-    * Allow dependent plugins and core actions to attach themselves in a safe way.
+    *
-    * See bp-core.php for the following core actions:
-    *      - bp_init|bp_setup_globals|bp_setup_root_components|bp_setup_nav|bp_register_widgets
-    */
-    function bp_loaded() {
-        do_action( 'bp_loaded' );
+    }
     add_action( 'plugins_loaded', 'bp_loaded', 20 );
+}
+/**
+* bp_loaded()
+*
+* Allow dependent plugins and core actions to attach themselves in a safe way.
+*
+* See bp-core.php for the following core actions:
+*      - bp_init|bp_setup_globals|bp_setup_root_components|bp_setup_nav|bp_register_widgets
+*/
+function bp_loaded() {
+    do_action( 'bp_loaded' );
+}
 …
         switch_theme( 'bp-default', 'bp-default' );
+    /* Install site options on activation */
+    //TODO: Find where to put this back. Here is no good because bp-core.php isn't loaded on new installation.
+    //bp_core_activate_site_options( array( 'bp-disable-account-deletion' => 0, 'bp-disable-avatar-uploads' => 0, 'bp-disable-blogforum-comments' => 0,  'bp-disable-forum-directory' => 0,  'bp-disable-profile-sync' => 0 ) );
     do_action( 'bp_loader_activate' );
+}
 …
         return false;
+    delete_site_option( 'bp-core-db-version' );
+    delete_site_option( 'bp-activity-db-version' );
+    delete_site_option( 'bp-blogs-db-version' );
+    delete_site_option( 'bp-friends-db-version' );
+    delete_site_option( 'bp-groups-db-version' );
+    delete_site_option( 'bp-messages-db-version' );
+    delete_site_option( 'bp-xprofile-db-version' );
     delete_site_option( 'bp-deactivated-components' );
     delete_site_option( 'bp-blogs-first-install' );

trunk/bp-messages.php

-                      r2941
+                      r3300
 function messages_setup_globals() {
     global $bp, $wpdb;
+    global $bp;
     if ( !defined( 'BP_MESSAGES_SLUG' ) )
 …
     $bp->messages->id = 'messages';
+    $bp->messages->table_name_messages = $wpdb->base_prefix . 'bp_messages_messages';
+    $bp->messages->table_name_recipients = $wpdb->base_prefix . 'bp_messages_recipients';
+    $bp->messages->table_name_notices = $wpdb->base_prefix . 'bp_messages_notices';
+    $bp->messages->slug = BP_MESSAGES_SLUG;
+    $bp->messages->table_name_notices       = $bp->table_prefix . 'bp_messages_notices';
+    $bp->messages->table_name_messages      = $bp->table_prefix . 'bp_messages_messages';
+    $bp->messages->table_name_recipients    = $bp->table_prefix . 'bp_messages_recipients';
     $bp->messages->format_notification_function = 'messages_format_notifications';
-    $bp->messages->slug = BP_MESSAGES_SLUG;
     /* Register this in the active components array */
 …
     bp_core_new_subnav_item( array( 'name' => __( 'Compose', 'buddypress' ), 'slug' => 'compose', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_compose', 'position' => 30, 'user_has_access' => bp_is_my_profile() ) );
     if ( is_site_admin() )
         bp_core_new_subnav_item( array( 'name' => __( 'Notices', 'buddypress' ), 'slug' => 'notices', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_notices', 'position' => 90, 'user_has_access' => is_site_admin() ) );
+    if ( is_super_admin() )
+        bp_core_new_subnav_item( array( 'name' => __( 'Notices', 'buddypress' ), 'slug' => 'notices', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_notices', 'position' => 90, 'user_has_access' => is_super_admin() ) );
     if ( $bp->current_component == $bp->messages->slug ) {
 …
     messages_remove_callback_values();
     /* Check if the message form has been submitted */
+    // Check if the message form has been submitted
     if ( isset( $_POST['send'] ) ) {
         /* Check the nonce */
+        // Check the nonce
         check_admin_referer( 'messages_send_message' );
         /* Check we have what we need */
+        // Check we have what we need
         if ( empty( $_POST['subject'] ) || empty( $_POST['content'] ) ) {
             bp_core_add_message( __( 'There was an error sending that message, please try again', 'buddypress' ), 'error' );
         } else {
             /* If this is a notice, send it */
+            // If this is a notice, send it
             if ( isset( $_POST['send-notice'] ) ) {
                 if ( messages_send_notice( $_POST['subject'], $_POST['content'] ) ) {
 …
+                }
             } else {
                 /* Filter recipients into the format we need - array( 'username/userid', 'username/userid' ) */
+                // Filter recipients into the format we need - array( 'username/userid', 'username/userid' )
                 $autocomplete_recipients = explode( ',', $_POST['send-to-input'] );
+                $typed_recipients = explode( ' ', $_POST['send_to_usernames'] );
+                $recipients = array_merge( (array) $autocomplete_recipients, (array) $typed_recipients );
+                /* Send the message */
+                $typed_recipients        = explode( ' ', $_POST['send_to_usernames'] );
+                $recipients              = array_merge( (array) $autocomplete_recipients, (array) $typed_recipients );
+                $recipients              = apply_filters( 'bp_messages_recipients', $recipients );
+                // Send the message
                 if ( $thread_id = messages_new_message( array( 'recipients' => $recipients, 'subject' => $_POST['subject'], 'content' => $_POST['content'] ) ) ) {
                     bp_core_add_message( __( 'Message sent successfully!', 'buddypress' ) );
 …
+            }
+        }
+    }
 …
     global $bp, $notice_id;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
 …
 function messages_screen_notification_settings() {
     global $current_user; ?>
+    <table class="notification-settings" id="messages-notification-settings">
+        <tr>
+            <th class="icon"></th>
+            <th class="title"><?php _e( 'Messages', 'buddypress' ) ?></th>
+            <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+            <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php _e( 'A member sends you a new message', 'buddypress' ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_message' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td><?php _e( 'A new site notice is posted', 'buddypress' ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_notice' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
+        </tr>
+        <?php do_action( 'messages_screen_notification_settings' ) ?>
+    <table class="notification-settings zebra" id="messages-notification-settings">
+        <thead>
+            <tr>
+                <th class="icon"></th>
+                <th class="title"><?php _e( 'Messages', 'buddypress' ) ?></th>
+                <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+                <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td></td>
+                <td><?php _e( 'A member sends you a new message', 'buddypress' ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_messages_new_message', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_messages_new_message', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_messages_new_message', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td><?php _e( 'A new site notice is posted', 'buddypress' ) ?></td>
+                <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_messages_new_notice', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_messages_new_notice', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_messages_new_notice', true ) ) { ?>checked="checked" <?php } ?>/></td>
+            </tr>
+            <?php do_action( 'messages_screen_notification_settings' ) ?>
+        </tbody>
     </table>
 <?php
 …
     $thread_id = $bp->action_variables[0];
     if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access($thread_id) && !is_site_admin() ) )
+    if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access($thread_id) && !is_super_admin() ) )
         bp_core_redirect( $bp->displayed_user->domain . $bp->current_component );
 …
         'subject' => false,
         'content' => false,
         'date_sent' => time()
+        'date_sent' => bp_core_current_time()
     );
 …
     $message->date_sent = $date_sent;
     /* If we have a thread ID, use the existing recipients, otherwise use the recipients passed */
+    // If we have a thread ID, use the existing recipients, otherwise use the recipients passed
     if ( $thread_id ) {
         $thread = new BP_Messages_Thread( $thread_id );
         $message->recipients = $thread->get_recipients();
+        // Strip the sender from the recipient list if they exist
+        if ( isset( $message->recipients[$sender_id] ) )
+            unset( $message->recipients[$sender_id] );
         if ( empty( $message->subject ) )
             $message->subject = sprintf( __( 'Re: %s', 'buddypress' ), $thread->messages[0]->subject );
+    // No thread ID, so make some adjustments
     } else {
         if ( empty( $recipients ) )
 …
 function messages_send_notice( $subject, $message ) {
     if ( !is_site_admin() || empty( $subject ) || empty( $message ) ) {
+    if ( !is_super_admin() || empty( $subject ) || empty( $message ) ) {
         return false;
     } else {
 …
         $notice->subject = $subject;
         $notice->message = $message;
         $notice->date_sent = time();
+        $notice->date_sent = bp_core_current_time();
         $notice->is_active = 1;
         $notice->save(); // send it.

trunk/bp-messages/bp-messages-classes.php

-                      r2576
+                      r3300
         global $bp;
         $this->date_sent = time();
+        $this->date_sent = bp_core_current_time();
         $this->sender_id = $bp->loggedin_user->id;
 …
         // First insert the message into the messages table
         if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( thread_id, sender_id, subject, message, date_sent ) VALUES ( %d, %d, %s, %s, FROM_UNIXTIME(%d) )", $this->thread_id, $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) )
+        if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( thread_id, sender_id, subject, message, date_sent ) VALUES ( %d, %d, %s, %s, %s )", $this->thread_id, $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) )
             return false;
 …
         if ( !$this->id ) {
             $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_notices} (subject, message, date_sent, is_active) VALUES (%s, %s, FROM_UNIXTIME(%d), %d)", $this->subject, $this->message, $this->date_sent, $this->is_active );
+            $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_notices} (subject, message, date_sent, is_active) VALUES (%s, %s, %s, %d)", $this->subject, $this->message, $this->date_sent, $this->is_active );
         } else {
             $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET subject = %s, message = %s, is_active = %d WHERE id = %d", $this->subject, $this->message, $this->is_active, $this->id );
 …
         $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET is_active = 0 WHERE id != %d", $id ) );
         update_usermeta( $bp->loggedin_user->id, 'last_activity', date( 'Y-m-d H:i:s' ) );
+        update_user_meta( $bp->loggedin_user->id, 'last_activity', date( 'Y-m-d H:i:s' ) );
         do_action( 'messages_notice_after_save', $this );

trunk/bp-messages/bp-messages-cssjs.php

-                      r2077
+                      r3300
+}
 add_action( 'template_redirect', 'messages_add_autocomplete_js', 1 );
+add_action( 'wp', 'messages_add_autocomplete_js', 2 );
 function messages_add_autocomplete_css() {
 …
 function messages_autocomplete_init_jsblock() {
+    global $bp;
 ?>
     <script type="text/javascript">

trunk/bp-messages/bp-messages-filters.php

-                      r2679
+                      r3300
 add_filter( 'bp_get_the_thread_message_content', 'make_clickable' );
-add_filter( 'bp_get_message_notice_subject', 'wpautop' );
 add_filter( 'bp_get_message_notice_text', 'wpautop' );
-add_filter( 'bp_get_message_thread_subject', 'wpautop' );
 add_filter( 'bp_get_the_thread_message_content', 'wpautop' );

trunk/bp-messages/bp-messages-notifications.php

-                      r3232
+                      r3300
     foreach( $recipients as $recipient ) {
         if ( $sender_id == $recipient->user_id || 'no' == get_usermeta( $recipient->user_id, 'notification_messages_new_message' ) ) continue;
+        if ( $sender_id == $recipient->user_id || 'no' == get_user_meta( $recipient->user_id, 'notification_messages_new_message', true ) ) continue;
         $ud = get_userdata( $recipient->user_id );
 …
         // Set up and send the message
+        $email_to = $ud->user_email;
+        $email_subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
+        $email_to      = $ud->user_email;
+        $sitename      = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+        $email_subject = '[' . $sitename . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
         $email_content = sprintf( __(
 '%1$s sent you a new message:
+'%s sent you a new message:
 Subject: %2$s
+Subject: %s
 "%3$s"
+"%s"
 To view and read your messages please log in and visit: %4$s
+To view and read your messages please log in and visit: %s
 ---------------------
 ', 'buddypress' ), $sender_name, $subject, $content, $message_link );
         $content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+        $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
         /* Send the message */

trunk/bp-messages/bp-messages-templatetags.php

-                      r3263
+                      r3300
         $this->type     = $type;
         if ( 'notices' == $this->box )
+        if ( 'notices' == $this->box ) {
             $this->threads = BP_Messages_Notice::get_notices();
         else {
+        } else {
             $threads = BP_Messages_Thread::get_current_threads_for_user( $this->user_id, $this->box, $this->type, $this->pag_num, $this->pag_page );
 …
     extract( $r, EXTR_SKIP );
     if ( 'notices' == $bp->current_action && !is_site_admin() ) {
+    if ( 'notices' == $bp->current_action && !is_super_admin() ) {
         wp_redirect( $bp->displayed_user->id );
     } else {
 …
+    }
+function bp_message_css_class() {
+    echo bp_get_message_css_class();
+}
+    function bp_get_message_css_class() {
+        global $messages_template;
+        $class = false;
+        if ( $messages_template->current_thread % 2 == 1 )
+            $class .= 'alt';
+        return apply_filters( 'bp_get_message_css_class', trim( $class ) );
+    }
 function bp_message_thread_has_unread() {
     global $messages_template;
 …
     global $messages_template;
+    $from_num = bp_core_number_format( intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1 );
+    $to_num = bp_core_number_format( ( $from_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $from_num + ( $messages_template->pag_num - 1 ) );
+    $start_num = intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1;
+    $from_num = bp_core_number_format( $start_num );
+    $to_num = bp_core_number_format( ( $start_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $start_num + ( $messages_template->pag_num - 1 ) );
     $total = bp_core_number_format( $messages_template->total_thread_count );
     echo sprintf( __( 'Viewing message %s to %s (of %s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
+    echo sprintf( __( 'Viewing message %1$s to %2$s (of %3$s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
     <span class="ajax-loader"></span><?php
+}
 …
         global $bp;
         return apply_filters( 'bp_get_messages_form_action', $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/' . $bp->action_variables[0] . '/' );
+        return apply_filters( 'bp_get_messages_form_action', trailingslashit( $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/' . $bp->action_variables[0] . '/' ) );
+    }
 …
         return false;
     $closed_notices = get_usermeta( $userdata->ID, 'closed_notices' );
+    $closed_notices = get_user_meta( $userdata->ID, 'closed_notices', true );
     if ( !$closed_notices )

trunk/bp-messages/css/autocomplete/jquery.autocompletefb.css

r2191	r3300
36	36
37	37	.ac_loading {
38		background : url('../../images/ajax-loader.gif') right center no-repeat;
	38	background : url('../../../bp-themes/bp-default/_inc/images/ajax-loader.gif') right center no-repeat;
39	39	}
40	40

trunk/bp-themes/bp-default/_inc/ajax.php

-                      r2733
+                      r3300
             <li id="acomment-<?php bp_activity_id() ?>">
                 <div class="acomment-avatar">
                     <?php bp_activity_avatar( array( 'width' => 25, 'height' => 25 ) ) ?>
+                    <?php bp_activity_avatar() ?>
                 </div>
                 <div class="acomment-meta">
                     <?php echo bp_core_get_userlink( bp_get_activity_user_id() ) ?> &middot; <?php printf( __( '%s ago', 'buddypress' ), bp_core_time_since( gmdate( "Y-m-d H:i:s" ) ) ) ?> &middot;
                     <a class="acomment-reply" href="#acomment-<?php bp_activity_id() ?>" id="acomment-reply-<?php echo attribute_escape( $_POST['form_id'] ) ?>"><?php _e( 'Reply', 'buddypress' ) ?></a>
+                    <?php echo bp_core_get_userlink( bp_get_activity_user_id() ) ?> &middot; <?php printf( __( '%s ago', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ) ?> &middot;
+                    <a class="acomment-reply" href="#acomment-<?php bp_activity_id() ?>" id="acomment-reply-<?php echo esc_attr( $_POST['form_id'] ) ?>"><?php _e( 'Reply', 'buddypress' ) ?></a>
                      &middot; <a href="<?php echo wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . bp_get_activity_id() . '?cid=' . $comment_id, 'bp_activity_delete_link' ) ?>" class="delete acomment-delete confirm"><?php _e( 'Delete', 'buddypress' ) ?></a>
                 </div>
 …
     /* Check access */
     if ( !is_site_admin() && $activity->user_id != $bp->loggedin_user->id )
+    if ( !is_super_admin() && $activity->user_id != $bp->loggedin_user->id )
         return false;
 …
     /* Check access */
     if ( !is_site_admin() && $comment->user_id != $bp->loggedin_user->id )
+    if ( !is_super_admin() && $comment->user_id != $bp->loggedin_user->id )
         return false;
 …
         echo '<span class="activity">' . esc_attr( $user->last_active ) . '</span>';
         echo '<div class="action">
                 <a class="remove" href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . attribute_escape( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
+                <a class="remove" href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . esc_attr( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
               </div>';
         echo '</li>';
 …
                 _e( 'Error joining group', 'buddypress' );
             } else {
                 echo '<a id="group-' . attribute_escape( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                echo '<a id="group-' . esc_attr( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+            }
 …
                 _e( 'Error requesting membership', 'buddypress' );
             } else {
                 echo '<a id="group-' . attribute_escape( $group->id ) . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';
+                echo '<a id="group-' . esc_attr( $group->id ) . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';
+            }
+        }
 …
         } else {
             if ( 'public' == $group->status ) {
                 echo '<a id="group-' . attribute_escape( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
+                echo '<a id="group-' . esc_attr( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
             } else if ( 'private' == $group->status ) {
                 echo '<a id="group-' . attribute_escape( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
+                echo '<a id="group-' . esc_attr( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
+            }
+        }
 …
         echo "-1<div id='message' class='error'><p>" . __('There was a problem closing the notice.', 'buddypress') . '</p></div>';
     } else {
         $notice_ids = get_usermeta( $userdata->ID, 'closed_notices' );
+        $notice_ids = get_user_meta( $userdata->ID, 'closed_notices', true );
         $notice_ids[] = (int) $_POST['notice_id'];
         update_usermeta( $userdata->ID, 'closed_notices', $notice_ids );
+        update_user_meta( $userdata->ID, 'closed_notices', $notice_ids );
+    }
+}
 …
                 <?php echo bp_loggedin_user_avatar( 'type=thumb&width=30&height=30' ); ?>
                 <strong><a href="<?php echo $bp->loggedin_user->domain ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( time() ) ) ?></span></strong>
+                <strong><a href="<?php echo $bp->loggedin_user->domain ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ) ?></span></strong>
                 <?php do_action( 'bp_after_message_meta' ) ?>

trunk/bp-themes/bp-default/_inc/css/default.css

-                      r3232
+                      r3300
 a:focus { outline: 1px dotted #ccc; }
 .padder { padding: 20px; }
+.padder { padding: 19px; }
 .clear { clear: left; }
 …
     margin-left: -226px;
     margin-top: 1px;
     border-left: 1px solid #e4e4e4;
+    border-left: 1px solid #ddd;
     -moz-border-radius-topright: 3px;
     -webkit-border-top-right-radius: 3px;
 …
     div#sidebar ul.item-list img.avatar {
         width: 25px;
         height: 25px;
+        width: 20px;
+        height: 20px;
         margin-right: 10px;
+    }
 …
 div#content .padder {
     margin-right: 225px;
     border-right: 1px solid #e4e4e4;
+    border-right: 1px solid #ddd;
     -moz-border-radius-topleft: 6px;
     -webkit-border-top-left-radius: 6px;
 …
+    }
         ul.single-line li { border: none; }
-        body.activity-permalink ul.item-list li { padding-top: 0; }
         ul.item-list li img.avatar {
 …
     clear: left;
     overflow: hidden;
     margin: 25px -20px 20px -20px;
+    margin: 25px -19px 20px -19px;
     background: #eaeaea;
+}
 …
     div.item-list-tabs#subnav {
         background: #fff;
         margin: -15px -20px 15px -20px;
+        margin: -15px -19px 15px -19px;
         border-bottom: 1px solid #eaeaea;
         min-height: 35px;
 …
 div.pagination {
     margin: -15px -20px 9px -20px;
+    margin: -20px -20px 9px -20px;
     border-bottom: 1px solid #eaeaea;
     padding: 10px 20px 10px 20px;
 …
                 font-weight: bold;
+            }
+div#pag-bottom {
+    margin-top: 0;
+}
 /* > Error / Success Messages
 …
 -------------------------------------------------------------- */
 a.button, input[type=submit], input[type=button],
+a.button, input[type=submit], input[type=button], input[type=reset],
 ul.button-nav li a, div.generic-button a {
     background: url( ../images/white-grad.png ) top left repeat-x;
 …
     cursor: pointer;
+}
     a.button:hover, a.button:focus, input[type=submit]:hover, input[type=button]:hover,
+    a.button:hover, a.button:focus, input[type=submit]:hover, input[type=button]:hover, input[type=reset]:hover,
     ul.button-nav li a:hover, ul.button-nav li.current a,
     div.generic-button a:hover {
 …
+        }
+    form.standard-form a.clear-value {
+        display: block;
+        margin-top: 5px;
+        outline: none;
+    }
 form.standard-form #basic-details-section, form.standard-form #blog-details-section,
 form.standard-form #profile-details-section {
 …
     width: 100%;
+}
+    table thead tr {
+        background: #eaeaea;
+    }
     table#message-threads {
         margin: 0 -20px;
 …
     width: auto;
+}
-    table.forum tr:first-child {
-        background: #fafafa;
+    }
     table.forum tr.sticky td {
         background: #FFF9DB;
 …
     form#whats-new-form textarea {
         width: 100%;
         height: 60px;
+        height: 50px;
         font-size: 14px;
         font-family: inherit;
 …
 .activity-list .activity-avatar img {
     width: 60px;
     height: 60px;
+    width: 50px;
+    height: 50px;
+}
         body.activity-permalink .activity-list .activity-avatar img {
 …
         line-height: 220%;
+    }
+    .activity-list .activity-content .activity-header img.avatar {
+        float: none !important;
+        margin: 0 5px -8px 0 !important;
+    }
     .activity-list .activity-header a:first-child, span.highlight {
 …
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
+    padding: 0 10px 0;
+}
 div.activity-comments ul, div.activity-comments ul li {
 …
     div.activity-comments ul li {
         border-top: 2px solid #fff;
+        padding: 10px 15px 10px 0;
+        margin-left: 15px;
+        padding: 10px 0 0;
+    }
         body.activity-permalink div.activity-comments ul li {
             border-width: 1px;
             padding: 15px 0 15px 0;
+            padding: 10px 0 0;
+        }
         div.activity-comments ul li p:last-child {
             margin-bottom: 0;
+            margin-bottom: 10px;
+        }
 …
     div.activity-comments ul li > ul {
         margin-top: 5px;
         margin-left: 25px;
+        margin-top: 0;
+        margin-left: 20px;
+    }
         body.activity-permalink div.activity-comments ul li > ul {
 …
         display: none;
         margin: 10px 0 10px 33px;
+        background: #eee;
+        border-bottom: 1px solid #ddd;
+        border-right: 1px solid #ddd;
+        background: #fafafa;
+        border: 1px solid #ddd;
         -moz-border-radius: 4px;
         -webkit-border-radius: 4px;
 …
         div.activity-comments form div.ac-reply-content {
             margin-left: 25px;
+            margin-left: 50px;
             padding-left: 15px;
             color: #888;

trunk/bp-themes/bp-default/_inc/global.js

r3232	r3300
825	825	jq(this).removeClass('over');
826	826	});
827
	827
828	828	jq('body#bp-default table.zebra tbody tr:odd').addClass('alt');
829	829

trunk/bp-themes/bp-default/activity/entry.php

r2761	r3300
56	56	<?php if ( is_user_logged_in() ) : ?>
57	57	<form action="<?php bp_activity_comment_form_action() ?>" method="post" id="ac-form-<?php bp_activity_id() ?>" class="ac-form"<?php bp_activity_comment_form_nojs_display() ?>>
58		<div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=~~25&height=25'~~ ) ?></div>
	58	<div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ) ?></div>
59	59	<div class="ac-reply-content">
60	60	<div class="ac-textarea">

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

r2908	r3300
58	58	<div class="item-list-tabs no-ajax" id="subnav">
59	59	<ul>
60		<li class="feed"><a href="<?php bp_sitewide_activity_feed_link() ?>" title="~~RSS Feed~~"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
	60	<li class="feed"><a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
61	61
62	62	<?php do_action( 'bp_activity_syndication_options' ) ?>

trunk/bp-themes/bp-default/activity/post-form.php

-                      r2696
+                      r3300
     <div id="whats-new-avatar">
         <a href="<?php echo bp_loggedin_user_domain() ?>">
             <?php bp_loggedin_user_avatar( 'width=60&height=60' ) ?>
+            <?php bp_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ) ?>
         </a>
     </div>
 …
     <div id="whats-new-content">
         <div id="whats-new-textarea">
             <textarea name="whats-new" id="whats-new" value="" /><?php if ( isset( $_GET['r'] ) ) : ?>@<?php echo esc_attr( $_GET['r'] ) ?> <?php endif; ?></textarea>
+            <textarea name="whats-new" id="whats-new" cols="50" rows="10"><?php if ( isset( $_GET['r'] ) ) : ?>@<?php echo esc_attr( $_GET['r'] ) ?> <?php endif; ?></textarea>
         </div>

trunk/bp-themes/bp-default/archive.php

r2694	r3300
33	33	<h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
34	34
35		<p class="date"><?php the_time(~~'F j, Y'~~) ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
	35	<p class="date"><?php the_time() ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
36	36
37	37	<div class="entry">

trunk/bp-themes/bp-default/blogs/blogs-loop.php

-                      r3263
+                      r3300
 <?php if ( bp_has_blogs( bp_ajax_querystring( 'blogs' ) ) ) : ?>
     <div class="pagination">
+    <div id="pag-top" class="pagination">
         <div class="pag-count" id="blog-dir-count">
+        <div class="pag-count" id="blog-dir-count-top">
             <?php bp_blogs_pagination_count() ?>
         </div>
         <div class="pagination-links" id="blog-dir-pag">
+        <div class="pagination-links" id="blog-dir-pag-top">
             <?php bp_blogs_pagination_links() ?>
         </div>
     </div>
+    <?php do_action( 'bp_before_directory_blogs_list' ) ?>
     <ul id="blogs-list" class="item-list">
 …
     <?php bp_blog_hidden_fields() ?>
+    <div id="pag-bottom" class="pagination">
+        <div class="pag-count" id="blog-dir-count-bottom">
+            <?php bp_blogs_pagination_count() ?>
+        </div>
+        <div class="pagination-links" id="blog-dir-pag-bottom">
+            <?php bp_blogs_pagination_links() ?>
+        </div>
+    </div>
 <?php else: ?>

trunk/bp-themes/bp-default/comments.php

-                      r3232
+                      r3300
             <?php
+            $numTrackBacks = 0; $numComments = 0;
+            foreach ( (array)$comments as $comment ) if ( get_comment_type() != "comment") $numTrackBacks++; else $numComments++;
+                // Only include comments
+                $numTrackBacks = 0; $numComments = 0;
+                foreach ( (array)$comments as $comment )
+                    if ( 'comment' != get_comment_type() )
+                        $numTrackBacks++;
+                    else
+                        $numComments++;
             ?>
+            <span class="title"><?php the_title() ?></span>
+            <h3 id="comments"><?php comments_number( 'No Comments', 'One Comment', $numComments . ' Comments' );?></h3>
+            <h3 id="comments">
+                <?php
+                    printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', $numComments, 'buddypress' ),
+                    number_format_i18n( $numComments ), '<em>' . get_the_title() . '</em>' );
+                ?>
+            </h3>
             <?php do_action( 'bp_before_blog_comment_list' ) ?>
 …
                     <?php do_action( 'bp_before_blog_comment_form' ) ?>
                     <form action="<?php echo get_option( 'siteurl' ); ?>/wp-comments-post.php" method="post" id="commentform" class="standard-form">
+                    <form action="<?php echo site_url( 'wp-comments-post.php' ) ?>" method="post" id="commentform" class="standard-form">
                         <?php if ( $user_ID ) : ?>

trunk/bp-themes/bp-default/footer.php

r2284	r3300
5	5
6	6	<div id="footer">
7		<p><?php printf( __( '%s is proudly powered by <a href="http://wordpress.org">WordPress</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), ~~bloginfo('name'~~) ); ?></p>
	7	<p><?php printf( __( '%s is proudly powered by <a href="http://wordpress.org">WordPress</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), get_bloginfo( 'name' ) ); ?></p>
8	8
9	9	<?php do_action( 'bp_footer' ) ?>

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

-                      r3232
+                      r3300
 <?php get_header() ?>
-    <?php do_action( 'bp_before_directory_forums_content' ) ?>
     <div id="content">
 …
         <form action="" method="post" id="forums-search-form" class="dir-form">
             <h3><?php _e( 'Group Forums Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ) ?></a><?php endif; ?></h3>
+            <?php do_action( 'bp_before_directory_forums_content' ) ?>
             <div id="forums-dir-search" class="dir-search">
 …
         </form>
             <div id="new-topic-post">
                 <?php if ( is_user_logged_in() ) : ?>
+        <div id="new-topic-post">
+            <?php if ( is_user_logged_in() ) : ?>
                     <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100' ) ) : ?>
+                <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100' ) ) : ?>
                         <form action="" method="post" id="forum-topic-form" class="standard-form">
+                    <form action="" method="post" id="forum-topic-form" class="standard-form">
                             <?php do_action( 'groups_forum_new_topic_before' ) ?>
+                        <?php do_action( 'groups_forum_new_topic_before' ) ?>
                             <a name="post-new"></a>
                             <h5><?php _e( 'Post a New Topic:', 'buddypress' ) ?></h5>
+                        <a name="post-new"></a>
+                        <h5><?php _e( 'Post a New Topic:', 'buddypress' ) ?></h5>
                             <label><?php _e( 'Title:', 'buddypress' ) ?></label>
                             <input type="text" name="topic_title" id="topic_title" value="" />
+                        <label><?php _e( 'Title:', 'buddypress' ) ?></label>
+                        <input type="text" name="topic_title" id="topic_title" value="" />
                             <label><?php _e( 'Content:', 'buddypress' ) ?></label>
                             <textarea name="topic_text" id="topic_text"></textarea>
+                        <label><?php _e( 'Content:', 'buddypress' ) ?></label>
+                        <textarea name="topic_text" id="topic_text"></textarea>
                             <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
                             <input type="text" name="topic_tags" id="topic_tags" value="" />
+                        <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
+                        <input type="text" name="topic_tags" id="topic_tags" value="" />
+                            <label><?php _e( 'Post In Group Forum:', 'buddypress' ) ?></label>
+                            <select id="topic_group_id" name="topic_group_id">
+                                <?php while ( bp_groups() ) : bp_the_group(); ?>
+                                    <?php if ( 'public' == bp_get_group_status() ) : ?>
+                                        <option value="<?php bp_group_id() ?>"><?php bp_group_name() ?></option>
+                                    <?php endif; ?>
+                                <?php endwhile; ?>
+                            </select>
+                        <label><?php _e( 'Post In Group Forum:', 'buddypress' ) ?></label>
+                        <select id="topic_group_id" name="topic_group_id">
                             <?php do_action( 'groups_forum_new_topic_after' ) ?>
+                            <option value="">----</option>
+                            <div class="submit">
+                                <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ) ?>" />
+                                <input type="button" name="submit_topic_cancel" id="submit_topic_cancel" value="<?php _e( 'Cancel', 'buddypress' ) ?>" />
+                            </div>
+                            <?php while ( bp_groups() ) : bp_the_group(); ?>
                             <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>
+                                <?php if ( bp_group_is_forum_enabled() && 'public' == bp_get_group_status() ) : ?>
                         </form>
+                                    <option value="<?php bp_group_id() ?>"><?php bp_group_name() ?></option>
                     <?php else : ?>
+                                <?php endif; ?>
+                        <div id="message" class="info">
+                            <p><?php printf( __( "You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( BP_GROUPS_SLUG . '/create/' ) ) ?></p>
+                            <?php endwhile; ?>
+                        </select><!-- #topic_group_id -->
+                        <?php do_action( 'groups_forum_new_topic_after' ) ?>
+                        <div class="submit">
+                            <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ) ?>" />
+                            <input type="button" name="submit_topic_cancel" id="submit_topic_cancel" value="<?php _e( 'Cancel', 'buddypress' ) ?>" />
                         </div>
+                    <?php endif; ?>
+                        <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>
+                    </form><!-- #forum-topic-form -->
+                <?php else : ?>
+                    <div id="message" class="info">
+                        <p><?php printf( __( "You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( BP_GROUPS_SLUG . '/create/' ) ) ?></p>
+                    </div>
                 <?php endif; ?>
+            </div>
+            <?php endif; ?>
+        </div><!-- #new-topic-post -->
         <form action="" method="post" id="forums-directory-form" class="dir-form">

trunk/bp-themes/bp-default/functions.php

-                      r3263
+                      r3300
 <?php
 /* Stop the theme from killing WordPress if BuddyPress is not enabled. */
+// Stop the theme from killing WordPress if BuddyPress is not enabled.
 if ( !class_exists( 'BP_Core_User' ) )
     return false;
 /* Register the widget columns */
+// Register the widget columns
 register_sidebars( 1,
     array(
         'name' => 'Sidebar',
+        'name'          => 'Sidebar',
         'before_widget' => '<div id="%1$s" class="widget %2$s">',
         'after_widget' => '</div>',
         'before_title' => '<h3 class="widgettitle">',
         'after_title' => '</h3>'
+        'after_widget'  => '</div>',
+        'before_title'  => '<h3 class="widgettitle">',
+        'after_title'   => '</h3>'
+    )
 );
 /* Load the AJAX functions for the theme */
+// Load the AJAX functions for the theme
 require_once( TEMPLATEPATH . '/_inc/ajax.php' );
 /* Load the javascript for the theme */
+// Load the javascript for the theme
 wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ) );
+/* Add the JS needed for blog comment replies */
+// Add words that we need to use in JS to the end of the page so they can be translated and still used.
+$params = array(
+    'my_favs'           => __( 'My Favorites', 'buddypress' ),
+    'accepted'          => __( 'Accepted', 'buddypress' ),
+    'rejected'          => __( 'Rejected', 'buddypress' ),
+    'show_all_comments' => __( 'Show all comments for this thread', 'buddypress' ),
+    'show_all'          => __( 'Show all', 'buddypress' ),
+    'comments'          => __( 'comments', 'buddypress' ),
+    'close'             => __( 'Close', 'buddypress' ),
+    'mention_explain'   => sprintf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", 'buddypress' ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname( bp_get_displayed_user_fullname() ), bp_get_user_firstname( bp_get_displayed_user_fullname() ) )
+);
+wp_localize_script( 'dtheme-ajax-js', 'BP_DTheme', $params );
+/**
+ * Add the JS needed for blog comment replies
+ *
+ * @package BuddyPress Theme
+ * @since 1.2
+ */
 function bp_dtheme_add_blog_comments_js() {
     if ( is_singular() ) wp_enqueue_script( 'comment-reply' );
 …
 add_action( 'template_redirect', 'bp_dtheme_add_blog_comments_js' );
+/* HTML for outputting blog comments as defined by the WP comment API */
+/**
+ * HTML for outputting blog comments as defined by the WP comment API
+ *
+ * @param mixed $comment Comment record from database
+ * @param array $args Arguments from wp_list_comments() call
+ * @param int $depth Comment nesting level
+ * @see wp_list_comments()
+ * @package BuddyPress Theme
+ * @since 1.2
+ */
 function bp_dtheme_blog_comments( $comment, $args, $depth ) {
     $GLOBALS['comment'] = $comment; ?>
 …
         </div>
-    </li>
 <?php
+}
+/* Filter the dropdown for selecting the page to show on front to include "Activity Stream" */
+/**
+ * Filter the dropdown for selecting the page to show on front to include "Activity Stream"
+ *
+ * @param string $page_html A list of pages as a dropdown (select list)
+ * @see wp_dropdown_pages()
+ * @return string
+ * @package BuddyPress Theme
+ * @since 1.2
+ */
 function bp_dtheme_wp_pages_filter( $page_html ) {
+    if ( !bp_is_active( 'activity' ) )
+        return $page_html;
     if ( 'page_on_front' != substr( $page_html, 14, 13 ) )
         return $page_html;
 …
 add_filter( 'wp_dropdown_pages', 'bp_dtheme_wp_pages_filter' );
+/* Hijack the saving of page on front setting to save the activity stream setting */
+/**
+ * Hijack the saving of page on front setting to save the activity stream setting
+ *
+ * @param $string $oldvalue Previous value of get_option( 'page_on_front' )
+ * @param $string $oldvalue New value of get_option( 'page_on_front' )
+ * @return string
+ * @package BuddyPress Theme
+ * @since 1.2
+ */
 function bp_dtheme_page_on_front_update( $oldvalue, $newvalue ) {
     if ( !is_admin() || !is_site_admin() )
+    if ( !is_admin() || !is_super_admin() )
         return false;
 …
 add_action( 'pre_update_option_page_on_front', 'bp_dtheme_page_on_front_update', 10, 2 );
+/* Load the activity stream template if settings allow */
+/**
+ * Load the activity stream template if settings allow
+ *
+ * @param string $template Absolute path to the page template
+ * @return string
+ * @global WP_Query $wp_query WordPress query object
+ * @package BuddyPress Theme
+ * @since 1.2
+ */
 function bp_dtheme_page_on_front_template( $template ) {
     global $wp_query;
 …
 add_filter( 'page_template', 'bp_dtheme_page_on_front_template' );
+/* Return the ID of a page set as the home page. */
+/**
+ * Return the ID of a page set as the home page.
+ *
+ * @return false|int ID of page set as the home page
+ * @package BuddyPress Theme
+ * @since 1.2
+ */
 function bp_dtheme_page_on_front() {
     if ( 'page' != get_option( 'show_on_front' ) )
 …
+}
+/* Force the page ID as a string to stop the get_posts query from kicking up a fuss. */
+/**
+ * Force the page ID as a string to stop the get_posts query from kicking up a fuss.
+ *
+ * @global WP_Query $wp_query WordPress query object
+ * @package BuddyPress Theme
+ * @since 1.2
+ */
 function bp_dtheme_fix_get_posts_on_activity_front() {
     global $wp_query;
 …
 add_action( 'pre_get_posts', 'bp_dtheme_fix_get_posts_on_activity_front' );
+/****
+/**
+ * WP 3.0 requires there to be a non-null post in the posts array
+ *
+ * @param array $posts Posts as retrieved by WP_Query
+ * @global WP_Query $wp_query WordPress query object
+ * @return array
+ * @package BuddyPress Theme
+ * @since 1.2.5
+ */
+function bp_dtheme_fix_the_posts_on_activity_front( $posts ) {
+    global $wp_query;
+    // NOTE: the double quotes around '"activity"' are thanks to our previous function bp_dtheme_fix_get_posts_on_activity_front()
+    if ( empty( $posts ) && !empty( $wp_query->query_vars['page_id'] ) && '"activity"' == $wp_query->query_vars['page_id'] )
+        $posts = array( (object) array( 'ID' => 'activity' ) );
+    return $posts;
+}
+add_filter( 'the_posts', 'bp_dtheme_fix_the_posts_on_activity_front' );
+/**
+ * Add secondary avatar image to this activity stream's record, if supported
+ *
+ * @param string $action The text of this activity
+ * @param BP_Activity_Activity $activity Activity object
+ * @return string
+ * @package BuddyPress Theme
+ * @since 1.2.6
+ */
+function bp_dtheme_activity_secondary_avatars( $action, $activity ) {
+    switch ( $activity->component ) {
+        case 'groups' :
+        case 'blogs' :
+        case 'friends' :
+            // Only insert avatar if one exists
+            if ( $secondary_avatar = bp_get_activity_secondary_avatar() ) {
+                $reverse_content = strrev( $action );
+                $position        = strpos( $reverse_content, 'a<' );
+                $action          = substr_replace( $action, $secondary_avatar, -$position - 2, 0 );
+            }
+            break;
+    }
+    return $action;
+}
+add_filter( 'bp_get_activity_action_pre_meta', 'bp_dtheme_activity_secondary_avatars', 10, 2 );
+/**
  * Custom header image support. You can remove this entirely in a child theme by adding this line
  * to your functions.php: define( 'BP_DTHEME_DISABLE_CUSTOM_HEADER', true );
+ *
+ * @package BuddyPress Theme
+ * @since 1.2
  */
 function bp_dtheme_add_custom_header_support() {
     /* Set the defaults for the custom header image (http://ryan.boren.me/2007/01/07/custom-image-header-api/) */
+    // Set the defaults for the custom header image (http://ryan.boren.me/2007/01/07/custom-image-header-api/)
     define( 'HEADER_TEXTCOLOR', 'FFFFFF' );
     define( 'HEADER_IMAGE', '%s/_inc/images/default_header.jpg' ); // %s is theme dir uri
 …
     add_action( 'init', 'bp_dtheme_add_custom_header_support' );
+/* Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html) */
+/**
+ * Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html)
+ *
+ * @package BuddyPress Theme
+ * @since 1.2
+ */
 function bp_dtheme_show_notice() { ?>
     <div id="message" class="updated fade">
 …
     add_action( 'admin_notices', 'bp_dtheme_show_notice' );
-/* Add words that we need to use in JS to the end of the page so they can be translated and still used. */
-function bp_dtheme_js_terms() { ?>
-<script type="text/javascript">
-    var bp_terms_my_favs = '<?php _e( "My Favorites", "buddypress" ) ?>';
-    var bp_terms_accepted = '<?php _e( "Accepted", "buddypress" ) ?>';
-    var bp_terms_rejected = '<?php _e( "Rejected", "buddypress" ) ?>';
-    var bp_terms_show_all_comments = '<?php _e( "Show all comments for this thread", "buddypress" ) ?>';
-    var bp_terms_show_all = '<?php _e( "Show all", "buddypress" ) ?>';
-    var bp_terms_comments = '<?php _e( "comments", "buddypress" ) ?>';
-    var bp_terms_close = '<?php _e( "Close", "buddypress" ) ?>';
-    var bp_terms_mention_explain = '<?php printf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", "buddypress" ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname(bp_get_displayed_user_fullname()), bp_get_user_firstname(bp_get_displayed_user_fullname()) ); ?>';
-    </script>
-<?php
+}
-add_action( 'wp_footer', 'bp_dtheme_js_terms' );
 // Member Buttons
+add_action( 'bp_member_header_actions',    'bp_add_friend_button' );
+add_action( 'bp_member_header_actions',    'bp_send_public_message_button' );
+add_action( 'bp_member_header_actions',    'bp_send_private_message_button' );
+if ( bp_is_active( 'friends' ) )
+    add_action( 'bp_member_header_actions',    'bp_add_friend_button' );
+if ( bp_is_active( 'activity' ) )
+    add_action( 'bp_member_header_actions',    'bp_send_public_message_button' );
+if ( bp_is_active( 'messages' ) )
+    add_action( 'bp_member_header_actions',    'bp_send_private_message_button' );
 // Group Buttons
+add_action( 'bp_group_header_actions',     'bp_group_join_button' );
+add_action( 'bp_group_header_actions',     'bp_group_new_topic_button' );
+add_action( 'bp_directory_groups_actions', 'bp_group_join_button' );
+if ( bp_is_active( 'groups' ) ) {
+    add_action( 'bp_group_header_actions',     'bp_group_join_button' );
+    add_action( 'bp_group_header_actions',     'bp_group_new_topic_button' );
+    add_action( 'bp_directory_groups_actions', 'bp_group_join_button' );
+}
 // Blog Buttons
+add_action( 'bp_directory_blogs_actions',  'bp_blogs_visit_blog_button' );
+if ( bp_is_active( 'blogs' ) )
+    add_action( 'bp_directory_blogs_actions',  'bp_blogs_visit_blog_button' );
 ?>

trunk/bp-themes/bp-default/groups/create.php

r2770	r3300
53	53	</div>
54	54	<?php else : ?>
55		<?php if ( is_s~~ite~~_admin() ) : ?>
	55	<?php if ( is_super_admin() ) : ?>
56	56	<div class="checkbox">
57	57	<label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __('<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_get_root_domain() . '/wp-admin/admin.php?page=bb-forums-setup' ) ?></label>

trunk/bp-themes/bp-default/groups/groups-loop.php

-                      r3263
+                      r3300
 <?php if ( bp_has_groups( bp_ajax_querystring( 'groups' ) ) ) : ?>
     <div class="pagination">
+    <div id="pag-top" class="pagination">
         <div class="pag-count" id="group-dir-count">
+        <div class="pag-count" id="group-dir-count-top">
             <?php bp_groups_pagination_count() ?>
         </div>
         <div class="pagination-links" id="group-dir-pag">
+        <div class="pagination-links" id="group-dir-pag-top">
             <?php bp_groups_pagination_links() ?>
         </div>
     </div>
+    <?php do_action( 'bp_before_directory_groups_list' ) ?>
     <ul id="groups-list" class="item-list">
 …
     </ul>
+    <?php do_action( 'bp_after_groups_loop' ) ?>
+    <?php do_action( 'bp_after_directory_groups_list' ) ?>
+    <div id="pag-bottom" class="pagination">
+        <div class="pag-count" id="group-dir-count-bottom">
+            <?php bp_groups_pagination_count() ?>
+        </div>
+        <div class="pagination-links" id="group-dir-pag-bottom">
+            <?php bp_groups_pagination_links() ?>
+        </div>
+    </div>
 <?php else: ?>
 …
 <?php endif; ?>
+<?php do_action( 'bp_after_groups_loop' ) ?>

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

-                      r3232
+                      r3300
             <div class="item-list-tabs">
                 <ul>
                     <li class="selected" id="groups-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ) ?></a></li>
+                    <li class="selected" id="groups-all"><a href="<?php echo bp_get_root_domain() . '/' . BP_GROUPS_SLUG ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ) ?></a></li>
                     <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 …
             </div><!-- .item-list-tabs -->
-            <?php do_action( 'bp_before_directory_groups_list' ) ?>
             <div id="groups-dir-list" class="groups dir-list">
                 <?php locate_template( array( 'groups/groups-loop.php' ), true ) ?>

trunk/bp-themes/bp-default/groups/single/activity.php

-                      r2539
+                      r3300
 <div class="item-list-tabs no-ajax" id="subnav">
     <ul>
         <li class="feed"><a href="<?php bp_group_activity_feed_link() ?>" title="RSS Feed"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
+        <li class="feed"><a href="<?php bp_group_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
         <?php do_action( 'bp_group_activity_syndication_options' ) ?>
 …
 <div class="activity single-group">
     <?php locate_template( array( 'activity/activity-loop.php' ), true ) ?>
 </div><!-- .activity -->
+</div><!-- .activity.single-group -->
 <?php do_action( 'bp_after_group_activity_content' ) ?>

trunk/bp-themes/bp-default/groups/single/admin.php

-                      r3263
+                      r3300
                 <?php while ( bp_group_members() ) : bp_group_the_member(); ?>
+                    <?php if ( bp_get_group_member_is_banned() ) : ?>
+                        <li class="banned-user">
+                            <?php bp_group_member_avatar_mini() ?>
+                            <h5><?php bp_group_member_link() ?> <?php _e( '(banned)', 'buddypress') ?> <span class="small"> - <a href="<?php bp_group_member_unban_link() ?>" class="confirm" title="<?php _e( 'Kick and ban this member', 'buddypress' ) ?>"><?php _e( 'Remove Ban', 'buddypress' ); ?></a> </h5>
+                    <?php else : ?>
+                        <li>
+                            <?php bp_group_member_avatar_mini() ?>
+                            <h5><?php bp_group_member_link() ?>  <span class="small"> - <a href="<?php bp_group_member_ban_link() ?>" class="confirm" title="<?php _e( 'Kick and ban this member', 'buddypress' ); ?>"><?php _e( 'Kick &amp; Ban', 'buddypress' ); ?></a> | <a href="<?php bp_group_member_promote_mod_link() ?>" class="confirm" title="<?php _e( 'Promote to Mod', 'buddypress' ); ?>"><?php _e( 'Promote to Mod', 'buddypress' ); ?></a> | <a href="<?php bp_group_member_promote_admin_link() ?>" class="confirm" title="<?php _e( 'Promote to Admin', 'buddypress' ); ?>"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a></span></h5>
+                    <?php endif; ?>
+                            <?php do_action( 'bp_group_manage_members_admin_item' ); ?>
+                        </li>
+                    <li class="<?php bp_group_member_css_class(); ?>">
+                        <?php bp_group_member_avatar_mini() ?>
+                        <h5>
+                            <?php bp_group_member_link() ?>
+                            <?php if ( bp_get_group_member_is_banned() ) _e( '(banned)', 'buddypress'); ?>
+                            <span class="small"> -
+                            <?php if ( bp_get_group_member_is_banned() ) : ?>
+                                <a href="<?php bp_group_member_unban_link() ?>" class="confirm" title="<?php _e( 'Unban this member', 'buddypress' ) ?>"><?php _e( 'Remove Ban', 'buddypress' ); ?></a>
+                            <?php else : ?>
+                                <a href="<?php bp_group_member_ban_link() ?>" class="confirm" title="<?php _e( 'Kick and ban this member', 'buddypress' ); ?>"><?php _e( 'Kick &amp; Ban', 'buddypress' ); ?></a>
+                                | <a href="<?php bp_group_member_promote_mod_link() ?>" class="confirm" title="<?php _e( 'Promote to Mod', 'buddypress' ); ?>"><?php _e( 'Promote to Mod', 'buddypress' ); ?></a>
+                                | <a href="<?php bp_group_member_promote_admin_link() ?>" class="confirm" title="<?php _e( 'Promote to Admin', 'buddypress' ); ?>"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
+                            <?php endif; ?>
+                                | <a href="<?php bp_group_member_remove_link() ?>" class="confirm" title="<?php _e( 'Remove this member', 'buddypress' ); ?>"><?php _e( 'Remove from group', 'buddypress' ); ?></a>
+                                <?php do_action( 'bp_group_manage_members_admin_item' ); ?>
+                            </span>
+                        </h5>
+                    </li>
                 <?php endwhile; ?>
 …
 <?php /* This is important, don't forget it */ ?>
 <input type="hidden" name="group-id" id="group-id" value="<?php bp_group_id() ?>" />
+    <input type="hidden" name="group-id" id="group-id" value="<?php bp_group_id() ?>" />
 <?php do_action( 'bp_after_group_admin_content' ) ?>
 </form>
+</form><!-- #group-settings-form -->

trunk/bp-themes/bp-default/groups/single/forum.php

-                      r2488
+                      r3300
     <div class="forums single-forum">
         <?php locate_template( array( 'forums/forums-loop.php' ), true ) ?>
     </div><!-- .forums -->
+    </div><!-- .forums.single-forum -->
+    <?php do_action( 'bp_after_group_forum_content' ) ?>
+<?php endif; ?>
+<?php do_action( 'bp_after_group_forum_content' ) ?>
+<?php if ( !bp_is_group_forum_topic_edit() && !bp_is_group_forum_topic() ) : ?>
     <?php if ( ( is_user_logged_in() && 'public' == bp_get_group_status() ) || bp_group_is_member() ) : ?>
 …
                 <?php do_action( 'bp_before_group_forum_post_new' ) ?>
                 <?php if ( !bp_group_is_member() ) : ?>
+                <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?>
                     <p><?php _e( 'You will auto join this group when you start a new topic.', 'buddypress' ) ?></p>
                 <?php endif; ?>
 …
                 <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>
             </div><!-- #post-new-topic -->
         </form>
+        </form><!-- #forum-topic-form -->
     <?php endif; ?>

trunk/bp-themes/bp-default/groups/single/forum/edit.php

-                      r2714
+                      r3300
+<?php do_action( 'bp_before_group_forum_edit_form' ) ?>
 <?php if ( bp_has_forum_topic_posts() ) : ?>
 …
         <div id="topic-meta">
             <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
             <a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a></span>
+            <a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a>
             <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
 …
         <?php endif; ?>
     </form>
+    </form><!-- #forum-topic-form -->
 <?php else: ?>
 …
 <?php endif;?>
+<?php do_action( 'bp_after_group_forum_edit_form' ) ?>

trunk/bp-themes/bp-default/groups/single/forum/topic.php

-                      r2695
+                      r3300
+<?php do_action( 'bp_before_group_forum_topic' ) ?>
 <?php if ( bp_has_forum_topic_posts() ) : ?>
 …
         <div id="topic-meta">
             <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
             <a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a></span>
+            <a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a>
+            <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
+                <div class="admin-links"><?php bp_the_topic_admin_links() ?></div>
+            <?php endif; ?>
+            <div class="admin-links">
+                <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
+                    <?php bp_the_topic_admin_links() ?>
+                <?php endif; ?>
+                <?php do_action( 'bp_group_forum_topic_meta' ); ?>
+            </div>
         </div>
+        <?php do_action( 'bp_before_group_forum_topic_posts' ) ?>
         <ul id="topic-post-list" class="item-list">
             <?php while ( bp_forum_topic_posts() ) : bp_the_forum_topic_post(); ?>
                 <li id="post-<?php bp_the_topic_post_id() ?>">
+                <li id="post-<?php bp_the_topic_post_id() ?>" class="<?php bp_the_topic_post_css_class() ?>">
                     <div class="poster-meta">
                         <a href="<?php bp_the_topic_post_poster_link() ?>">
 …
                             <?php bp_the_topic_post_admin_links() ?>
                         <?php endif; ?>
+                        <?php do_action( 'bp_group_forum_post_meta' ); ?>
                         <a href="#post-<?php bp_the_topic_post_id() ?>" title="<?php _e( 'Permanent link to this post', 'buddypress' ) ?>">#</a>
                     </div>
 …
             <?php endwhile; ?>
+        </ul>
+        </ul><!-- #topic-post-list -->
+        <?php do_action( 'bp_after_group_forum_topic_posts' ) ?>
         <div class="pagination no-ajax">
 …
                         <p id="post-reply"></p>
                         <?php if ( !bp_group_is_member() ) : ?>
+                        <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?>
                             <p><?php _e( 'You will auto join this group when you reply to this topic.', 'buddypress' ) ?></p>
                         <?php endif; ?>
 …
         <?php endif; ?>
     </form>
+    </form><!-- #forum-topic-form -->
 <?php else: ?>
 …
 <?php endif;?>
+<?php do_action( 'bp_after_group_forum_topic' ) ?>

trunk/bp-themes/bp-default/groups/single/group-header.php

-                      r2626
+                      r3300
         <?php bp_group_description() ?>
+        <?php bp_group_join_button() ?>
+        <div id="item-buttons">
+            <?php do_action( 'bp_group_header_actions' ); ?>
+        </div><!-- #item-buttons -->
         <?php do_action( 'bp_group_header_meta' ) ?>

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

-                      r2740
+                      r3300
             <div id="item-header">
                 <?php locate_template( array( 'groups/single/group-header.php' ), true ) ?>
             </div>
+            </div><!-- #item-header -->
             <div id="item-nav">
 …
                     </ul>
                 </div>
             </div>
+            </div><!-- #item-nav -->
             <div id="item-body">
 …
                 <?php do_action( 'bp_after_group_body' ) ?>
             </div>
+            </div><!-- #item-body -->
             <?php do_action( 'bp_after_group_home_content' ) ?>

trunk/bp-themes/bp-default/groups/single/plugins.php

-                      r2822
+                      r3300
             <div id="item-header">
                 <?php locate_template( array( 'groups/single/group-header.php' ), true ) ?>
             </div>
+            </div><!-- #item-header -->
             <div id="item-nav">
 …
                     </ul>
                 </div>
             </div>
+            </div><!-- #item-nav -->
             <div id="item-body">
+                <?php do_action( 'bp_before_group_body' ) ?>
                 <?php do_action( 'bp_template_content' ) ?>
+                <?php do_action( 'bp_after_group_body' ) ?>
             </div><!-- #item-body -->

trunk/bp-themes/bp-default/groups/single/request-membership.php

-                      r2278
+                      r3300
 <?php if ( !bp_group_has_requested_membership() ) : ?>
     <p><?php printf( __( "You are requesting to become a member of the group '%s'.", "buddypress" ), bp_group_name( false, false ) ); ?></p>
+    <p><?php printf( __( "You are requesting to become a member of the group '%s'.", "buddypress" ), bp_get_group_name( false ) ); ?></p>
     <form action="<?php bp_group_form_action('request-membership') ?>" method="post" name="request-membership-form" id="request-membership-form" class="standard-form">
 …
         <?php wp_nonce_field( 'groups_request_membership' ) ?>
     </form>
+    </form><!-- #request-membership-form -->
 <?php endif; ?>

trunk/bp-themes/bp-default/groups/single/send-invites.php

-                      r2339
+                      r3300
             </div>
         </div>
+        </div><!-- .left-menu -->
         <div class="main-column">
 …
             <?php endif; ?>
             </ul>
+            </ul><!-- #friend-list -->
             <?php do_action( 'bp_after_group_send_invites_list' ) ?>
         </div>
+        </div><!-- .main-column -->
         <div class="clear"></div>
 …
         <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites') ?>
         <!-- Don't leave out this hidden field -->
+        <?php /* This is important, don't forget it */ ?>
         <input type="hidden" name="group_id" id="group_id" value="<?php bp_group_id() ?>" />
+    </form>
+    </form><!-- #send-invite-form -->
 <?php else : ?>

trunk/bp-themes/bp-default/header.php

-                      r2863
+                      r3300
                 <div class="padder">
+                <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
+                    <input type="text" id="search-terms" name="search-terms" value="" />
+                    <?php echo bp_search_form_type_select() ?>
+                <?php if ( bp_search_form_enabled() ) : ?>
+                    <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+                    <?php wp_nonce_field( 'bp_search_form' ) ?>
+                </form><!-- #search-form -->
+                    <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
+                        <input type="text" id="search-terms" name="search-terms" value="" />
+                        <?php echo bp_search_form_type_select() ?>
+                        <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+                        <?php wp_nonce_field( 'bp_search_form' ) ?>
+                    </form><!-- #search-form -->
+                <?php endif; ?>
                 <?php do_action( 'bp_search_login_bar' ) ?>

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

r2694	r3300
24	24	<h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
25	25
26		<p class="date"><?php the_time(~~'F j, Y'~~) ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
	26	<p class="date"><?php the_time() ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
27	27
28	28	<div class="entry">

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

r2908	r3300
41	41	</div><!-- .item-list-tabs -->
42	42
43		~~<?php do_action( 'bp_before_directory_members_list' ) ?>~~
44
45	43	<div id="members-dir-list" class="members dir-list">
46	44	<?php locate_template( array( 'members/members-loop.php' ), true ) ?>

trunk/bp-themes/bp-default/members/members-loop.php

-                      r3263
+                      r3300
 <?php if ( bp_has_members( bp_ajax_querystring( 'members' ) ) ) : ?>
     <div class="pagination">
+    <div id="pag-top" class="pagination">
         <div class="pag-count" id="member-dir-count">
+        <div class="pag-count" id="member-dir-count-top">
             <?php bp_members_pagination_count() ?>
         </div>
         <div class="pagination-links" id="member-dir-pag">
+        <div class="pagination-links" id="member-dir-pag-top">
             <?php bp_members_pagination_links() ?>
         </div>
 …
     <?php bp_member_hidden_fields() ?>
+    <div id="pag-bottom" class="pagination">
+        <div class="pag-count" id="member-dir-count-bottom">
+            <?php bp_members_pagination_count() ?>
+        </div>
+        <div class="pagination-links" id="member-dir-pag-bottom">
+            <?php bp_members_pagination_links() ?>
+        </div>
+    </div>
 <?php else: ?>

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

r2586	r3300
20	20	<div class="blogs myblogs">
21	21	<?php locate_template( array( 'blogs/blogs-loop.php' ), true ) ?>
22		</div><!-- .blogs -->
	22	</div><!-- .blogs.myblogs -->
23	23
24	24	<?php do_action( 'bp_after_member_blogs_content' ) ?>

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

r2488	r3300
28	28	<div class="members friends">
29	29	<?php locate_template( array( 'members/members-loop.php' ), true ) ?>
30		</div>
	30	</div><!-- .members.friends -->
31	31
32	32	<?php do_action( 'bp_after_member_friends_content' ) ?>

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

-                      r2586
+                      r3300
             <?php _e( 'Order By:', 'buddypress' ) ?>
             <select id="groups-all">
+            <select id="groups-sort-by">
                 <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
                 <option value="popular"><?php _e( 'Most Members', 'buddypress' ) ?></option>
 …
         <?php endif; ?>
     </ul>
 </div>
+</div><!-- .item-list-tabs -->
 <?php if ( 'invites' == bp_current_action() ) : ?>

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

-                      r3232
+                      r3300
                         <?php bp_get_displayed_user_nav() ?>
                         <?php do_action( 'bp_members_directory_member_types' ) ?>
+                        <?php do_action( 'bp_member_options_nav' ) ?>
                     </ul>
                 </div>
 …
                     <?php locate_template( array( 'members/single/profile.php' ), true ) ?>
+                <?php else : ?>
+                    <?php
+                        /* If nothing sticks, just load a member front template if one exists. */
+                        locate_template( array( 'members/single/front.php' ), true );
+                    ?>
                 <?php endif; ?>

trunk/bp-themes/bp-default/members/single/member-header.php

r3263	r3300
9	9	<div id="item-header-content">
10	10
11		<h2 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="highlight">@<?php bp_displayed_user_username() ?> <span>?</span></span></h2>
	11	<h2 class="fn"><a href="<?php bp_displayed_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="highlight">@<?php bp_displayed_user_username() ?> <span>?</span></span></h2>
12	12	<span class="activity"><?php bp_last_activity( bp_displayed_user_id() ) ?></span>
13	13

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

-                      r2397
+                      r3300
         <?php bp_get_options_nav() ?>
     </ul>
 </div>
+</div><!-- .item-list-tabs -->
 <?php if ( 'compose' == bp_current_action() ) : ?>
 …
         <?php endif; ?>
     </div>
+    </div><!-- .messages -->
     <?php do_action( 'bp_after_member_messages_content' ) ?>

trunk/bp-themes/bp-default/members/single/messages/compose.php

r2191	r3300
11	11	</ul>
12	12
13		<?php if ( is_s~~ite~~_admin() ) : ?>
	13	<?php if ( is_super_admin() ) : ?>
14	14	<input type="checkbox" id="send-notice" name="send-notice" value="1" /> <?php _e( "This is a notice to all users.", "buddypress" ) ?>
15	15	<?php endif; ?>

trunk/bp-themes/bp-default/members/single/messages/messages-loop.php

r2502	r3300
18	18	<?php do_action( 'bp_before_member_messages_threads' ) ?>
19	19
20		<table id="message-threads">
	20	<table id="message-threads" class="zebra">
21	21	<?php while ( bp_message_threads() ) : bp_message_thread(); ?>
22	22

trunk/bp-themes/bp-default/members/single/messages/notices-loop.php

r2397	r3300
18	18	<?php do_action( 'bp_before_notices' ) ?>
19	19
20		<table id="message-threads">
	20	<table id="message-threads" class="zebra">
21	21	<?php while ( bp_message_threads() ) : bp_message_thread(); ?>
22	22	<tr>

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

-                      r2822
+                      r3300
             <div id="item-header">
                 <?php locate_template( array( 'members/single/member-header.php' ), true ) ?>
             </div>
+            </div><!-- #item-header -->
             <div id="item-nav">
 …
                     <ul>
                         <?php bp_get_displayed_user_nav() ?>
+                        <?php do_action( 'bp_member_options_nav' ) ?>
                     </ul>
                 </div>
             </div>
+            </div><!-- #item-nav -->
             <div id="item-body">
+                <?php do_action( 'bp_before_member_body' ) ?>
                 <div class="item-list-tabs no-ajax" id="subnav">
 …
                         <?php do_action( 'bp_member_plugin_options_nav' ) ?>
                     </ul>
+                </div>
+                </div><!-- .item-list-tabs -->
+                <?php do_action( 'bp_template_title' ) ?>
                 <?php do_action( 'bp_template_content' ) ?>
+                <?php do_action( 'bp_after_member_body' ) ?>
             </div><!-- #item-body -->
 …
     <?php locate_template( array( 'sidebar.php' ), true ) ?>
-    <?php do_action( 'bp_after_member_plugin_template' ) ?>
 <?php get_footer() ?>

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

r2287	r3300
4	4	<?php bp_get_options_nav() ?>
5	5	</ul>
6		</div>
	6	</div><!-- .item-list-tabs -->
7	7	<?php endif; ?>
8	8

trunk/bp-themes/bp-default/members/single/profile/edit.php

-                      r3232
+                      r3300
                         <?php bp_the_profile_field_options() ?>
                     </select>
+                    <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
+                        <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
+                    <?php endif; ?>
                 <?php endif; ?>

trunk/bp-themes/bp-default/members/single/profile/profile-loop.php

-                      r2585
+                      r3300
                     <?php endif; ?>
                     <table class="profile-fields">
+                    <table class="profile-fields zebra">
                         <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
                             <?php if ( bp_field_has_data() ) : ?>
                                 <tr>
+                                <tr<?php bp_field_css_class() ?>>
                                     <td class="label">

trunk/bp-themes/bp-default/registration/register.php

-                      r2784
+                      r3300
                 <?php do_action( 'bp_after_account_details_fields' ) ?>
-                <?php do_action( 'bp_before_blog_details_fields' ) ?>
                 <?php /***** Extra Profile Details ******/ ?>
                 <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+                <div class="register-section" id="profile-details-section">
+                    <h4><?php _e( 'Profile Details', 'buddypress' ) ?></h4>
+                    <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
+                    <?php if ( function_exists( 'bp_has_profile' ) ) : if ( bp_has_profile( 'profile_group_id=1' ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
+                    <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
+                        <div class="editfield">
+                            <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
+                                <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+                                <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                <input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="<?php bp_the_profile_field_edit_value() ?>" />
+                            <?php endif; ?>
+                            <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
+                                <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+                                <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_edit_value() ?></textarea>
+                            <?php endif; ?>
+                            <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
+                                <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+                                <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>">
+                                    <?php bp_the_profile_field_options() ?>
+                                </select>
+                            <?php endif; ?>
+                            <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
+                                <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+                                <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" multiple="multiple">
+                                    <?php bp_the_profile_field_options() ?>
+                                </select>
+                            <?php endif; ?>
+                            <?php if ( 'radio' == bp_get_the_profile_field_type() ) : ?>
+                                <div class="radio">
+                                    <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
+                    <?php do_action( 'bp_before_signup_profile_fields' ) ?>
+                    <div class="register-section" id="profile-details-section">
+                        <h4><?php _e( 'Profile Details', 'buddypress' ) ?></h4>
+                        <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
+                        <?php if ( function_exists( 'bp_has_profile' ) ) : if ( bp_has_profile( 'profile_group_id=1' ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
+                        <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
+                            <div class="editfield">
+                                <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
+                                    <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                                     <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                    <?php bp_the_profile_field_options() ?>
+                                    <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
+                                        <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
+                                    <?php endif; ?>
+                                </div>
+                            <?php endif; ?>
+                            <?php if ( 'checkbox' == bp_get_the_profile_field_type() ) : ?>
+                                <div class="checkbox">
+                                    <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
+                                    <input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="<?php bp_the_profile_field_edit_value() ?>" />
+                                <?php endif; ?>
+                                <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
+                                    <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                                     <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                    <?php bp_the_profile_field_options() ?>
+                                </div>
+                            <?php endif; ?>
+                            <?php if ( 'datebox' == bp_get_the_profile_field_type() ) : ?>
+                                <div class="datebox">
+                                    <label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+                                    <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_edit_value() ?></textarea>
+                                <?php endif; ?>
+                                <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
+                                    <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                                     <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                    <select name="<?php bp_the_profile_field_input_name() ?>_day" id="<?php bp_the_profile_field_input_name() ?>_day">
+                                        <?php bp_the_profile_field_options( 'type=day' ) ?>
+                                    <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>">
+                                        <?php bp_the_profile_field_options() ?>
                                     </select>
+                                    <select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name() ?>_month">
+                                        <?php bp_the_profile_field_options( 'type=month' ) ?>
+                                <?php endif; ?>
+                                <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
+                                    <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+                                    <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                    <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" multiple="multiple">
+                                        <?php bp_the_profile_field_options() ?>
                                     </select>
+                                    <select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name() ?>_year">
+                                        <?php bp_the_profile_field_options( 'type=year' ) ?>
+                                    </select>
+                                </div>
+                            <?php endif; ?>
+                            <?php do_action( 'bp_custom_profile_edit_fields' ) ?>
+                            <p class="description"><?php bp_the_profile_field_description() ?></p>
+                        </div>
+                    <?php endwhile; ?>
+                    <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
+                    <?php endwhile; endif; endif; ?>
+                </div><!-- #profile-details-section -->
+                                <?php endif; ?>
+                                <?php if ( 'radio' == bp_get_the_profile_field_type() ) : ?>
+                                    <div class="radio">
+                                        <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
+                                        <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                        <?php bp_the_profile_field_options() ?>
+                                        <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
+                                            <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
+                                        <?php endif; ?>
+                                    </div>
+                                <?php endif; ?>
+                                <?php if ( 'checkbox' == bp_get_the_profile_field_type() ) : ?>
+                                    <div class="checkbox">
+                                        <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
+                                        <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                        <?php bp_the_profile_field_options() ?>
+                                    </div>
+                                <?php endif; ?>
+                                <?php if ( 'datebox' == bp_get_the_profile_field_type() ) : ?>
+                                    <div class="datebox">
+                                        <label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
+                                        <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
+                                        <select name="<?php bp_the_profile_field_input_name() ?>_day" id="<?php bp_the_profile_field_input_name() ?>_day">
+                                            <?php bp_the_profile_field_options( 'type=day' ) ?>
+                                        </select>
+                                        <select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name() ?>_month">
+                                            <?php bp_the_profile_field_options( 'type=month' ) ?>
+                                        </select>
+                                        <select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name() ?>_year">
+                                            <?php bp_the_profile_field_options( 'type=year' ) ?>
+                                        </select>
+                                    </div>
+                                <?php endif; ?>
+                                <?php do_action( 'bp_custom_profile_edit_fields' ) ?>
+                                <p class="description"><?php bp_the_profile_field_description() ?></p>
+                            </div>
+                        <?php endwhile; ?>
+                        <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
+                        <?php endwhile; endif; endif; ?>
+                    </div><!-- #profile-details-section -->
+                    <?php do_action( 'bp_after_signup_profile_fields' ) ?>
                 <?php endif; ?>
+                <?php do_action( 'bp_after_signup_profile_fields' ) ?>
                 <?php if ( bp_get_blog_signup_allowed() ) : ?>
 …
                             <?php do_action( 'bp_signup_blog_url_errors' ) ?>
                             <?php if ( 'yes' == VHOST ) : ?>
+                            <?php if ( is_subdomain_install() ) : ?>
                                 http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" /> .<?php echo str_replace( 'http://', '', site_url() ) ?>
                             <?php else : ?>
 …
                 <div class="submit">
                     <input type="submit"name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ) ?> &rarr;" />
+                    <input type="submit" name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ) ?> &rarr;" />
                 </div>

trunk/bp-themes/bp-default/search.php

r2425	r3300
33	33	<h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
34	34
35		<p class="date"><?php the_time(~~'F j, Y'~~) ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
	35	<p class="date"><?php the_time() ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
36	36
37	37	<div class="entry">

trunk/bp-themes/bp-default/sidebar.php

-                      r3232
+                      r3300
             </a>
             <h4><?php bp_loggedinuser_link() ?></h4>
+            <h4><?php echo bp_core_get_userlink( bp_loggedin_user_id() ); ?></h4>
             <a class="button logout" href="<?php echo wp_logout_url( bp_get_root_domain() ) ?>"><?php _e( 'Log Out', 'buddypress' ) ?></a>
 …
         </p>
         <form name="login-form" id="sidebar-login-form" class="standard-form" action="<?php echo site_url( 'wp-login.php', 'login' ) ?>" method="post">
+        <form name="login-form" id="sidebar-login-form" class="standard-form" action="<?php echo site_url( 'wp-login.php', 'login_post' ) ?>" method="post">
             <label><?php _e( 'Username', 'buddypress' ) ?><br />
             <input type="text" name="log" id="sidebar-user-login" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" /></label>
+            <input type="text" name="log" id="sidebar-user-login" class="input" value="<?php echo esc_attr(stripslashes($user_login)); ?>" /></label>
             <label><?php _e( 'Password', 'buddypress' ) ?><br />

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

r2694	r3300
27	27	<h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
28	28
29		<p class="date"><?php the_time(~~'F j, Y') ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em~~></p>
	29	<p class="date"><?php the_time() ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em> <?php edit_post_link( __( 'Edit this entry', 'buddypress' ), '<em class="edit-link">', '</em>' ); ?></p>
30	30
31	31	<div class="entry">

trunk/bp-xprofile.php

-                      r3232
+                      r3300
  * @uses site_url() Returns the site URL
  */
 function xprofile_setup_globals() {
     global $bp, $wpdb;
 …
     $bp->profile->id = 'profile';
+    $bp->profile->table_name_groups = $wpdb->base_prefix . 'bp_xprofile_groups';
+    $bp->profile->table_name_fields = $wpdb->base_prefix . 'bp_xprofile_fields';
+    $bp->profile->table_name_data = $wpdb->base_prefix . 'bp_xprofile_data';
+    $bp->profile->slug = BP_XPROFILE_SLUG;
+    $bp->profile->table_name_data   = $bp->table_prefix . 'bp_xprofile_data';
+    $bp->profile->table_name_groups = $bp->table_prefix . 'bp_xprofile_groups';
+    $bp->profile->table_name_fields = $bp->table_prefix . 'bp_xprofile_fields';
     $bp->profile->format_notification_function = 'xprofile_format_notifications';
-    $bp->profile->slug = BP_XPROFILE_SLUG;
     /* Register this in the active components array */
 …
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
  * @global $wpdb WordPress DB access object.
  * @uses is_site_admin() returns true if the current user is a site admin, false if not
+ * @uses is_super_admin() returns true if the current user is a site admin, false if not
  * @uses bp_xprofile_install() runs the installation of DB tables for the xprofile component
  * @uses wp_enqueue_script() Adds a JS file to the JS queue ready for output
 …
     global $wpdb, $bp;
     if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
 …
     /* Don't show this menu to non site admins or if you're viewing your own profile */
     if ( !is_site_admin() || bp_is_my_profile() )
         return false; ?>
+    if ( !is_super_admin() || bp_is_my_profile() )
+        return false;
+    ?>
     <li id="bp-adminbar-adminoptions-menu">
         <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
         <ul>
             <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
             <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
+<?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
             <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
 <?php else : ?>
             <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
 <?php endif; ?>
             <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
+<?php do_action( 'xprofile_adminbar_menu_items' ) ?>
+            <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+            <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+            <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
+                <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
+            <?php else : ?>
+                <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
+            <?php endif; ?>
+            <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+            <?php do_action( 'xprofile_adminbar_menu_items' ) ?>
         </ul>
     </li>
 <?php
+    <?php
+}
 add_action( 'bp_adminbar_menus', 'xprofile_setup_adminbar_menu', 20 );
 …
     global $bp;
     if ( !bp_is_my_profile() && !is_site_admin() )
+    if ( !bp_is_my_profile() && !is_super_admin() )
         return false;
 …
+        }
         if ( $errors )
+        if ( !empty( $errors ) )
             bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );
         else {
 …
+            }
             do_action( 'xprofile_updated_profile', $posted_field_ids, $errors );
+            do_action( 'xprofile_updated_profile', $bp->displayed_user->id, $posted_field_ids, $errors );
             /* Set the feedback messages */
 …
     global $bp;
     if ( !bp_is_my_profile() && !is_site_admin() )
+    if ( !bp_is_my_profile() && !is_super_admin() )
         return false;
 …
     check_admin_referer( 'bp_delete_avatar_link' );
     if ( !bp_is_my_profile() && !is_site_admin() )
+    if ( !bp_is_my_profile() && !is_super_admin() )
         return false;
 …
         'item_id' => false,
         'secondary_item_id' => false,
         'recorded_time' => gmdate( "Y-m-d H:i:s" ),
+        'recorded_time' => bp_core_current_time(),
         'hide_sitewide' => false
     );
 …
         return false;
+    /* If the value is empty, then delete any field data that exists */
+    if ( empty( $value ) ) {
+        xprofile_delete_field_data( $field_id, $user_id );
+        return true;
+    }
     $field = new BP_XProfile_Field( $field_id );
     /* Check that value is acceptable */
+    /* Check the value is an acceptable value */
     if ( 'checkbox' == $field->type || 'radio' == $field->type || 'selectbox' == $field->type || 'multiselectbox' == $field->type ) {
         $options = $field->get_children();
-        /* Not required fields can have empty value */
-        if ( !$is_required )
-            $possible_values[] = '';
         foreach( $options as $option )
 …
+            }
+            /* Field must be required to trigger error */
+            if ( $is_required && empty( $value ) )
+            if ( empty( $value ) )
                 return false;
 …
         $field_id = xprofile_get_field_id_from_name( $field );
     if ( !$field_id )
         return false;
     $field = new BP_XProfile_ProfileData( $field_id );
+    if ( empty( $field_id ) || empty( $user_id ) )
+        return false;
+    $field = new BP_XProfile_ProfileData( $field_id, $user_id );
     return $field->delete();
+}
 …
         @wp_mkdir_p( $path );
     $newurl = str_replace( BP_AVATAR_UPLOAD_PATH, BP_AVATAR_URL, $path );
+    $newurl  = BP_AVATAR_URL . '/avatars/' . $user_id;
     $newburl = $newurl;
     $newsubdir = '/avatars/' . $user_id;
 …
+    }
     update_usermeta( $user_id, 'nickname', $fullname );
     update_usermeta( $user_id, 'first_name', $firstname );
     update_usermeta( $user_id, 'last_name', $lastname );
+    update_user_meta( $user_id, 'nickname', $fullname );
+    update_user_meta( $user_id, 'first_name', $firstname );
+    update_user_meta( $user_id, 'last_name', $lastname );
     $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $user_id ) );
 …
 add_action( 'xprofile_updated_profile', 'xprofile_sync_wp_profile' );
 add_action( 'bp_core_signup_user', 'xprofile_sync_wp_profile' );
+/* xprofile_sync_bp_profile()
+ *
+ * Syncs the standard built in WordPress profile data to XProfile.
+ *
+ * @since 1.2.4
+ * @package BuddyPress Core
+ */
+function xprofile_sync_bp_profile( &$errors, $update, &$user ) {
+    global $bp;
+    if ( (int)$bp->site_options['bp-disable-profile-sync'] || !$update || $errors->get_error_codes() )
+        return;
+    xprofile_set_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user->ID, $user->display_name );
+}
+add_action( 'user_profile_update_errors', 'xprofile_sync_bp_profile', 10, 3 );
 /**
 …
  * @package BuddyPress XProfile
  * @param $user_id The ID of the deleted user
  * @uses get_usermeta() Get a user meta value based on meta key from wp_usermeta
  * @uses delete_usermeta() Delete user meta value based on meta key from wp_usermeta
+ * @uses get_user_meta() Get a user meta value based on meta key from wp_usermeta
+ * @uses delete_user_meta() Delete user meta value based on meta key from wp_usermeta
  * @uses delete_data_for_user() Removes all profile data from the xprofile tables for the user
  */
 …
+}
 /* List actions to clear object caches on */
+// List actions to clear object caches on
 add_action( 'xprofile_groups_deleted_group', 'xprofile_clear_profile_groups_object_cache' );
 add_action( 'xprofile_groups_saved_group', 'xprofile_clear_profile_groups_object_cache' );
 add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache' );
 /* List actions to clear super cached pages on, if super cache is installed */
+// List actions to clear super cached pages on, if super cache is installed
 add_action( 'xprofile_updated_profile', 'bp_core_clear_cache' );

trunk/bp-xprofile/admin/css/admin.css

-                      r3232
+                      r3300
+    }
     select.multi-select{
+    select.multi-select {
         width:90%;
         height:10em !important;
 …
+}
 ul.multi-checkbox li{
+ul.multi-checkbox li {
     padding: 0;
     margin: 0;

trunk/bp-xprofile/admin/js/admin.js

-                      r2887
+                      r3300
     toDeleteText = document.createTextNode('[x]');
     toDelete.setAttribute('href',"javascript:hide('" + forWhat + '_div' + theId + "')");
     toDelete.setAttribute('class','delete');
     toDelete.appendChild(toDeleteText);
 …
     holder.appendChild(newDiv);
     theId++
     document.getElementById(forWhat + "_option_number").value = theId;
 …
 function hide(id) {
     if ( !document.getElementById(id) ) return;
+    if ( !document.getElementById(id) ) return false;
     document.getElementById(id).style.display = "none";
 …
+}
 /* Set up deleting options ajax */
+// Set up deleting options ajax
 jQuery(document).ready( function() {
     jQuery("a.ajax-option-delete").click(
         function() {
 …
                 'cookie': encodeURIComponent(document.cookie),
                 '_wpnonce': jQuery("input#_wpnonce").val(),
                 'option_id': theId
             },
+            function(response){});
+            function(response)
+            {});
+        }
     );
+    );
 });
+/* Main XProfile behavior layer */
+var fixHelper = function(e, ui) {
+    ui.children().each(function() {
+        jQuery(this).width( jQuery(this).width() );
+    });
+    return ui;
+};
+// Main XProfile behavior layer
 jQuery(document).ready( function() {
     /* Show object if JS is enabled */
 …
                 'field_group_id': jQuery(this).attr( 'id' )
             },
+            function(response){});
+            function(response)
+            {});
+        }
     })

trunk/bp-xprofile/bp-xprofile-admin.php

r3232	r3300
59	59
60	60	<div id="message" class="<?php echo $type; ?> fade">
61		<p><?php echo wp_specialchars( ~~attribute_escape~~( $message ) ); ?></p>
	61	<p><?php echo wp_specialchars( esc_attr( $message ) ); ?></p>
62	62	</div>
63	63	<?php endif; ?>

trunk/bp-xprofile/bp-xprofile-classes.php

-                      r3232
+                      r3300
 <?php endif; ?>
             <div id="poststuff">
                 <form action="<?php echo attribute_escape( $action ); ?>" method="post">
+                <form action="<?php echo esc_attr( $action ); ?>" method="post">
                     <div id="titlediv">
                         <h3><label for="group_name"><?php _e( "Field Group Title", 'buddypress') ?> *</label></h3>
                         <div id="titlewrap">
                             <input type="text" name="group_name" id="title" value="<?php echo attribute_escape( $this->name ); ?>" style="width:50%" />
+                            <input type="text" name="group_name" id="title" value="<?php echo esc_attr( $this->name ); ?>" style="width:50%" />
                         </div>
                     </div>
 …
                     <p class="submit">
                         <input type="hidden" name="group_order" id="group_order" value="<?php echo attribute_escape( $this->group_order ); ?>" />
                         <input type="submit" name="save_group" value="<?php echo attribute_escape( $button ); ?>" class="button-primary"/>
+                        <input type="hidden" name="group_order" id="group_order" value="<?php echo esc_attr( $this->group_order ); ?>" />
+                        <input type="submit" name="save_group" value="<?php echo esc_attr( $button ); ?>" class="button-primary"/>
                         <?php _e( 'or', 'buddypress' ); ?> <a href="admin.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
                     </p>
 …
             $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d WHERE id = %d", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->id );
         else
             $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order ) VALUES (%d, 0, %s, %s, %s, %d, %s, %d )", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order );
+            $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order ) VALUES (%d, %d, %s, %s, %s, %d, %s, %d )", $this->group_id, $this->parent_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order );
         /*
 …
 ?>
                         <p><?php _e('Option', 'buddypress'); ?> <?php echo $j; ?>:
                            <input type="text" name="<?php echo $type; ?>_option[<?php echo $j; ?>]" id="<?php echo $type; ?>_option<?php echo $j; ?>" value="<?php echo attribute_escape( $options[$i]->name ); ?>" />
+                           <input type="text" name="<?php echo $type; ?>_option[<?php echo $j; ?>]" id="<?php echo $type; ?>_option<?php echo $j; ?>" value="<?php echo esc_attr( $options[$i]->name ); ?>" />
                            <input type="<?php echo $default_input; ?>" name="isDefault_<?php echo $type; ?>_option<?php echo $default_name; ?>" <?php if ( (int) $options[$i]->is_default_option ) {?> checked="checked"<?php } ?> " value="<?php echo $j; ?>" /> <?php _e( 'Default Value', 'buddypress' ); ?>
 <?php
 …
                     <h3><label for="title"><?php _e( 'Field Title', 'buddypress' ); ?> *</label></h3>
                     <div id="titlewrap">
                         <input type="text" name="title" id="title" value="<?php echo attribute_escape( $this->name ); ?>" style="width:50%" />
+                        <input type="text" name="title" id="title" value="<?php echo esc_attr( $this->name ); ?>" style="width:50%" />
                     </div>
                 </div>
 …
 <?php   } ?>
                 <p class="submit">
                     <input type="hidden" name="field_order" id="field_order" value="<?php echo attribute_escape( $this->field_order ); ?>" />
+                    <input type="hidden" name="field_order" id="field_order" value="<?php echo esc_attr( $this->field_order ); ?>" />
                     <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" name="saveField" id="saveField" style="font-weight: bold" class="button-primary" />
                     <?php _e( 'or', 'buddypress' ); ?> <a href="admin.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>

trunk/bp-xprofile/bp-xprofile-filters.php

r3254	r3300
129	129	if ( $fullnames = BP_XProfile_ProfileData::get_value_byid( 1, $user_ids ) ) {
130	130	foreach( (array)$fullnames as $user ) {
131		$users[$user->user_id] = trim( ~~$user->value~~ );
	131	$users[$user->user_id] = trim($user->value);
132	132	}
133	133	}

trunk/bp-xprofile/bp-xprofile-templatetags.php

-                      r3232
+                      r3300
     function bp_xprofile_data_template( $user_id, $profile_group_id ) {
         $this->groups = BP_XProfile_Group::get( array(
             'profile_group_id'  => $profile_group_id,
             'user_id'           => $user_id,
             'hide_empty_groups' => true,
             'fetch_fields'      => true,
             'fetch_field_data'  => true
+            'profile_group_id' => $profile_group_id,
+            'user_id' => $user_id,
+            'hide_empty_groups' => true,
+            'fetch_fields' => true,
+            'fetch_field_data' => true
         ) );
         $this->group_count = count( $this->groups );
+        $this->group_count = count($this->groups);
         $this->user_id = $user_id;
+    }
 …
     function rewind_groups() {
         $this->current_group = -1;
+        if ( $this->group_count > 0 )
+        if ( $this->group_count > 0 ) {
             $this->group = $this->groups[0];
+        }
+    }
 …
             return true;
         } elseif ( $this->current_group + 1 == $this->group_count ) {
             do_action( 'xprofile_template_loop_end' );
             /* Do some cleaning up after the loop */
+            do_action('xprofile_template_loop_end');
+            // Do some cleaning up after the loop
             $this->rewind_groups();
+        }
 …
         $group = $this->next_group();
         if ( 0 == $this->current_group ) /* loop has just started */
             do_action( 'xprofile_template_loop_start' );
+        if ( 0 == $this->current_group ) // loop has just started
+            do_action('xprofile_template_loop_start');
+    }
 …
     function rewind_fields() {
         $this->current_field = -1;
+        if ( $this->field_count > 0 )
+        if ( $this->field_count > 0 ) {
             $this->field = $this->group->fields[0];
+        }
+    }
 …
             $field = &$this->group->fields[$i];
             if ( $field->data->value != null )
+            if ( $field->data->value != null ) {
                 $has_data = true;
+            }
+        }
 …
     function profile_fields() {
         if ( $this->current_field + 1 < $this->field_count )
+        if ( $this->current_field + 1 < $this->field_count ) {
             return true;
+        /* Do some cleaning up after the loop */
+        elseif ( $this->current_field + 1 == $this->field_count )
+        } elseif ( $this->current_field + 1 == $this->field_count ) {
+            // Do some cleaning up after the loop
             $this->rewind_fields();
+        }
         return false;
 …
         $field = $this->next_field();
         if ( !empty( $field->data->value ) )
+        if ( !empty( $field->data->value ) ) {
             $this->field_has_data = true;
+        else
+        }
+        else {
             $this->field_has_data = false;
+        }
+    }
+}
 …
         if ( $class )
             $css_classes[] = sanitize_title( attribute_escape( $class ) );
+            $css_classes[] = sanitize_title( esc_attr( $class ) );
         /* Set a class with the field ID */
 …
         $css_classes[] = 'field_' . sanitize_title( $profile_template->field->name );
         if ( $profile_template->current_field % 2 )
+        if ( $profile_template->current_field % 2 == 1 )
             $css_classes[] = 'alt';
 …
         global $group;
         foreach ( (array) $group->fields as $field ) {
+        foreach ( (array) $group->fields as $field )
             $field_ids .= $field->id . ',';
+        }
         return substr( $field_ids, 0, -1 );
 …
         global $field;
+        return apply_filters( 'bp_get_the_profile_field_input_name', 'field_' . $field->id );
+        $array_box = false;
+        if ( 'multiselectbox' == $field->type )
+            $array_box = '[]';
+        return apply_filters( 'bp_get_the_profile_field_input_name', 'field_' . $field->id . $array_box );
+    }
 …
                 if ( 'multiselectbox' != $field->type )
                     $html .= '<option value="">--------</option>';
+                for ( $k = 0; $k < count($options); $k++ ) {
+                    $option_values = BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id );
+                    $option_values = (array)$option_values;
+                    /* Check for updated posted values, but errors preventing them from being saved first time */
+                    foreach( (array)$option_values as $i => $option_value ) {
+                        if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id] != $option_value ) {
+                            if ( !empty( $_POST['field_' . $field->id] ) )
+                                $option_values[$i] = $_POST['field_' . $field->id];
+                        }
+                    }
+                    if ( in_array( $options[$k]->name, (array)$option_values ) || $options[$k]->is_default_option ) {
+                        $selected = ' selected="selected"';
+                    } else {
+                        $selected = '';
+                    }
+                    $html .= apply_filters( 'bp_get_the_profile_field_options_select', '<option' . $selected . ' value="' . esc_attr( $options[$k]->name ) . '">' . esc_attr( $options[$k]->name ) . '</option>', $options[$k] );
+                }
+                break;
+            case 'radio':
+                $html = '<div id="field_' . $field->id . '">';
                 for ( $k = 0; $k < count($options); $k++ ) {
 …
+                    }
                     if ( in_array( $options[$k]->name, (array)$option_values ) || $options[$k]->is_default_option )
                         $selected = ' selected="selected"';
                     else
+                    if ( $option_value == $options[$k]->name || $value == $options[$k]->name || $options[$k]->is_default_option ) {
+                        $selected = ' checked="checked"';
+                    } else {
                         $selected = '';
-                    $html .= apply_filters( 'bp_get_the_profile_field_options_select', '<option' . $selected . ' value="' . attribute_escape( stripslashes( $options[$k]->name ) ) . '">' . attribute_escape( stripslashes( $options[$k]->name ) ) . '</option>', $options[$k] );
+                }
-                break;
-            case 'radio':
-                $html = '<div id="field_' . $field->id . '">';
-                for ( $k = 0; $k < count( $options ); $k++ ) {
-                    $option_value = BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id );
-                    /* Check for updated posted values, but errors preventing them from being saved first time */
-                    if ( isset( $_POST['field_' . $field->id] ) && $option_value != $_POST['field_' . $field->id] ) {
-                        if ( !empty( $_POST['field_' . $field->id] ) )
-                            $option_value = $_POST['field_' . $field->id];
+                    }
+                    if ( $option_value == $options[$k]->name || $value == $options[$k]->name || $options[$k]->is_default_option )
+                        $selected = ' checked="checked"';
+                    else
+                        $selected = '';
+                    $html .= apply_filters( 'bp_get_the_profile_field_options_radio', '<label><input' . $selected . ' type="radio" name="field_' . $field->id . '" id="option_' . $options[$k]->id . '" value="' . attribute_escape( $options[$k]->name ) . '"> ' . attribute_escape( $options[$k]->name ) . '</label>', $options[$k] );
+                    $html .= apply_filters( 'bp_get_the_profile_field_options_radio', '<label><input' . $selected . ' type="radio" name="field_' . $field->id . '" id="option_' . $options[$k]->id . '" value="' . esc_attr( $options[$k]->name ) . '"> ' . esc_attr( $options[$k]->name ) . '</label>', $options[$k] );
+                }
 …
             case 'checkbox':
                 $option_values = BP_XProfile_ProfileData::get_value_byid( $options[0]->parent_id );
+                $option_values = BP_XProfile_ProfileData::get_value_byid($options[0]->parent_id);
                 /* Check for updated posted values, but errors preventing them from being saved first time */
 …
+                }
                 $option_values = maybe_unserialize( $option_values );
                 for ( $k = 0; $k < count( $options ); $k++ ) {
                     for ( $j = 0; $j < count( $option_values ); $j++ ) {
+                $option_values = maybe_unserialize($option_values);
+                for ( $k = 0; $k < count($options); $k++ ) {
+                    for ( $j = 0; $j < count($option_values); $j++ ) {
                         if ( $option_values[$j] == $options[$k]->name || @in_array( $options[$k]->name, $value ) || $options[$k]->is_default_option ) {
                             $selected = ' checked="checked"';
 …
+                    }
                     $html .= apply_filters( 'bp_get_the_profile_field_options_checkbox', '<label><input' . $selected . ' type="checkbox" name="field_' . $field->id . '[]" id="field_' . $options[$k]->id . '_' . $k . '" value="' . attribute_escape( $options[$k]->name ) . '"> ' . attribute_escape( $options[$k]->name ) . '</label>', $options[$k] );
+                    $html .= apply_filters( 'bp_get_the_profile_field_options_checkbox', '<label><input' . $selected . ' type="checkbox" name="field_' . $field->id . '[]" id="field_' . $options[$k]->id . '_' . $k . '" value="' . esc_attr( $options[$k]->name ) . '"> ' . esc_attr( $options[$k]->name ) . '</label>', $options[$k] );
                     $selected = '';
+                }
 …
                 if ( !empty( $field->data->value ) ) {
                     $day            = date("j", $field->data->value);
                     $month          = date("F", $field->data->value);
                     $year           = date("Y", $field->data->value);
                     $default_select = ' selected="selected"';
+                    $day = date("j", $field->data->value);
+                    $month = date("F", $field->data->value);
+                    $year = date("Y", $field->data->value);
+                    $default_select = ' selected="selected"';
+                }
 …
                 switch ( $type ) {
                     case 'day':
                         $html .= '<option value=""' . attribute_escape( $default_select ) . '>--</option>';
+                        $html .= '<option value=""' . esc_attr( $default_select ) . '>--</option>';
                         for ( $i = 1; $i < 32; $i++ ) {
                             if ( $day == $i )
+                            if ( $day == $i ) {
                                 $selected = ' selected = "selected"';
                             else
+                            } else {
                                 $selected = '';
+                            }
                             $html .= '<option value="' . $i .'"' . $selected . '>' . $i . '</option>';
+                        }
 …
                                 );
                         $html .= '<option value=""' . attribute_escape( $default_select ) . '>------</option>';
+                        $html .= '<option value=""' . esc_attr( $default_select ) . '>------</option>';
                         for ( $i = 0; $i < 12; $i++ ) {
                             if ( $month == $eng_months[$i] )
+                            if ( $month == $eng_months[$i] ) {
                                 $selected = ' selected = "selected"';
                             else
+                            } else {
                                 $selected = '';
+                            }
                             $html .= '<option value="' . $eng_months[$i] . '"' . $selected . '>' . $months[$i] . '</option>';
 …
                     case 'year':
                         $html .= '<option value=""' . attribute_escape( $default_select ) . '>----</option>';
+                        $html .= '<option value=""' . esc_attr( $default_select ) . '>----</option>';
                         for ( $i = date( 'Y', time() ); $i > 1899; $i-- ) {
                             if ( $year == $i )
+                            if ( $year == $i ) {
                                 $selected = ' selected = "selected"';
                             else
+                            } else {
                                 $selected = '';
+                            }
                             $html .= '<option value="' . $i .'"' . $selected . '>' . $i . '</option>';
 …
         global $field;
         return apply_filters( 'bp_get_the_profile_field_is_required', (int) $field->is_required );
+        return apply_filters( 'bp_get_the_profile_field_is_required', (int)$field->is_required );
+    }
 function bp_unserialize_profile_field( $value ) {
     if ( is_serialized( $value ) ) {
         $field_value = maybe_unserialize( $value );
+    if ( is_serialized($value) ) {
+        $field_value = maybe_unserialize($value);
         $field_value = implode( ', ', $field_value );
         return $field_value;
 …
     function bp_get_profile_field_data( $args = '' ) {
         $defaults = array(
             'field'     => false, /* Field name or ID. */
             'user_id'   => $bp->displayed_user->id
         );
+            'field' => false, // Field name or ID.
+            'user_id' => $bp->displayed_user->id
+            );
         $r = wp_parse_args( $args, $defaults );
 …
         $group_name = bp_profile_group_name(false);
     for ( $i = 0; $i < count( $groups ); $i++ ) {
         if ( $group_name == $groups[$i]->name )
+    for ( $i = 0; $i < count($groups); $i++ ) {
+        if ( $group_name == $groups[$i]->name ) {
             $selected = ' class="current"';
         else
+        } else {
             $selected = '';
+        }
         if ( $groups[$i]->fields )
             echo '<li' . $selected . '><a href="' . $bp->displayed_user->domain . $bp->profile->slug . '/edit/group/' . $groups[$i]->id . '">' . attribute_escape( $groups[$i]->name ) . '</a></li>';
+            echo '<li' . $selected . '><a href="' . $bp->displayed_user->domain . $bp->profile->slug . '/edit/group/' . $groups[$i]->id . '">' . esc_attr( $groups[$i]->name ) . '</a></li>';
+    }
 …
     if ( !$group = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
         $group = new BP_XProfile_Group( $group_id );
+        $group = new BP_XProfile_Group($group_id);
         wp_cache_set( 'xprofile_group_' . $group_id, $group, 'bp' );
+    }
     if ( !$deprecated )
+    if ( !$deprecated ) {
         return bp_get_profile_group_name();
     else
+    } else {
         echo bp_get_profile_group_name();
+    }
+}
     function bp_get_profile_group_name() {
 …
         if ( !$group = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
             $group = new BP_XProfile_Group( $group_id );
+            $group = new BP_XProfile_Group($group_id);
             wp_cache_set( 'xprofile_group_' . $group_id, $group, 'bp' );
+        }
 …
     $last_updated = bp_get_profile_last_updated();
     if ( !$last_updated )
+    if ( !$last_updated ) {
         _e( 'Profile not recently updated', 'buddypress' ) . '.';
     else
+    } else {
         echo $last_updated;
+    }
+}
     function bp_get_profile_last_updated() {
         global $bp;
         $last_updated = get_usermeta( $bp->displayed_user->id, 'profile_last_updated' );
+        $last_updated = get_user_meta( $bp->displayed_user->id, 'profile_last_updated', true );
         if ( $last_updated )
 …
             $profile_group_id = 1;
+        /* admin/profile/edit/[group-id] */
+        return apply_filters( 'bp_get_current_profile_group_id', $profile_group_id );
+        return apply_filters( 'bp_get_current_profile_group_id', $profile_group_id ); // admin/profile/edit/[group-id]
+    }
 …
     global $bp;
+    bp_button( array (
+        'id'                => 'edit_profile',
+        'component'         => 'xprofile',
+        'must_be_logged_in' => true,
+        'block_self'        => true,
+        'link_href'         => trailingslashit( $bp->displayed_user->domain . $bp->profile->slug . '/edit' ),
+        'link_class'        => 'edit',
+        'link_text'         => __( 'Edit Profile', 'buddypress' ),
+        'link_title'        => __( 'Edit Profile', 'buddypress' ),
+    ) );
+}
 ?>
-    <div class="generic-button">
-        <a class="edit" title="<?php _e( 'Edit Profile', 'buddypress' ); ?>" href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/edit"><?php _e( 'Edit Profile', 'buddypress' ); ?></a>
-    </div>
-<?php
+}
-?>

Context Navigation

Legend:

Download in other formats: