Changeset 1250

Timestamp:

03/25/2009 04:01:43 PM (16 years ago)

Author:

apeatling

Message:

Removed blogs, groups and members directory from the home theme into the BuddyPress member theme. The directories now have their own templates and theme based CSS and provide much easier editing.

Moved the $bp global setup to a higher priority action - from the 'wp' action to the 'plugins_loaded' action. This stops occurrences where the $bp global was not defined yet.

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-activity/bp-activity-widgets.php (modified) (1 diff)
• bp-activity/css/widget-activity.css (added)
• bp-blogs.php (modified) (6 diffs)
• bp-blogs/bp-blogs-ajax.php (modified) (1 diff)
• bp-blogs/bp-blogs-classes.php (modified) (1 diff)
• bp-blogs/bp-blogs-templatetags.php (modified) (9 diffs)
• bp-blogs/bp-blogs-widgets.php (modified) (1 diff)
• bp-blogs/css/directory-blogs.css (deleted)
• bp-blogs/css/widget-blogs.css (added)
• bp-blogs/directories (deleted)
• bp-blogs/js/directory-blogs.js (modified) (3 diffs)
• bp-core.php (modified) (7 diffs)
• bp-core/bp-core-adminbar.php (modified) (1 diff)
• bp-core/bp-core-ajax-handler.php (modified) (1 diff)
• bp-core/bp-core-ajax.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (6 diffs)
• bp-core/bp-core-templatetags.php (modified) (5 diffs)
• bp-core/bp-core-widgets.php (modified) (1 diff)
• bp-core/css/directory-members.css (deleted)
• bp-core/css/widget-members.css (added)
• bp-core/directories (deleted)
• bp-core/js/directory-members.js (modified) (8 diffs)
• bp-forums.php (modified) (1 diff)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (9 diffs)
• bp-groups/bp-groups-ajax.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (11 diffs)
• bp-groups/bp-groups-widgets.php (modified) (1 diff)
• bp-groups/css/directory-groups.css (deleted)
• bp-groups/css/widget-groups.css (added)
• bp-groups/directories (deleted)
• bp-groups/js/directory-groups.js (modified) (3 diffs)
• bp-messages.php (modified) (1 diff)
• bp-wire.php (modified) (1 diff)
• bp-xprofile.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -170 +170 @@
     }
 }
-add_action( 'wp', 'bp_activity_setup_globals', 1 );
+add_action( 'plugins_loaded', 'bp_activity_setup_globals', 5 );
 add_action( 'admin_menu', 'bp_activity_setup_globals', 1 );
 
@@ -177 +177 @@
     bp_core_add_root_component( BP_ACTIVITY_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_activity_setup_root_component' );
+add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 1 );
 
 

trunk/bp-activity/bp-activity-widgets.php

@@ -8 +8 @@
     wp_register_sidebar_widget( 'buddypress-activity', __('Site Wide Activity', 'buddypress'), 'bp_activity_widget_sitewide_activity');
     wp_register_widget_control( 'buddypress-activity', __('Site Wide Activity', 'buddypress'), 'bp_activity_widget_sitewide_activity_control' );
+
+    if ( is_active_widget( 'bp_activity_widget_sitewide_activity' ) ) {
+        wp_enqueue_style( 'bp-activity-widget-activity-css', WPMU_PLUGIN_URL . '/bp-activity/css/widget-activity.css' );        
+    }
 }
 add_action( 'plugins_loaded', 'bp_activity_register_widgets' );

trunk/bp-blogs.php

@@ -26 +26 @@
 require ( 'bp-blogs/bp-blogs-widgets.php' );
 require ( 'bp-blogs/bp-blogs-ajax.php' );
-require ( 'bp-blogs/directories/bp-blogs-directory-blogs.php' );
 
 
@@ -148 +147 @@
     $bp->version_numbers->blogs = BP_BLOGS_VERSION;
 }
-add_action( 'wp', 'bp_blogs_setup_globals', 1 );    
+add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 );    
 add_action( 'admin_menu', 'bp_blogs_setup_globals', 1 );
 
@@ -155 +154 @@
     bp_core_add_root_component( BP_BLOGS_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_blogs_setup_root_component' );
+add_action( 'plugins_loaded', 'bp_blogs_setup_root_component', 1 );
 
 /**
@@ -198 +197 @@
 add_action( 'wp', 'bp_blogs_setup_nav', 2 );
 add_action( 'admin_menu', 'bp_blogs_setup_nav', 2 );
+
+function bp_blogs_directory_blogs_setup() {
+    global $bp;
+    
+    if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
+        $bp->is_directory = true;
+
+        wp_enqueue_script( 'bp-blogs-directory-blogs', WPMU_PLUGIN_URL . '/bp-blogs/js/directory-blogs.js', array( 'jquery', 'jquery-livequery-pack' ) );
+        bp_core_load_template( 'directories/blogs/index' );
+    }
+}
+add_action( 'wp', 'bp_blogs_directory_blogs_setup', 5 );
 
 function bp_blogs_screen_my_blogs() {
@@ -826 +837 @@
 }
 
+function bp_blogs_force_buddypress_theme( $template ) { 
+    global $bp;
+    
+    if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
+        $member_theme = get_site_option( 'active-member-theme' );
+
+        if ( empty( $member_theme ) )
+            $member_theme = 'buddypress-member';
+
+        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+
+        return $member_theme;
+    } else {
+        return $template;
+    }
+}
+add_filter( 'template', 'bp_blogs_force_buddypress_theme', 1, 1 );
+
+function bp_blogs_force_buddypress_stylesheet( $stylesheet ) {
+    global $bp;
+
+    if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
+        $member_theme = get_site_option( 'active-member-theme' );
+    
+        if ( empty( $member_theme ) )
+            $member_theme = 'buddypress-member';
+
+        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+
+        return $member_theme;
+    } else {
+        return $stylesheet;
+    }
+}
+add_filter( 'stylesheet', 'bp_blogs_force_buddypress_stylesheet', 1, 1 );
+
+
+
 function bp_blogs_remove_data( $user_id ) {
     /* If this is regular blog, delete all data for that blog. */
@@ -839 +890 @@
 
 function bp_blogs_clear_blog_object_cache( $blog_id, $user_id ) {
-    wp_cache_delete( 'bp_user_blogs_' . $user_id, 'bp' );
+    wp_cache_delete( 'bp_blogs_of_user_' . $user_id, 'bp' );
+    wp_cache_delete( 'bp_blogs_for_user_' . $user_id, 'bp' );
 }
 

trunk/bp-blogs/bp-blogs-ajax.php

@@ -5 +5 @@
     check_ajax_referer('directory_blogs');
     
-    $pag_page = isset( $_POST['page'] ) ? intval( $_POST['page'] ) : 1;
-    $pag_num = isset( $_POST['num'] ) ? intval( $_POST['num'] ) : 10;
-    
-    if ( isset( $_POST['letter'] ) && $_POST['letter'] != '' ) {
-        $blogs = BP_Blogs_Blog::get_by_letter( $_POST['letter'], $pag_num, $pag_page );
-    } else if ( isset ( $_POST['blogs_search'] ) && $_POST['blogs_search'] != '' ) {
-        $blogs = BP_Blogs_Blog::search_blogs( $_POST['blogs_search'], $pag_num, $pag_page );
-    } else {
-        $blogs = BP_Blogs_Blog::get_all( $pag_num, $pag_page );
-    }
-    
-    $pag_links = paginate_links( array(
-        'base' => add_query_arg( 'page', '%#%' ),
-        'format' => '',
-        'total' => ceil( $blogs['total'] / $pag_num ),
-        'current' => $pag_page,
-        'prev_text' => '«',
-        'next_text' => '»',
-        'mid_size' => 1
-    ));
-    
-    $from_num = intval( ( $pag_page - 1 ) * $pag_num ) + 1;
-    $to_num = ( $from_num + 9 > $blogs['total'] ) ? $blogs['total'] : $from_num + 9; 
-
-    if ( $blogs['blogs'] ) {
-        echo '0[[SPLIT]]'; // return valid result.
-        
-        ?>
-        <div id="blog-dir-count" class="pag-count">
-            <?php echo sprintf( __( 'Viewing blog %d to %d (%d total active blogs)', 'buddypress' ), $from_num, $to_num, $blogs['total'] ); ?> &nbsp;
-            <img id="ajax-loader-blogs" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
-        </div>
-    
-        <div class="pagination-links" id="blog-dir-pag">
-            <?php echo $pag_links ?>
-        </div>
-
-        <ul id="blogs-list" class="item-list">
-        <?php foreach ( $blogs['blogs'] as $blog ) : ?>
-            <li>
-                <div class="item-avatar">
-                    <img src="<?php echo 'http://www.gravatar.com/avatar/' . md5( $blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50'; ?>" class="avatar" alt="<?php _e( 'Blog Identicon', 'buddypress' ) ?>" />
-                </div>
-
-                <div class="item">
-                    <div class="item-title"><a href="<?php echo get_blog_option( $blog->blog_id, 'siteurl' ) ?>" title="<?php echo get_blog_option( $blog->blog_id, 'blogname' ) ?>"><?php echo get_blog_option( $blog->blog_id, 'blogname' ) ?></a></div>
-                    <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( bp_blogs_get_blogmeta( $blog->blog_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) ?></span></div>
-                </div>
-                
-                <div class="action">
-                    <div class="blog-button visit">
-                        <a href="<?php echo get_blog_option( $blog->blog_id, 'siteurl' ) ?>" class="visit" title="<?php printf( __( 'Visit %s', 'buddypress' ), get_blog_option( $blog->blog_id, 'blogname' ) ) ?>"><?php _e( 'Visit Blog', 'buddypress' ) ?></a>
-                    </div>
-                    <div class="meta">
-                        <?php 
-                            if ( $post = bp_blogs_get_latest_posts( $blog->blog_id, 1 ) ) {
-                                printf( __( 'Latest Post: %s', 'buddypress' ), '<a href="' . bp_post_get_permalink( $post[0], $blog->blog_id ) . '">' . apply_filters( 'the_title', $post[0]->post_title ) . '</a>' );
-                            }
-                        ?>
-                    </div>
-                </div>
-                
-                <div class="clear"></div>
-            </li>
-        <?php endforeach; ?>
-        </ul>   
-    <?php
-    } else {
-        echo "-1[[SPLIT]]<div id='message' class='error'><p>" . __("No blogs matched the current filter.", 'buddypress') . '</p></div>';
-    }
-    
-    if ( isset( $_POST['letter'] ) ) {
-        echo '<input type="hidden" id="selected_letter" value="' . $_POST['letter'] . '" name="selected_letter" />';
-    }
-    
-    if ( isset( $_POST['blogs_search'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . $_POST['blogs_search'] . '" name="search_terms" />';
-    }
-
+    load_template( TEMPLATEPATH . '/directories/blogs/blogs-loop.php' );
 }
 add_action( 'wp_ajax_directory_blogs', 'bp_blogs_ajax_directory_blogs' );

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

@@ -220 +220 @@
     }
     
+    function get_active( $limit = null, $page = null ) {
+        global $bp, $wpdb;
+        
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+        
+        if ( $limit && $page ) {
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC" ) );
+        }
+            
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC {$pag_sql}" ) );
+
+        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+    }
+    
+    function get_newest( $limit = null, $page = null ) {
+        global $bp, $wpdb;
+        
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+        
+        if ( $limit && $page ) {
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(wb.blog_id) FROM {$wpdb->base_prefix}blogs wb WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 ORDER BY wb.registered DESC" ) );
+        }
+            
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT wb.blog_id FROM {$wpdb->base_prefix}blogs wb WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 ORDER BY wb.registered DESC {$pag_sql}" ) );
+
+        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+    }
+    
     function is_hidden( $blog_id ) {
         global $wpdb;

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

@@ -1 +1 @@
 <?php
 
-/** Blog listing template class **/
-class BP_Blogs_Blog_Template {
+/* Blog registration template tags */
+
+function bp_blog_signup_enabled() {
+    $active_signup = get_site_option( 'registration' );
+    
+    if ( !$active_signup )
+        $active_signup = 'all';
+        
+    $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
+    
+    if ( 'none' == $active_signup || 'user' == $active_signup )
+        return false;
+    
+    return true;
+}
+
+function bp_show_blog_signup_form($blogname = '', $blog_title = '', $errors = '') {
+    global $current_user, $current_site;
+    global $bp;
+        
+    require_once( ABSPATH . WPINC . '/registration.php' );
+
+    if ( isset($_POST['submit']) ) {
+        bp_blogs_validate_blog_signup();
+    } else {
+        if ( ! is_wp_error($errors) ) {
+            $errors = new WP_Error();
+        }
+
+        // allow definition of default variables
+        $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
+        $blogname = $filtered_results['blogname'];
+        $blog_title = $filtered_results['blog_title'];
+        $errors = $filtered_results['errors'];
+
+        if ( $errors->get_error_code() ) {
+            echo "<p>" . __('There was a problem, please correct the form below and try again.', 'buddypress') . "</p>";
+        }
+        ?>
+        <p><?php printf(__("By filling out the form below, you can <strong>add a blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly.", 'buddypress'), $current_user->display_name) ?></p>
+
+        <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!", 'buddypress') ?></p>
+
+        <form id="setupform" method="post" action="<?php echo $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog' ?>">
+
+            <input type="hidden" name="stage" value="gimmeanotherblog" />
+            <?php do_action( "signup_hidden_fields" ); ?>
+            <?php bp_blogs_signup_blog($blogname, $blog_title, $errors); ?>
+            <p>
+                <input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;', 'buddypress') ?>" />
+            </p>
+            
+            <?php wp_nonce_field( 'bp_blog_signup_form' ) ?>
+        </form>
+        <?php
+    }
+}
+
+function bp_blogs_signup_blog( $blogname = '', $blog_title = '', $errors = '' ) {
+    global $current_site;
+    
+    // Blog name
+    if( 'no' == constant( "VHOST" ) )
+        echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
+    else
+        echo '<label for="blogname">' . __('Blog Domain:', 'buddypress') . '</label>';
+
+    if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
+        <p class="error"><?php echo $errmsg ?></p>
+    <?php }
+
+    if( 'no' == constant( "VHOST" ) ) {
+        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 {
+        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" ) ) {
+            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>';
+    }
+
+    // Blog Title
+    ?>
+    <label for="blog_title"><?php _e('Blog Title:', 'buddypress') ?></label>    
+    <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
+        <p class="error"><?php echo $errmsg ?></p>
+    <?php }
+    echo '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></p>';
+    ?>
+
+    <p>
+        <label for="blog_public_on"><?php _e('Privacy:', 'buddypress') ?></label>
+        <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress'); ?> 
+        <div style="clear:both;"></div>
+        <label class="checkbox" for="blog_public_on">
+            <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
+            <strong><?php _e( 'Yes' , 'buddypress'); ?></strong>
+        </label>
+        <label class="checkbox" for="blog_public_off">
+            <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
+            <strong><?php _e( 'No' , 'buddypress'); ?></strong>
+        </label>
+    </p>
+
+    <?php
+    do_action('signup_blogform', $errors);
+}
+
+function bp_blogs_validate_blog_signup() {
+    global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
+
+    if ( !check_admin_referer( 'bp_blog_signup_form' ) ) 
+        return false;
+
+    $current_user = wp_get_current_user();
+    
+    if( !is_user_logged_in() )
+        die();
+
+    $result = bp_blogs_validate_blog_form();
+    extract($result);
+
+    if ( $errors->get_error_code() ) {
+        unset($_POST['submit']);
+        bp_show_blog_signup_form( $blogname, $blog_title, $errors );
+        return false;
+    }
+
+    $public = (int) $_POST['blog_public'];
+    
+    $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // depreciated
+    $meta = apply_filters( 'add_signup_meta', $meta );
+    
+    /* If this is a VHOST install, remove the username from the domain as we are setting this blog
+       up inside a user domain, not the root domain. */
+    
+    wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
+    bp_blogs_confirm_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
+    return true;
+}
+
+function bp_blogs_validate_blog_form() {
+    $user = '';
+    if ( is_user_logged_in() )
+        $user = wp_get_current_user();
+
+    return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
+}
+
+function bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '' ) {
+    ?>
+    <p><?php _e('Congratulations! You have successfully registered a new blog.', 'buddypress') ?></p>
+    <p>
+        <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog.  <a href="%3$s">Login</a> as "%4$s" using your existing password.', 'buddypress'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
+    </p>
+    <?php
+    do_action('signup_finished');
+}
+
+function bp_create_blog_link() {
+    global $bp;
+    
+    if ( bp_is_home() ) {
+        echo apply_filters( 'bp_create_blog_link', '<a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog">' . __('Create a Blog', 'buddypress') . '</a>' );
+    }
+}
+
+function bp_blogs_blog_tabs() {
+    global $bp, $groups_template;
+    
+    // Don't show these tabs on a user's own profile
+    if ( bp_is_home() )
+        return false;
+    
+    $current_tab = $bp->current_action
+?>
+    <ul class="content-header-nav">
+        <li<?php if ( 'my-blogs' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/my-blogs"><?php printf( __( "%s's Blogs", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+        <li<?php if ( 'recent-posts' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-posts"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+        <li<?php if ( 'recent-comments' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-comments"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li> 
+    </ul>
+<?php
+    do_action( 'bp_blogs_blog_tabs', $current_tab );
+}
+
+/**********************************************************************
+ * User Blog listing template class
+ */
+
+class BP_Blogs_User_Blogs_Template {
     var $current_blog = -1;
     var $blog_count;
@@ -15 +208 @@
     var $total_blog_count;
     
-    function bp_blogs_blog_template( $user_id = null ) {
+    function bp_blogs_user_blogs_template( $user_id = null ) {
         global $bp;
         
@@ -22 +215 @@
 
         $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
-        $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 5;
-
-        $this->blogs = bp_blogs_get_blogs_for_user( $user_id );
-        
-        if ( !$this->blogs = wp_cache_get( 'bp_user_blogs_' . $user_id, 'bp' ) ) {
+        $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 10;
+
+        if ( !$this->blogs = wp_cache_get( 'bp_blogs_for_user_' . $user_id, 'bp' ) ) {
             $this->blogs = bp_blogs_get_blogs_for_user( $user_id );
-            wp_cache_set( 'bp_user_blogs_' . $user_id, $this->blogs, 'bp' );
+            wp_cache_set( 'bp_blogs_for_user_' . $user_id, $this->blogs, 'bp' );
         }
         
@@ -94 +285 @@
     global $blogs_template;
 
-    $blogs_template = new BP_Blogs_Blog_Template;
+    $blogs_template = new BP_Blogs_User_Blogs_Template;
     return $blogs_template->has_blogs();
 }
@@ -124 +315 @@
 
 
-/** User Blog posts listing template class **/
+/**********************************************************************
+ * User Blog Posts listing template class
+ */
 
 class BP_Blogs_Blog_Post_Template {
@@ -146 +339 @@
 
         $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
-        $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 5;
+        $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 10;
         
         if ( !$this->posts = wp_cache_get( 'bp_user_posts_' . $user_id, 'bp' ) ) {
@@ -476 +669 @@
 
 
-/** User Blog comments listing template class **/
+/**********************************************************************
+ * User Blog Comments listing template class
+ */
 
 class BP_Blogs_Post_Comment_Template {
@@ -498 +693 @@
 
         $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
-        $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 5;
+        $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 10;
         
         if ( !$this->comments = wp_cache_get( 'bp_user_comments_' . $user_id, 'bp' ) ) {
@@ -654 +849 @@
 }
 
-
-/* Blog registration template tags */
-
-function bp_blog_signup_enabled() {
-    $active_signup = get_site_option( 'registration' );
-    
-    if ( !$active_signup )
-        $active_signup = 'all';
-        
-    $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
-    
-    if ( 'none' == $active_signup || 'user' == $active_signup )
-        return false;
-    
-    return true;
-}
-
-function bp_show_blog_signup_form($blogname = '', $blog_title = '', $errors = '') {
-    global $current_user, $current_site;
-    global $bp;
-        
-    require_once( ABSPATH . WPINC . '/registration.php' );
-
-    if ( isset($_POST['submit']) ) {
-        bp_blogs_validate_blog_signup();
-    } else {
-        if ( ! is_wp_error($errors) ) {
-            $errors = new WP_Error();
-        }
-
-        // allow definition of default variables
-        $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
-        $blogname = $filtered_results['blogname'];
-        $blog_title = $filtered_results['blog_title'];
-        $errors = $filtered_results['errors'];
-
-        if ( $errors->get_error_code() ) {
-            echo "<p>" . __('There was a problem, please correct the form below and try again.', 'buddypress') . "</p>";
-        }
-        ?>
-        <p><?php printf(__("By filling out the form below, you can <strong>add a blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly.", 'buddypress'), $current_user->display_name) ?></p>
-
-        <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!", 'buddypress') ?></p>
-
-        <form id="setupform" method="post" action="<?php echo $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog' ?>">
-
-            <input type="hidden" name="stage" value="gimmeanotherblog" />
-            <?php do_action( "signup_hidden_fields" ); ?>
-            <?php bp_blogs_signup_blog($blogname, $blog_title, $errors); ?>
-            <p>
-                <input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;', 'buddypress') ?>" />
-            </p>
-            
-            <?php wp_nonce_field( 'bp_blog_signup_form' ) ?>
-        </form>
-        <?php
-    }
-}
-
-function bp_blogs_signup_blog( $blogname = '', $blog_title = '', $errors = '' ) {
-    global $current_site;
-    
-    // Blog name
-    if( 'no' == constant( "VHOST" ) )
-        echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
-    else
-        echo '<label for="blogname">' . __('Blog Domain:', 'buddypress') . '</label>';
-
-    if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
-        <p class="error"><?php echo $errmsg ?></p>
-    <?php }
-
-    if( 'no' == constant( "VHOST" ) ) {
-        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 {
-        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" ) ) {
-            print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
+/**********************************************************************
+ * Site Wide Blog listing template class
+ */
+
+class BP_Blogs_Site_Blogs_Template {
+    var $current_blog = -1;
+    var $blog_count;
+    var $blogs;
+    var $blog;
+    
+    var $in_the_loop;
+    
+    var $pag_page;
+    var $pag_num;
+    var $pag_links;
+    var $total_blog_count;
+    
+    function bp_blogs_site_blogs_template( $type, $per_page, $max ) {
+        global $bp;
+
+        $this->pag_page = isset( $_REQUEST['page'] ) ? intval( $_REQUEST['page'] ) : 1;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+                
+        if ( isset( $_REQUEST['s'] ) && '' != $_REQUEST['s'] && $type != 'random' ) {
+            $this->blogs = BP_Blogs_Blog::search_blogs( $_REQUEST['s'], $this->pag_num, $this->pag_page );
+        } else if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
+            $this->blogs = BP_Blogs_Blog::get_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
         } 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>';
-    }
-
-    // Blog Title
-    ?>
-    <label for="blog_title"><?php _e('Blog Title:', 'buddypress') ?></label>    
-    <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
-        <p class="error"><?php echo $errmsg ?></p>
-    <?php }
-    echo '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></p>';
-    ?>
-
-    <p>
-        <label for="blog_public_on"><?php _e('Privacy:', 'buddypress') ?></label>
-        <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress'); ?> 
-        <div style="clear:both;"></div>
-        <label class="checkbox" for="blog_public_on">
-            <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
-            <strong><?php _e( 'Yes' , 'buddypress'); ?></strong>
-        </label>
-        <label class="checkbox" for="blog_public_off">
-            <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
-            <strong><?php _e( 'No' , 'buddypress'); ?></strong>
-        </label>
-    </p>
-
-    <?php
-    do_action('signup_blogform', $errors);
-}
-
-function bp_blogs_validate_blog_signup() {
-    global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
-
-    if ( !check_admin_referer( 'bp_blog_signup_form' ) ) 
-        return false;
-
-    $current_user = wp_get_current_user();
-    
-    if( !is_user_logged_in() )
-        die();
-
-    $result = bp_blogs_validate_blog_form();
-    extract($result);
-
-    if ( $errors->get_error_code() ) {
-        unset($_POST['submit']);
-        bp_show_blog_signup_form( $blogname, $blog_title, $errors );
-        return false;
-    }
-
-    $public = (int) $_POST['blog_public'];
-    
-    $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // depreciated
-    $meta = apply_filters( 'add_signup_meta', $meta );
-    
-    /* If this is a VHOST install, remove the username from the domain as we are setting this blog
-       up inside a user domain, not the root domain. */
-    
-    wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
-    bp_blogs_confirm_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
-    return true;
-}
-
-function bp_blogs_validate_blog_form() {
-    $user = '';
-    if ( is_user_logged_in() )
-        $user = wp_get_current_user();
-
-    return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
-}
-
-function bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '' ) {
-    ?>
-    <p><?php _e('Congratulations! You have successfully registered a new blog.', 'buddypress') ?></p>
-    <p>
-        <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog.  <a href="%3$s">Login</a> as "%4$s" using your existing password.', 'buddypress'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
-    </p>
-    <?php
-    do_action('signup_finished');
-}
-
-function bp_create_blog_link() {
-    global $bp;
-    
-    if ( bp_is_home() ) {
-        echo apply_filters( 'bp_create_blog_link', '<a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog">' . __('Create a Blog', 'buddypress') . '</a>' );
-    }
-}
-
-function bp_blogs_blog_tabs() {
-    global $bp, $groups_template;
-    
-    // Don't show these tabs on a user's own profile
-    if ( bp_is_home() )
-        return false;
-    
-    $current_tab = $bp->current_action
+            switch ( $type ) {
+                case 'random':
+                    $this->blogs = BP_Blogs_Blog::get_random( $this->pag_num, $this->pag_page );
+                    break;
+                
+                case 'newest':
+                    $this->blogs = BP_Blogs_Blog::get_newest( $this->pag_num, $this->pag_page );
+                    break;  
+                
+                case 'active': default:
+                    $this->blogs = BP_Blogs_Blog::get_active( $this->pag_num, $this->pag_page );
+                    break;                  
+            }
+        }
+        
+        if ( !$max )
+            $this->total_blog_count = (int)$this->blogs['total'];
+        else
+            $this->total_blog_count = (int)$max;
+
+        $this->blogs = $this->blogs['blogs'];
+        $this->blog_count = count($this->blogs);
+
+        $this->pag_links = paginate_links( array(
+            'base' => add_query_arg( 'page', '%#%' ),
+            'format' => '',
+            'total' => ceil( (int) $this->total_blog_count / (int) $this->pag_num ),
+            'current' => (int) $this->pag_page,
+            'prev_text' => '&laquo;',
+            'next_text' => '&raquo;',
+            'mid_size' => 1
+        ));     
+    }
+    
+    function has_blogs() {
+        if ( $this->blog_count )
+            return true;
+        
+        return false;
+    }
+    
+    function next_blog() {
+        $this->current_blog++;
+        $this->blog = $this->blogs[$this->current_blog];
+        
+        return $this->blog;
+    }
+    
+    function rewind_blogs() {
+        $this->current_blog = -1;
+        if ( $this->blog_count > 0 ) {
+            $this->blog = $this->blogs[0];
+        }
+    }
+    
+    function blogs() { 
+        if ( $this->current_blog + 1 < $this->blog_count ) {
+            return true;
+        } elseif ( $this->current_blog + 1 == $this->blog_count ) {
+            do_action('loop_end');
+            // Do some cleaning up after the loop
+            $this->rewind_blogs();
+        }
+
+        $this->in_the_loop = false;
+        return false;
+    }
+    
+    function the_blog() {
+        global $blog;
+
+        $this->in_the_loop = true;
+        $this->blog = $this->next_blog();
+        
+        if ( 0 == $this->current_blog ) // loop has just started
+            do_action('loop_start');
+    }
+}
+
+function bp_rewind_site_blogs() {
+    global $site_blogs_template;
+    
+    $site_blogs_template->rewind_blogs();   
+}
+
+function bp_has_site_blogs( $args = '' ) {
+    global $site_blogs_template;
+
+    $defaults = array(
+        'type' => 'active',
+        'per_page' => 10,
+        'max' => false
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    // type: active ( default ) | random | newest | popular
+    
+    if ( $max ) {
+        if ( $per_page > $max )
+            $per_page = $max;
+    }
+        
+    $site_blogs_template = new BP_Blogs_Site_Blogs_Template( $type, $per_page, $max );
+
+    return $site_blogs_template->has_blogs();
+}
+
+function bp_site_blogs() {
+    global $site_blogs_template;
+    
+    return $site_blogs_template->blogs();
+}
+
+function bp_the_site_blog() {
+    global $site_blogs_template;
+    
+    return $site_blogs_template->the_blog();
+}
+
+function bp_site_blogs_pagination_count() {
+    global $bp, $site_blogs_template;
+    
+    $from_num = intval( ( $site_blogs_template->pag_page - 1 ) * $site_blogs_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $site_blogs_template->pag_num - 1 ) > $site_blogs_template->total_blog_count ) ? $site_blogs_template->total_blog_count : $from_num + ( $site_blogs_template->pag_num - 1 ) ;
+
+    echo sprintf( __( 'Viewing blog %d to %d (of %d blogs)', 'buddypress' ), $from_num, $to_num, $site_blogs_template->total_blog_count ); ?> &nbsp;
+    <img id="ajax-loader-blogs" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" /><?php
+}
+
+function bp_site_blogs_pagination_links() {
+    global $site_blogs_template;
+    echo $site_blogs_template->pag_links;
+}
+
+function bp_the_site_blog_avatar() {
+    global $site_blogs_template, $bp;
+
+    /***
+     * In future BuddyPress versions you will be able to set the avatar for a blog.
+     * Right now you can use a filter with the ID of the blog to change it if you wish.
+     */
+    
+    echo apply_filters( 'bp_blogs_blog_avatar_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=150" class="avatar blog-avatar" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />' );
+}
+
+function bp_the_site_blog_avatar_thumb() {
+    global $site_blogs_template, $bp;
+
+    echo apply_filters( 'bp_blogs_blog_avatar_thumb_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50" class="avatar blog-avatar thumb" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />' );
+}
+
+function bp_the_site_blog_avatar_mini() {
+    global $site_blogs_template, $bp;
+    
+    echo apply_filters( 'bp_blogs_blog_avatar_mini_' . $site_blogs_template->blog->blog_id, '<img src="http://www.gravatar.com/avatar/' . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=25" class="avatar blog-avatar mini" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />' );
+}
+
+function bp_the_site_blog_link() {
+    global $site_blogs_template;
+    
+    echo get_blog_option( $site_blogs_template->blog->blog_id, 'siteurl' );
+}
+
+function bp_the_site_blog_name() {
+    global $site_blogs_template;
+    
+    echo get_blog_option( $site_blogs_template->blog->blog_id, 'blogname' );
+}
+
+function bp_the_site_blog_description() {
+    global $site_blogs_template;
+    
+    echo get_blog_option( $site_blogs_template->blog->blog_id, 'blogdescription' );
+}
+
+function bp_the_site_blog_last_active() {
+    global $site_blogs_template;
+
+    echo bp_core_get_last_activity( bp_blogs_get_blogmeta( $site_blogs_template->blog->blog_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) );
+}
+
+function bp_the_site_blog_latest_post() {
+    global $site_blogs_template;
+    
+    if ( $post = bp_blogs_get_latest_posts( $site_blogs_template->blog->blog_id, 1 ) ) {
+        printf( __( 'Latest Post: %s', 'buddypress' ), '<a href="' . bp_post_get_permalink( $post[0], $site_blogs_template->blog->blog_id ) . '">' . apply_filters( 'the_title', $post[0]->post_title ) . '</a>' );
+    }
+}
+
+
+function bp_the_site_blog_hidden_fields() {
+    if ( isset( $_REQUEST['s'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ). '" name="search_terms" />';
+    }
+    
+    if ( isset( $_REQUEST['letter'] ) ) {
+        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_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" />';
+    }
+}
+
+function bp_directory_blogs_search_form() {
+    global $bp; ?>
+    <form action="<?php echo $bp->root_domain . '/' . blogs_SLUG  . '/search/' ?>" method="post" id="search-blogs-form">
+        <label><input type="text" name="blogs_search" id="blogs_search" value="<?php if ( isset( $_GET['s'] ) ) { echo $_GET['s']; } else { _e( 'Search anything...', 'buddypress' ); } ?>"  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="blogs_search_submit" name="blogs_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+    </form>
+<?php
+}
+
+
 ?>
-    <ul class="content-header-nav">
-        <li<?php if ( 'my-blogs' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/my-blogs"><?php printf( __( "%s's Blogs", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
-        <li<?php if ( 'recent-posts' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-posts"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
-        <li<?php if ( 'recent-comments' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-comments"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li> 
-    </ul>
-<?php
-    do_action( 'bp_blogs_blog_tabs', $current_tab );
-}
-
-?>

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

@@ -8 +8 @@
     wp_register_sidebar_widget( 'buddypress-blogs', __('Recent Blog Posts', 'buddypress'), 'bp_blogs_widget_recent_posts');
     wp_register_widget_control( 'buddypress-blogs', __('Recent Blog Posts', 'buddypress'), 'bp_blogs_widget_recent_posts_control' );
+
+    if ( is_active_widget( 'bp_blogs_widget_recent_posts' ) ) {
+        wp_enqueue_style( 'bp-blogs-widget-posts-css', WPMU_PLUGIN_URL . '/bp-blogs/css/widget-blogs.css' );        
+    }
 }
 add_action( 'plugins_loaded', 'bp_blogs_register_widgets' );

trunk/bp-blogs/js/directory-blogs.js

@@ -16 +16 @@
                 '_wpnonce': jQuery("input#_wpnonce-blog-filter").val(),
                 'letter': letter[1],
-                'page': 1,
-                'num': 10
+                'page': 1
             },
             function(response)
             {   
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    jQuery("#blog-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-blogs').toggle();
-                            jQuery("#blog-dir-list").html(response[1]);
-                            jQuery("#blog-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {                    
-                    jQuery("ul#blogs-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-blogs').toggle();
-                            var message = response[1];
-                            jQuery("#blog-dir-list").html(message);
-                            jQuery("#blog-dir-list").fadeIn(200);
-                        }
-                    );
-                }
+                jQuery("#blog-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-blogs').toggle();
+                        jQuery("#blog-dir-list").html(response);
+                        jQuery("#blog-dir-list").fadeIn(200);
+                    }
+                );
             });
         
@@ -56 +41 @@
                 'cookie': encodeURIComponent(document.cookie),
                 '_wpnonce': jQuery("input#_wpnonce-blog-filter").val(),
-                'blogs_search': jQuery("input#blogs_search").val(),
-                'page': 1,
-                'num': 10
+                's': jQuery("input#blogs_search").val(),
+                'page': 1
             },
             function(response)
             {   
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    
-                    jQuery("#blog-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-blogs').toggle();
-                            jQuery("#blog-dir-list").html(response[1]);
-                            jQuery("#blog-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {
-                                        
-                    jQuery("#blog-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-blogs').toggle();
-                            var message = response[1];
-                            jQuery("#blog-dir-list").html(message);
-                            jQuery("#blog-dir-list").fadeIn(200);
-                        }
-                    );
-                    
-                }
+                jQuery("#blog-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-blogs').toggle();
+                        jQuery("#blog-dir-list").html(response);
+                        jQuery("#blog-dir-list").fadeIn(200);
+                    }
+                );
             });
         
@@ -115 +82 @@
                 '_wpnonce': jQuery("input#_wpnonce").val(),
                 'page': page[1],
-                'num': 10,
                 '_wpnonce': jQuery("input#_wpnonce-blog-filter").val(),
                 
                 'letter': letter,
-                'blogs_search': search_terms
+                's': search_terms
             },
             function(response)
             {   
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    
-                    jQuery("#blog-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-blogs').toggle();
-                            jQuery("#blog-dir-list").html(response[1]);
-                            jQuery("#blog-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {
-                                        
-                    jQuery("#blog-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-blogs').toggle();
-                            var message = response[1];
-                            jQuery("#blog-dir-list").html(message);
-                            jQuery("#blog-dir-list").fadeIn(200);
-                        }
-                    );
-                    
-                }           
+                jQuery("#blog-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-blogs').toggle();
+                        jQuery("#blog-dir-list").html(response);
+                        jQuery("#blog-dir-list").fadeIn(200);
+                    }
+                );
             });
             

trunk/bp-core.php

@@ -35 +35 @@
 require ( 'bp-core/bp-core-signup.php' );
 require ( 'bp-core/bp-core-activation.php' );
-require ( 'bp-core/directories/bp-core-directory-members.php' );
 
 /* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */
@@ -75 +74 @@
     global $displayed_user_id;
     global $action_variables;
+    
+    $current_user = wp_get_current_user();
 
     /* The domain for the root of the site where the main blog resides */   
@@ -147 +148 @@
         $bp->current_component = $bp->default_component;
 }
-add_action( 'wp', 'bp_core_setup_globals', 1 );
+add_action( 'plugins_loaded', 'bp_core_setup_globals', 3 );
 add_action( '_admin_menu', 'bp_core_setup_globals', 1 ); // must be _admin_menu hook.
 
@@ -158 +159 @@
     bp_core_add_root_component( HOME_BLOG_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_core_setup_root_components' );
+add_action( 'plugins_loaded', 'bp_core_setup_root_components', 1 );
 
 function bp_core_setup_session() {
@@ -305 +306 @@
 add_action( 'wp', 'bp_core_setup_nav', 2 );
 add_action( 'admin_menu', 'bp_core_setup_nav', 2 );
+
+function bp_core_directory_members() {
+    global $bp;
+    
+    if ( !is_home() && is_null( $bp->displayed_user->id ) && $bp->current_component == $bp->default_component ) {
+        $bp->is_directory = true;
+        $bp->current_component = false;
+
+        wp_enqueue_script( 'bp-core-directory-members', WPMU_PLUGIN_URL . '/bp-core/js/directory-members.js', array( 'jquery', 'jquery-livequery-pack' ) );
+        bp_core_load_template( 'directories/members/index' );
+    }
+}
+add_action( 'wp', 'bp_core_directory_members', 5 );
 
 /**
@@ -1167 +1181 @@
  */
 function bp_core_referrer() {
-    $referer = explode( '/', $_SERVER['HTTP_REFERER'] );
+    $referer = explode( '/', wp_get_referer() );
     unset( $referer[0], $referer[1], $referer[2] );
     return implode( '/', $referer );
@@ -1342 +1356 @@
     global $wpdb;
     ?>
-<!-- Generated in <?php timer_stop(1); ?> seconds. -->
+<!-- Generated in <?php timer_stop(1); ?> seconds. <?php echo $wpdb->num_queries; ?> queries. -->
     <?php
 }

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

@@ -127 +127 @@
         if ( function_exists('bp_blogs_install') ) {
             
-            if ( !$blogs = wp_cache_get( 'bp_user_blogs_' . $bp->loggedin_user->id, 'bp' ) ) {
+            if ( !$blogs = wp_cache_get( 'bp_blogs_of_user_' . $bp->loggedin_user->id, 'bp' ) ) {
                 $blogs = get_blogs_of_user( $bp->loggedin_user->id );
-                wp_cache_set( 'bp_user_blogs_' . $bp->loggedin_user->id, $blogs, 'bp' );
+                wp_cache_set( 'bp_blogs_of_user_' . $bp->loggedin_user->id, $blogs, 'bp' );
             }
 

trunk/bp-core/bp-core-ajax-handler.php

@@ -3 +3 @@
 require_once( preg_replace('%(.*)[/\\\\]wp-content[/\\\\].*%', '\1', $_SERVER['SCRIPT_FILENAME'] ) . '/wp-load.php' );
 
-add_filter( 'bp_uri', 'bp_core_referrer' );
 wp();
 

trunk/bp-core/bp-core-ajax.php

@@ -67 +67 @@
 
 function bp_core_ajax_directory_members() {
-    global $bp;
-
     check_ajax_referer('directory_members');
     
-    $pag_page = isset( $_POST['page'] ) ? intval( $_POST['page'] ) : 1;
-    $pag_num = isset( $_POST['num'] ) ? intval( $_POST['num'] ) : 10;
-    
-    if ( isset( $_POST['letter'] ) && $_POST['letter'] != '' ) {
-        $users = BP_Core_User::get_users_by_letter( $_POST['letter'], $pag_num, $pag_page );
-    } else if ( isset ( $_POST['members_search'] ) && $_POST['members_search'] != '' ) {
-        $users = BP_Core_User::search_users( $_POST['members_search'], $pag_num, $pag_page );
-    } else {
-        $users = BP_Core_User::get_active_users( $pag_num, $pag_page );
-    }
-
-    $pag_links = paginate_links( array(
-        'base' => add_query_arg( 'page', '%#%' ),
-        'format' => '',
-        'total' => ceil( $users['total'] / $pag_num ),
-        'current' => $pag_page,
-        'prev_text' => '«',
-        'next_text' => '»',
-        'mid_size' => 1
-    ));
-    
-    $from_num = intval( ( $pag_page - 1 ) * $pag_num ) + 1;
-    $to_num = ( $from_num + ( $pag_num - 1 ) > $users['total'] ) ? $users['total'] : $from_num + ( $pag_num - 1 ); 
-    
-    if ( $users['users'] ) {
-        echo '0[[SPLIT]]'; // return valid result.
-        
-        ?>
-        <div class="container">
-            <div id="member-dir-count" class="pag-count">
-                <?php echo sprintf( __( 'Viewing member %d to %d (%d total active members)', 'buddypress' ), $from_num, $to_num, $users['total'] ); ?> &nbsp;
-                <img id="ajax-loader-members" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
-            </div>
-        
-            <?php if ( $pag_links ) : ?>
-                <div class="pagination-links" id="member-dir-pag">
-                    <?php echo $pag_links ?>
-                </div>
-            <?php endif; ?>
-
-            <?php   
-            echo '<ul id="members-list" class="item-list">';
-            foreach ( (array) $users['users'] as $user ) {
-            ?>
-                <li>
-                    <div class="item-avatar">
-                        <?php echo bp_core_get_avatar( $user->user_id, 1 ) ?>
-                    </div>
-
-                    <div class="item">
-                        <div class="item-title"><?php echo bp_core_get_userlink( $user->user_id ) ?></div>
-                        <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( get_usermeta( $user->user_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) ?></span></div>
-                    </div>
-                
-                    <div class="action">
-                        <?php if ( function_exists('bp_add_friend_button') ) : ?>
-                            <?php bp_add_friend_button( $user->user_id ) ?>
-                        <?php endif; ?>
-                        <div class="meta">
-                            <?php if ( $user_obj->total_friends ) echo $user_obj->total_friends ?><?php if ( $user_obj->total_blogs ) echo ', ' . $user_obj->total_blogs ?><?php if ( $user_obj->total_groups ) echo ', ' . $user_obj->total_groups ?>
-                        </div>
-                    </div>
-                
-                    <div class="clear"></div>
-                </li>
-            <?php   
-            }
-            echo '</ul>'; ?>
-        </div>
-<?php
-    } else {
-        echo "-1[[SPLIT]]<div id='message' class='error'><p>" . __("No members matched the current filter.", 'buddypress') . '</p></div>';
-    }
-    
-    if ( isset( $_POST['letter'] ) ) {
-        echo '<input type="hidden" id="selected_letter" value="' . $_POST['letter'] . '" name="selected_letter" />';
-    }
-    
-    if ( isset( $_POST['members_search'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . $_POST['members_search'] . '" name="search_terms" />';
-    }
-
+    load_template( TEMPLATEPATH . '/directories/members/members-loop.php' );
 }
 add_action( 'wp_ajax_directory_members', 'bp_core_ajax_directory_members' );

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

@@ -33 +33 @@
     global $bp;
     
-    $path = apply_filters( 'bp_uri', $_SERVER['REQUEST_URI'] );
-    
+    if ( strpos( $_SERVER['REQUEST_URI'], 'bp-core-ajax-handler.php' ) )
+        $path = bp_core_referrer();
+    else
+        $path = clean_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 */
@@ -79 +84 @@
         }
     }
-    
+
     /* Reset the keys by merging with an empty array */
     $bp_uri = array_merge( array(), $bp_uri );
     $bp_unfiltered_uri = $bp_uri;
-
+    
     /* Catch a member page and set the current member ID */
-    if ( $bp_uri[0] == MEMBERS_SLUG && !empty( $bp_uri[1] ) ) {
+    if ( $bp_uri[0] == MEMBERS_SLUG || in_array( 'bp-core-ajax-handler.php', $bp_uri ) ) {
         $is_member_page = true;
         $is_root_component = true;
@@ -106 +111 @@
     }
 
-    /* This is used to determine where the component and action indexes should start */
-    $root_components = $bp->root_components;
-    
     if ( !isset($is_root_component) )
-        $is_root_component = in_array( $bp_uri[0], $root_components );
+        $is_root_component = in_array( $bp_uri[0], $bp->root_components );
 
     if ( 'no' == VHOST && !$is_root_component ) {
@@ -139 +141 @@
     //var_dump($current_component, $current_action, $action_variables);
 }
-add_action( 'wp', 'bp_core_set_uri_globals', 1 );
+add_action( 'plugins_loaded', 'bp_core_set_uri_globals', 3 );
 
 /**
@@ -254 +256 @@
 
 function bp_core_force_buddypress_theme( $template ) {
-    global $current_component, $current_action;
-    global $is_member_page;
-    
-    // The theme filter does not recognize any globals, where as the stylesheet filter does.
-    // We have to set up the globals to use manually.
-    bp_core_set_uri_globals();
-    
-    $member_theme = get_site_option('active-member-theme');
+    global $is_member_page, $bp;
+
+    $member_theme = get_site_option( 'active-member-theme' );
     
     if ( empty( $member_theme ) )
         $member_theme = 'buddypress-member';
     
+    if ( $is_member_page ) {
+
+        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+
+        return $member_theme;
+    } else {
+        return $template;
+    }
+}
+add_filter( 'template', 'bp_core_force_buddypress_theme', 1, 1 );
+
+function bp_core_force_buddypress_stylesheet( $stylesheet ) {
+    global $is_member_page;
+
+    $member_theme = get_site_option( 'active-member-theme' );
+    
+    if ( empty( $member_theme ) )
+        $member_theme = 'buddypress-member';
+
     if ( $is_member_page ) {
         add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
@@ -272 +289 @@
         return $member_theme;
     } else {
-        return $template;
-    }
-}
-add_filter( 'template', 'bp_core_force_buddypress_theme', 1, 1 );
-
-function bp_core_force_buddypress_stylesheet( $stylesheet ) {
-    global $bp, $is_member_page;
-
-    $member_theme = get_site_option('active-member-theme');
-    
-    if ( empty( $member_theme ) )
-        $member_theme = 'buddypress-member';
-
-    if ( $is_member_page ) {
-        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
-        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
-
-        return $member_theme;
-    } else {
         return $stylesheet;
     }

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

@@ -454 +454 @@
 
 function bp_page_title() {
-    global $bp;
-    
-    if ( !empty( $bp->displayed_user->fullname ) ) {
-        echo apply_filters( 'bp_page_title', strip_tags( $bp->displayed_user->fullname . ' » ' . ucwords( $bp->current_component ) . ' » ' . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'] ) );
+    global $bp, $post, $wp_query;
+    
+    //var_dump($wp_query);
+
+    if ( is_home() && bp_is_page( 'home' ) ) {
+        $title = __( 'Home', 'buddypress' );
+    } else if ( bp_is_blog_page() ) {
+        if ( is_single() ) {
+            $title = __( 'Blog — ' . $post->post_title, 'buddypress' );
+        } else if ( is_category() ) {
+            $title = __( 'Blog — Categories — ' . ucwords( $wp_query->query_vars['category_name'] ), 'buddypress' );                
+        } else if ( is_tag() ) {
+            $title = __( 'Blog — Tags — ' . ucwords( $wp_query->query_vars['tag'] ), 'buddypress' );                
+        } else {
+            $title = __( 'Blog', 'buddypress' );
+        }
+    } else if ( !empty( $bp->displayed_user->fullname ) ) {
+        $title = strip_tags( $bp->displayed_user->fullname . ' — ' . ucwords( $bp->current_component ) . ' — ' . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'] );
+    } else if ( $bp->is_single_item ) {
+        $title = ucwords( $bp->current_component ) . ' — ' . $bp->bp_options_title;
     } else {
-        echo apply_filters( 'bp_page_title', strip_tags( ucwords( $bp->current_component ) . ' » ' . ucwords( $bp->bp_options_title ) . ' » ' . ucwords( $bp->current_action ) ) );
-    }
+        if ( $bp->is_directory ) {
+            if ( !$bp->current_component )
+                $title = __( 'Members Directory', 'buddypress' );
+            else
+                $title = sprintf( __( '%s Directory', 'buddypress' ), ucwords( $bp->current_component ) );
+        }       
+    }
+    
+    echo apply_filters( 'bp_page_title', get_blog_option( 1, 'blogname' ) . ' — ' . $title, $title );
+    
 }
 
@@ -473 +497 @@
     if ( $bp->displayed_user->id || $bp->is_single_item )
         return false;
-
-    if ( $page == $bp->current_component || $page == 'home' && $bp->current_component == $bp->default_component )
+    
+    if ( $page == $bp->current_component || ( is_home() && $page == 'home' && $bp->current_component == $bp->default_component ) || ( $page == MEMBERS_SLUG && !$bp->current_component ) )
         return true;
     
@@ -647 +671 @@
 }
 
+function bp_get_optionsbar( $hide_on_directory = true ) {
+    global $bp;
+    
+    if ( $hide_on_directory && $bp->is_directory )
+        return false;
+    
+    include_once( TEMPLATEPATH . '/userbar.php' );
+}
+
+function bp_get_userbar( $hide_on_directory = true ) {
+    global $bp;
+    
+    if ( $hide_on_directory && $bp->is_directory )
+        return false;
+    
+    include_once( TEMPLATEPATH . '/optionsbar.php' );
+}
+
+function bp_is_directory() {
+    global $bp;
+    
+    return $bp->is_directory;
+}
+
+
+/*** CUSTOM LOOP TEMPLATE CLASSES *******************/
+
+class BP_Core_Members_Template {
+    var $current_member = -1;
+    var $member_count;
+    var $members;
+    var $member;
+
+    var $in_the_loop;
+
+    var $pag_page;
+    var $pag_num;
+    var $pag_links;
+    var $total_member_count;
+    
+    function bp_core_members_template( $type, $per_page, $max ) {
+        global $bp, $bp_the_member_query;
+
+        $this->pag_page = isset( $_REQUEST['page'] ) ? intval( $_REQUEST['page'] ) : 1;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+                
+        if ( isset( $_REQUEST['s'] ) && '' != $_REQUEST['s'] && $type != 'random' ) {
+            $this->members = BP_Core_User::search_users( $_REQUEST['s'], $this->pag_num, $this->pag_page );
+        } else if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
+            $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
+        } else {
+            switch ( $type ) {
+                case 'random':
+                    $this->members = BP_Core_User::get_random_users( $this->pag_num, $this->pag_page );
+                    break;
+                
+                case 'newest':
+                    $this->members = BP_Core_User::get_newest_users( $this->pag_num, $this->pag_page );
+                    break;
+
+                case 'popular':
+                    $this->members = BP_Core_User::get_popular_users( $this->pag_num, $this->pag_page );
+                    break;  
+
+                case 'online':
+                    $this->members = BP_Core_User::get_online_users( $this->pag_num, $this->pag_page );
+                    break;  
+                
+                case 'active': default:
+                    $this->members = BP_Core_User::get_active_users( $this->pag_num, $this->pag_page );
+                    break;                  
+            }
+        }
+        
+        if ( !$max )
+            $this->total_member_count = (int)$this->members['total'];
+        else
+            $this->total_member_count = (int)$max;
+
+        $this->members = $this->members['users'];
+        $this->member_count = count($this->members);
+
+        $this->pag_links = paginate_links( array(
+            'base' => add_query_arg( 'page', '%#%' ),
+            'format' => '',
+            'total' => ceil( (int) $this->total_member_count / (int) $this->pag_num ),
+            'current' => (int) $this->pag_page,
+            'prev_text' => '«',
+            'next_text' => '»',
+            'mid_size' => 1
+        ));     
+    }
+    
+    function has_members() {
+        if ( $this->member_count )
+            return true;
+        
+        return false;
+    }
+    
+    function next_member() {
+        $this->current_member++;
+        $this->member = $this->members[$this->current_member];
+        
+        return $this->member;
+    }
+    
+    function rewind_members() {
+        $this->current_member = -1;
+        if ( $this->member_count > 0 ) {
+            $this->member = $this->members[0];
+        }
+    }
+    
+    function site_members() { 
+        if ( $this->current_member + 1 < $this->member_count ) {
+            return true;
+        } elseif ( $this->current_member + 1 == $this->member_count ) {
+            do_action('loop_end');
+            // Do some cleaning up after the loop
+            $this->rewind_members();
+        }
+
+        $this->in_the_loop = false;
+        return false;
+    }
+    
+    function the_member() {
+        global $member, $bp;
+
+        $this->in_the_loop = true;
+        $this->member = $this->next_member();
+        $user_id = $this->member->user_id;
+
+        if ( !$this->member = wp_cache_get( 'bp_user_' . $user_id, 'bp' ) ) {
+            $this->member = new BP_Core_User( $user_id );
+            wp_cache_set( 'bp_user_' . $user_id, $this->member, 'bp' );
+        }
+        
+        if ( 0 == $this->current_member ) // loop has just started
+            do_action('loop_start');
+    }
+}
+
+function bp_rewind_site_members() {
+    global $site_members_template;
+    
+    return $site_members_template->rewind_members();
+}
+
+function bp_has_site_members( $args = '' ) {
+    global $bp, $site_members_template;
+
+    $defaults = array(
+        'type' => 'active',
+        'per_page' => 10,
+        'max' => false
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+
+    // type: active ( default ) | random | newest | popular | online
+    
+    if ( $max ) {
+        if ( $per_page > $max )
+            $per_page = $max;
+    }
+    
+    $site_members_template = new BP_Core_Members_Template( $type, $per_page, $max );
+    
+    return $site_members_template->has_members();
+}
+
+function bp_the_site_member() {
+    global $site_members_template;
+    return $site_members_template->the_member();
+}
+
+function bp_site_members() {
+    global $site_members_template;
+    return $site_members_template->site_members();
+}
+
+function bp_site_members_pagination_count() {
+    global $bp, $site_members_template;
+    
+    $from_num = intval( ( $site_members_template->pag_page - 1 ) * $site_members_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $site_members_template->pag_num - 1 ) > $site_members_template->total_member_count ) ? $site_members_template->total_member_count : $from_num + ( $site_members_template->pag_num - 1) ;
+
+    echo sprintf( __( 'Viewing member %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $site_members_template->total_member_count ); ?> &nbsp;
+    <img id="ajax-loader-members" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" /><?php
+}
+
+function bp_site_members_pagination_links() {
+    global $site_members_template;
+    echo $site_members_template->pag_links;
+}
+
+function bp_the_site_member_avatar() {
+    global $site_members_template;
+    
+    echo $site_members_template->member->avatar_thumb;
+}
+
+function bp_the_site_member_link() {
+    global $site_members_template;
+    
+    echo $site_members_template->member->user_url;
+}
+
+function bp_the_site_member_name() {
+    global $site_members_template;
+    
+    echo $site_members_template->member->fullname;
+}
+
+function bp_the_site_member_last_active() {
+    global $site_members_template;
+
+    echo $site_members_template->member->last_active;
+}
+
+function bp_the_site_member_add_friend_button() {
+    global $site_members_template;
+    
+    if ( function_exists( 'bp_add_friend_button' ) ) {
+        echo bp_add_friend_button( $site_members_template->member->id );
+    }
+}
+
+function bp_the_site_member_total_friend_count() {
+    global $site_members_template;
+    
+    if ( !(int) $site_members_template->member->total_friends )
+        return false;
+    
+    if ( 1 == (int) $site_members_template->member->total_friends )
+        printf( __( '%d friend', 'buddypress' ), (int) $site_members_template->member->total_friends );
+    else
+        printf( __( '%d friends', 'buddypress' ), (int) $site_members_template->member->total_friends );        
+}
+
+function bp_the_site_member_random_profile_data() {
+    global $site_members_template;
+
+    if ( function_exists( 'xprofile_get_random_profile_data' ) ) { ?>
+        <?php $random_data = xprofile_get_random_profile_data( $site_members_template->member->id, true ); ?>
+            <strong><?php echo $random_data[0]->name ?></strong>
+            <?php echo $random_data[0]->value ?>
+    <?php }
+}
+
+function bp_the_site_member_hidden_fields() {
+    if ( isset( $_GET['s'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
+
+    if ( isset( $_POST['letter'] ) ) {
+        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
+
+    if ( isset( $_POST['members_search'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['members_search'] ) . '" name="search_terms" />';
+    }
+}
+
+function bp_directory_members_search_form() {
+    global $bp; ?>
+    <form action="<?php echo $bp->root_domain . '/' . MEMBERS_SLUG  . '/search/' ?>" method="post" id="search-members-form">
+        <label><input type="text" name="members_search" id="members_search" value="<?php if ( isset( $_GET['s'] ) ) { echo attribute_escape( $_GET['s'] ); } else { _e( 'Search anything...', 'buddypress' ); } ?>"  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>
+<?php
+}
+
+
 /* Template functions for fetching globals, without querying the DB again
    also means we dont have to use the $bp variable in the template (looks messy) */
@@ -654 +955 @@
     return apply_filters( 'bp_current_user_id', $bp->displayed_user->id );
 }
+    function bp_displayed_user_id() {
+        return bp_current_user_id();
+    }
+
+function bp_loggedin_user_id() {
+    global $bp;
+    return apply_filters( 'bp_loggedin_user_id', $bp->loggedin_user->id );
+}
+
+function bp_displayed_user_domain() {
+    global $bp;
+    return apply_filters( 'bp_displayed_user_domain', $bp->displayed_user->domain );
+}
+
+function bp_loggedin_user_domain() {
+    global $bp;
+    return apply_filters( 'bp_loggedin_user_domain', $bp->loggedin_user->domain );
+}
 
 function bp_user_fullname() {
@@ -659 +978 @@
     echo apply_filters( 'bp_user_fullname', $bp->displayed_user->fullname );
 }
-
-
+    function bp_displayed_user_fullname() {
+        return bp_user_fullname();
+    }
+
+function bp_loggedin_user_fullname() {
+    global $bp;
+    echo apply_filters( 'bp_loggedin_user_fullname', $bp->loggedin_user->fullname );    
+}
 
 ?>

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

@@ -14 +14 @@
     
     /* Include the javascript needed for activated widgets only */
-    if ( is_active_widget( 'bp_core_widget_members' ) )
+    if ( is_active_widget( 'bp_core_widget_members' ) ) {
         wp_enqueue_script( 'bp_core_widget_members-js', WPMU_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );      
+        wp_enqueue_style( 'bp_core_widget_members-css', WPMU_PLUGIN_URL . '/bp-core/css/widget-members.css' );
+    }
     
     wp_register_sidebar_widget( 'buddypress-whosonline', __( "Who's Online", 'buddypress' ), 'bp_core_widget_whos_online' );

trunk/bp-core/js/directory-members.js

@@ -11 +11 @@
             letter = letter.split('-');
             
-            var num = ( jQuery('input#members-per-page').val() ) ? jQuery('input#members-per-page').val() : 10;
             var page = ( jQuery('input#members-page-num').val() ) ? jQuery('input#members-page-num').val() : 1;
 
@@ -19 +18 @@
                 '_wpnonce': jQuery("input#_wpnonce-member-filter").val(),
                 'letter': letter[1],
-                'page': page,
-                'num': num
+                'page': page
             },
             function(response)
-            {   
+            {
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    jQuery("#member-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-members').toggle();
-                            jQuery("#member-dir-list").html(response[1]);
-                            jQuery("#member-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {                    
-                    jQuery("ul#members-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-members').toggle();
-                            var message = response[1];
-                            jQuery("#member-dir-list").html(message);
-                            jQuery("#member-dir-list").fadeIn(200);
-                        }
-                    );
-                }
+                
+                jQuery("#member-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-members').toggle();
+                        jQuery("#member-dir-list").html(response);
+                        jQuery("#member-dir-list").fadeIn(200);
+                    }
+                );
             });
         
@@ -55 +40 @@
             jQuery('#ajax-loader-members').toggle();
 
-            var num = ( jQuery('input#members-per-page').val() ) ? jQuery('input#members-per-page').val() : 10;
             var page = ( jQuery('input#members-page-num').val() ) ? jQuery('input#members-page-num').val() : 1;
 
@@ -62 +46 @@
                 'cookie': encodeURIComponent(document.cookie),
                 '_wpnonce': jQuery("input#_wpnonce-member-filter").val(),
-                'members_search': jQuery("input#members_search").val(),
-                'page': page,
-                'num': num
+                's': jQuery("input#members_search").val(),
+                'page': page
             },
             function(response)
             {   
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    
-                    jQuery("#member-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-members').toggle();
-                            jQuery("#member-dir-list").html(response[1]);
-                            jQuery("#member-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {
-                                        
-                    jQuery("#member-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-members').toggle();
-                            var message = response[1];
-                            jQuery("#member-dir-list").html(message);
-                            jQuery("#member-dir-list").fadeIn(200);
-                        }
-                    );
-                    
-                }
+                
+                jQuery("#member-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-members').toggle();
+                        jQuery("#member-dir-list").html(response);
+                        jQuery("#member-dir-list").fadeIn(200);
+                    }
+                );
             });
         
@@ -105 +72 @@
             var page = jQuery(this).attr('href');
             page = page.split('page=');
-
+            
             if ( !jQuery("input#selected_letter").val() )
                 var letter = '';
@@ -115 +82 @@
             else
                 var search_terms = jQuery("input#search_terms").val();
-
-            var num = ( jQuery('input#members-per-page').val() ) ? jQuery('input#members-per-page').val() : 10;
-                
+            
             jQuery.post( ajaxurl, {
                 action: 'directory_members',
@@ -123 +88 @@
                 '_wpnonce': jQuery("input#_wpnonce").val(),
                 'page': page[1],
-                'num': num,
                 '_wpnonce': jQuery("input#_wpnonce-member-filter").val(),
                 
@@ -132 +96 @@
             {   
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    
-                    jQuery("#member-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-members').toggle();
-                            jQuery("#member-dir-list").html(response[1]);
-                            jQuery("#member-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {
-                                        
-                    jQuery("#member-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-members').toggle();
-                            var message = response[1];
-                            jQuery("#member-dir-list").html(message);
-                            jQuery("#member-dir-list").fadeIn(200);
-                        }
-                    );
-                    
-                }           
+                
+                jQuery("#member-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-members').toggle();
+                        jQuery("#member-dir-list").html(response);
+                        jQuery("#member-dir-list").fadeIn(200);
+                    }
+                );
             });
             

trunk/bp-forums.php

@@ -34 +34 @@
     $bp->version_numbers->forums = BP_FORUMS_VERSION;
 }
-add_action( 'wp', 'bp_forums_setup', 3 );
+add_action( 'plugins_loaded', 'bp_forums_setup', 5 );
 add_action( 'admin_head', 'bp_forums_setup', 3 );
 

trunk/bp-friends.php

@@ -74 +74 @@
     $bp->version_numbers->friends = BP_FRIENDS_VERSION;
 }
-add_action( 'wp', 'friends_setup_globals', 1 ); 
+add_action( 'plugins_loaded', 'friends_setup_globals', 5 ); 
 add_action( 'admin_menu', 'friends_setup_globals', 1 );
 

trunk/bp-groups.php

@@ -26 +26 @@
 require ( 'bp-groups/bp-groups-filters.php' );
 require ( 'bp-groups/bp-groups-admin.php' );
-require ( 'bp-groups/directories/bp-groups-directory-groups.php' );
 
 /**************************************************************************
@@ -142 +141 @@
         $bp->groups->table_name_wire = $wpdb->base_prefix . 'bp_groups_wire';
     
-    $bp->groups->forbidden_names = array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' );
+    $bp->groups->forbidden_names = apply_filters( 'groups_forbidden_names', array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' ) );
     $bp->version_numbers->groups = BP_GROUPS_VERSION;
     
     return $bp;
 }
-add_action( 'wp', 'groups_setup_globals', 1, false );   
-add_action( 'admin_menu', 'groups_setup_globals', 1, false );
+add_action( 'plugins_loaded', 'groups_setup_globals', 5 );  
+add_action( 'admin_menu', 'groups_setup_globals', 1 );
 
 function groups_setup_root_component() {
@@ -154 +153 @@
     bp_core_add_root_component( BP_GROUPS_SLUG );
 }
-add_action( 'plugins_loaded', 'groups_setup_root_component' );
+add_action( 'plugins_loaded', 'groups_setup_root_component', 1 );
 
 function groups_check_installed() { 
@@ -169 +168 @@
 }
 add_action( 'admin_menu', 'groups_check_installed' );
-
 
 function groups_add_admin_menu() {
@@ -248 +246 @@
             array_shift($bp->action_variables);
                                     
-            $bp->bp_options_title = bp_create_excerpt( $group_obj->name, 1 );
+            $bp->bp_options_title = $group_obj->name;
             $bp->bp_options_avatar = '<img src="' . $group_obj->avatar_thumb . '" alt="Group Avatar Thumbnail" />';
             
@@ -301 +299 @@
 add_action( 'admin_menu', 'groups_setup_nav', 2 );
 
+function groups_directory_groups_setup() {
+    global $bp;
+    
+    if ( $bp->current_component == $bp->groups->slug && empty( $bp->current_action ) ) {
+        $bp->is_directory = true;
+
+        wp_enqueue_script( 'bp-groups-directory-groups', WPMU_PLUGIN_URL . '/bp-groups/js/directory-groups.js', array( 'jquery', 'jquery-livequery-pack' ) );
+        bp_core_load_template( 'directories/groups/index' );
+    }
+}
+add_action( 'wp', 'groups_directory_groups_setup', 5 );
 
 /***** Screens **********/
@@ -2249 +2258 @@
 
 function groups_force_buddypress_theme( $template ) {
-    global $current_component, $current_action;
-    global $is_member_page, $bp;
-
-    $groups_bp = groups_setup_globals(true);
-    
-    if ( $current_component != $groups_bp->groups->slug )
+    global $bp;
+    
+    if ( $bp->current_component != $bp->groups->slug )
         return $template;
     
@@ -2261 +2267 @@
     if ( empty($member_theme) )
         $member_theme = 'buddypress-member';
-    
-    // The theme filter does not recognize any globals, where as the stylesheet filter does.
-    // We have to set up the globals to use manually.
-    bp_core_set_uri_globals();
-
-    if ( $current_component == $groups_bp->groups->slug )
-        $bp->is_single_item = BP_Groups_Group::group_exists( $current_action, $groups_bp->groups->table_name );
-    
-    if ( $bp->is_single_item ) {
-        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
-        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
-
-        return $member_theme;
-    } else {
-        return $template;
-    }
-    
-    return $theme;
-}
-add_filter( 'template', 'groups_force_buddypress_theme', 1, 1 );
+
+    add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+    add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+
+    return $member_theme;
+}
+add_filter( 'template', 'groups_force_buddypress_theme' );
 
 function groups_force_buddypress_stylesheet( $stylesheet ) {
-    global $bp, $is_member_page, $current_component;
-
-    if ( $current_component != $bp->groups->slug )
+    global $bp;
+
+    if ( $bp->current_component != $bp->groups->slug )
         return $stylesheet;
 
@@ -2293 +2286 @@
         $member_theme = 'buddypress-member';
     
-    if ( $bp->is_single_item ) {
-        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
-        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
-        
-        return $member_theme;
-    } else {
-        return $stylesheet; 
-    }
+    add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+    add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+    
+    return $member_theme;
 }
 add_filter( 'stylesheet', 'groups_force_buddypress_stylesheet', 1, 1 );

trunk/bp-groups/bp-groups-ajax.php

@@ -212 +212 @@
 
     check_ajax_referer('directory_groups');
-    
-    $pag_page = isset( $_POST['page'] ) ? intval( $_POST['page'] ) : 1;
-    $pag_num = isset( $_POST['num'] ) ? intval( $_POST['num'] ) : 10;
-    
-    if ( isset( $_POST['letter'] ) && $_POST['letter'] != '' ) {
-        $groups = BP_Groups_Group::get_by_letter( $_POST['letter'], $pag_num, $pag_page );
-    } else if ( isset ( $_POST['groups_search'] ) && $_POST['groups_search'] != '' ) {
-        $groups = BP_Groups_Group::search_groups( $_POST['groups_search'], $pag_num, $pag_page );
-    } else {
-        $groups = BP_Groups_Group::get_active( $pag_num, $pag_page );
-    }
-    
-    $pag_links = paginate_links( array(
-        'base' => add_query_arg( 'page', '%#%' ),
-        'format' => '',
-        'total' => ceil( $groups['total'] / $pag_num ),
-        'current' => $pag_page,
-        'prev_text' => '«',
-        'next_text' => '»',
-        'mid_size' => 1
-    ));
-    
-    $from_num = intval( ( $pag_page - 1 ) * $pag_num ) + 1;
-    $to_num = ( $from_num + 9 > $groups['total'] ) ? $groups['total'] : $from_num + 9; 
-
-    if ( $groups['groups'] ) {
-        echo '0[[SPLIT]]'; // return valid result.
-        
-        ?>
-        <div id="group-dir-count" class="pag-count">
-            <?php echo sprintf( __( 'Viewing group %d to %d (%d total active groups)', 'buddypress' ), $from_num, $to_num, $groups['total'] ); ?> &nbsp;
-            <img id="ajax-loader-groups" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
-        </div>
-    
-        <div class="pagination-links" id="group-dir-pag">
-            <?php echo $pag_links ?>
-        </div>
-        
-        <?php $counter = 0; ?>
-        <ul id="groups-list" class="item-list">
-        <?php foreach ( $groups['groups'] as $group_id ) : ?>
-            
-            <?php $alt = ( $counter % 2 == 1 ) ? ' class="alt"' : ''; ?>
-            <?php 
-                if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $group_id->group_id, 'bp' ) ) {
-                    $group = new BP_Groups_Group( $group_id->group_id, false, false );
-                    wp_cache_set( 'groups_group_nouserdata_' . $group_id->group_id, $group, 'bp' );
-                }   
-            ?>
-            
-            <li<?php echo $alt ?>>
-                <div class="item-avatar">
-                    <img src="<?php echo $group->avatar_thumb ?>" class="avatar" alt="<?php echo $group->name ?> <?php _e( 'Avatar', 'buddypress' ) ?>" />
-                </div>
-
-                <div class="item">
-                    <div class="item-title"><a href="<?php echo bp_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
-                    <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( groups_get_groupmeta( $group->id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) ?></span></div>
-                    <div class="item-meta desc"><?php echo bp_create_excerpt( $group->description ) ?></div>
-                </div>
-            
-                <div class="action">
-                    <?php bp_group_join_button( $group ) ?>
-                    <div class="meta">
-                        <?php $member_count = groups_get_groupmeta( $group->id, 'total_member_count' ) ?>
-                        <?php echo ucwords($group->status) ?> <?php _e( 'Group', 'buddypress' ) ?> / 
-                        <?php if ( 1 == $member_count ) : ?>
-                            <?php printf( __( '%d member', 'buddypress' ), $member_count ) ?>
-                        <?php else : ?>
-                            <?php printf( __( '%d members', 'buddypress' ), $member_count ) ?>
-                        <?php endif; ?>
-                    </div>
-                </div>
-            
-                <div class="clear"></div>
-            </li>
-            
-            <?php $counter++ ?>
-        <?php endforeach; ?>
-        </ul>   
-    <?php
-    } else {
-        echo "-1[[SPLIT]]<div id='message' class='error'><p>" . __("No groups matched the current filter.", 'buddypress') . '</p></div>';
-    }
-    
-    if ( isset( $_POST['letter'] ) ) {
-        echo '<input type="hidden" id="selected_letter" value="' . $_POST['letter'] . '" name="selected_letter" />';
-    }
-    
-    if ( isset( $_POST['groups_search'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . $_POST['groups_search'] . '" name="search_terms" />';
-    }
-
+
+    load_template( TEMPLATEPATH . '/directories/groups/groups-loop.php' );
 }
 add_action( 'wp_ajax_directory_groups', 'bp_core_ajax_directory_groups' );

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

@@ -1 +1 @@
 <?php
 
-class BP_Groups_Template {
-    var $current_group = -1;
-    var $group_count;
-    var $groups;
-    var $group;
-    
-    var $in_the_loop;
-    
-    var $pag_page;
-    var $pag_num;
-    var $pag_links;
-    var $total_group_count;
-    
-    var $single_group = false;
-    
-    var $sort_by;
-    var $order;
-    
-    function bp_groups_template( $user_id = null, $group_slug = null, $groups_per_page = 10 ) {
-        global $bp, $current_user;
-        
-        if ( !$user_id )
-            $user_id = $current_user->id;
-        
-        $this->pag_page = isset( $_REQUEST['fpage'] ) ? intval( $_REQUEST['fpage'] ) : 1;
-        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $groups_per_page;
-        
-        if ( ( 'my-groups' == $bp->current_action && empty( $_REQUEST['group-filter-box'] ) ) || ( !$bp->current_action && !isset($_REQUEST['page']) && empty( $_REQUEST['group-filter-box'] ) ) ) {
-
-            $order = $bp->action_variables[0];
-            
-            if ( 'recently-joined' == $order ) {
-                $this->groups = groups_get_recently_joined_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
-            } else if ( 'most-popular' == $order ) {
-                $this->groups = groups_get_most_popular_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );               
-            } else if ( 'admin-of' == $order ) {
-                $this->groups = groups_get_user_is_admin_of( $bp->displayed_user->id, $this->pag_num, $this->pag_page );                
-            } else if ( 'mod-of' == $order ) {
-                $this->groups = groups_get_user_is_mod_of( $bp->displayed_user->id, $this->pag_num, $this->pag_page );              
-            } else if ( 'alphabetically' == $order ) {
-                $this->groups = groups_get_alphabetically_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page ); 
-            } else {
-                $this->groups = groups_get_recently_active_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
-            }
-
-            $this->total_group_count = (int)$this->groups['total'];
-            $this->groups = $this->groups['groups'];
-            $this->group_count = count($this->groups);
-        
-        } else if ( ( 'my-groups' == $bp->current_action && $_REQUEST['group-filter-box'] != '' ) || ( !$bp->current_action && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] != '' ) ) {
-
-            $this->groups = groups_filter_user_groups( $_REQUEST['group-filter-box'], $this->pag_num, $this->pag_page );
-            $this->total_group_count = (int)$this->groups['total'];
-            $this->groups = $this->groups['groups'];
-            $this->group_count = count($this->groups);
-        
-        } else if ( 'invites' == $bp->current_action ) {
-        
-            $this->groups = groups_get_invites_for_user();
-            $this->total_group_count = count($this->groups);
-            $this->group_count = count($this->groups);
-        
-        } else if ( isset( $_REQUEST['page'] ) && 'groups_admin_settings' == $_REQUEST['page'] ) {
-            
-            $this->sort_by = $_REQUEST['sortby'];
-            $this->order = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : 'ASC';
-            
-            if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] != '' ) {
-                $this->groups = groups_search_groups( $_REQUEST['s'], $this->pag_num, $this->pag_page, $this->sort_by, $this->order );
-                $this->total_group_count = (int)$this->groups['total'];
-                $this->groups = $this->groups['groups'];
-                $this->group_count = count($this->groups);
-            } else {
-                $this->groups = groups_get_all( $this->pag_num, $this->pag_page, false, $this->sort_by, $this->order );
-                $this->total_group_count = count( groups_get_all() ); // TODO: not ideal
-                $this->group_count = count($this->groups);
-            }
-            
-        } else if ( $group_slug ) {
-            
-            $this->single_group = true;
-            
-            $group = new stdClass;
-            $group->group_id = BP_Groups_Group::get_id_from_slug($group_slug);
-            
-            $this->groups = array( $group );
-            $this->total_group_count = 1;
-            $this->group_count = 1;
-        
-        } else {
-            
-            $this->groups = groups_get_user_groups( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
-            $this->total_group_count = (int)$this->groups['total'];
-            $this->groups = $this->groups['groups'];
-            $this->group_count = count($this->groups);  
-                    
-        }
-        
-        $this->pag_links = paginate_links( array(
-            'base' => add_query_arg( array( 'fpage' => '%#%', 'num' => $this->pag_num, 's' => $_REQUEST['s'], 'sortby' => $this->sort_by, 'order' => $this->order ) ),
-            'format' => '',
-            'total' => ceil($this->total_group_count / $this->pag_num),
-            'current' => $this->pag_page,
-            'prev_text' => '&laquo;',
-            'next_text' => '&raquo;',
-            'mid_size' => 1
-        ));
-        
-    }
-    
-    function has_groups() {
-        if ( $this->group_count )
-            return true;
-        
-        return false;
-    }
-    
-    function next_group() {
-        $this->current_group++;
-        $this->group = $this->groups[$this->current_group];
-            
-        return $this->group;
-    }
-    
-    function rewind_groups() {
-        $this->current_group = -1;
-        if ( $this->group_count > 0 ) {
-            $this->group = $this->groups[0];
-        }
-    }
-    
-    function user_groups() { 
-        if ( $this->current_group + 1 < $this->group_count ) {
-            return true;
-        } elseif ( $this->current_group + 1 == $this->group_count ) {
-            do_action('loop_end');
-            // Do some cleaning up after the loop
-            $this->rewind_groups();
-        }
-
-        $this->in_the_loop = false;
-        return false;
-    }
-    
-    function the_group() {
-        global $group;
-
-        $this->in_the_loop = true;
-        $this->group = $this->next_group();
-        
-        // If this is a single group then instantiate group meta when creating the object.
-        if ( $this->single_group ) {
-            if ( !$group = wp_cache_get( 'groups_group_' . $this->group->group_id, 'bp' ) ) {
-                $group = new BP_Groups_Group( $this->group->group_id, true );
-                wp_cache_set( 'groups_group_' . $this->group->group_id, $group, 'bp' );
-            }
-        } else {
-            if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $this->group->group_id, 'bp' ) ) {
-                $group = new BP_Groups_Group( $this->group->group_id, false, false );
-                wp_cache_set( 'groups_group_nouserdata_' . $this->group->group_id, $group, 'bp' );
-            }
-        }
-        
-        $this->group = $group;
-        
-        if ( 0 == $this->current_group ) // loop has just started
-            do_action('loop_start');
-    }
-}
-
-function bp_has_groups( $groups_per_page = 10 ) {
-    global $groups_template, $bp;
-    global $group_obj;
-    
-    if ( !$bp->is_single_item ) {
-        $groups_template = new BP_Groups_Template( $bp->displayed_user->id, false, $groups_per_page );
-    } else {
-        $groups_template = new BP_Groups_Template( $bp->displayed_user->id, $group_obj->slug, $groups_per_page );       
-    }
-    
-    return $groups_template->has_groups();
-}
-
-function bp_groups() {
-    global $groups_template;
-    return $groups_template->user_groups();
-}
-
-function bp_the_group() {
-    global $groups_template;
-    return $groups_template->the_group();
-}
-
-function bp_group_is_visible( $group = false ) {
-    global $bp, $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-        
-    if ( 'public' == $group->status ) {
-        return true;
-    } else {
-        if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) ) {
-            return true;
-        }
-    }
-    
-    return false;
-}
-
-function bp_group_has_news( $group = false ) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( empty( $group->news ) )
-        return false;
-    
-    return true;
-}
-
-function bp_group_id( $echo = true, $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_group_id', $group->id );
-    else
-        return apply_filters( 'bp_group_id', $group->id );
-}
-
-function bp_group_name( $echo = true, $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $echo )
-        echo apply_filters( 'bp_group_name', $group->name );
-    else
-        return apply_filters( 'bp_group_name', $group->name ); 
-}
-
-function bp_group_type( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( 'public' == $group->status ) {
-        $type = __( "Public Group", "buddypress" );
-    } else if ( 'hidden' == $group->status ) {  
-        $type = __( "Hidden Group", "buddypress" );
-    } else if ( 'private' == $group->status ) {
-        $type = __( "Private Group", "buddypress" );
-    } else {
-        $type = ucwords( $group->status ) . ' ' . __( 'Group', 'buddypress' );
-    }
-    
-    echo apply_filters( 'bp_group_type',  $type );  
-}
-
-function bp_group_avatar( $group = false ) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    ?><img src="<?php echo $group->avatar_full ?>" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
-}
-
-function bp_group_avatar_thumb( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    ?><img src="<?php echo $group->avatar_thumb ?>" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
-}
-
-function bp_group_avatar_mini( $group = false) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    ?><img src="<?php echo $group->avatar_thumb ?>" width="30" height="30" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
-}
-
-function bp_group_last_active( $echo = true, $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    $last_active = groups_get_groupmeta( $group->id, 'last_activity' );
-    
-    if ( empty( $last_active ) )
-        _e( 'not yet active', 'buddypress' );
-    else
-        echo apply_filters( 'bp_group_last_active', bp_core_time_since( $last_active ) );
-}
-
-function bp_group_permalink( $group = false, $echo = true ) {
-    global $groups_template, $bp, $current_blog;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug );
-    else
-        return apply_filters( 'bp_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug );
-}
-
-function bp_group_admin_permalink( $echo = true, $group = false ) {
-    global $groups_template, $bp, $current_blog;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' );
-    else
-        return apply_filters( 'bp_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' ); 
-}
-
-function bp_group_slug( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_slug', $group->slug );
-}
-
-function bp_group_description( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_description', stripslashes($group->description) );
-}
-
-function bp_group_description_editable( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_description_editable', $group->description );
-}
-
-function bp_group_description_excerpt( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_description_excerpt', bp_create_excerpt( $group->description, 20 ) ); 
-}
-
-function bp_group_news( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_news', stripslashes($groups_template->group->news) );
-}
-
-function bp_group_news_editable( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_news_editable', $group->news );
-}
-
-function bp_group_public_status( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $group->is_public ) {
-        _e('Public', 'buddypress');
-    } else {
-        _e('Private', 'buddypress');
-    }
-}
-    function bp_group_is_public( $group = false ) {
-        global $groups_template;
-
-        if ( !$group )
-            $group =& $groups_template->group;
-
-        return apply_filters( 'bp_group_is_public', $group->is_public );
-    }
-
-
-function bp_group_date_created( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_date_created', date( get_option( 'date_format' ), $group->date_created ) );
-}
-
-function bp_group_list_admins( $full_list = true, $group = false ) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( !$admins = &$group->admins )
-        $admins = $group->get_administrators();
-
-    if ( $admins ) {
-        if ( $full_list ) { ?>
-            <ul id="group-admins">
-            <?php for ( $i = 0; $i < count($admins); $i++ ) { ?>
-                <li>
-                    <a href="<?php echo $admins[$i]->user->user_url ?>" title="<?php echo $admins[$i]->user->fullname ?>"><?php echo $admins[$i]->user->avatar_thumb ?></a>
-                    <h5><?php echo $admins[$i]->user->user_link ?></h5>
-                    <span class="activity"><?php echo $admins[$i]->user_title ?></span>
-                    <hr />
-                </li>
-            <?php } ?>
-            </ul>
-        <?php } else { ?>
-            <?php for ( $i = 0; $i < count($admins); $i++ ) { ?>
-                <?php echo $admins[$i]->user->user_link ?>
-            <?php } ?>
-        <?php } ?>
-    <?php } else { ?>
-        <span class="activity"><?php _e( 'No Admins', 'buddypress' ) ?></span>
-    <?php } ?>
-    
+function bp_groups_header_tabs() {
+    global $bp, $create_group_step, $completed_to_step;
+?>
+    <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'recently-joined' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'most-popular' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/most-popular""><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'admin-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/admin-of""><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'mod-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/mod-of""><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+        
 <?php
-}
-
-function bp_group_list_mods( $full_list = true, $group = false ) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    $group_mods = groups_get_group_mods( $group->id );
-    
-    if ( $group_mods ) {
-        if ( $full_list ) { ?>
-            <ul id="group-mods" class="mods-list">
-            <?php for ( $i = 0; $i < count($group_mods); $i++ ) { ?>
-                <li>
-                    <a href="<?php echo bp_core_get_userlink( $group_mods[$i]->user_id, false, true ) ?>" title="<?php echo bp_fetch_user_fullname( $group_mods[$i]->user->user_id ) ?>"><?php echo bp_core_get_avatar( $group_mods[$i]->user_id, 1, 50, 50 ) ?></a>
-                    <h5><?php echo bp_core_get_userlink( $group_mods[$i]->user_id ) ?></h5>
-                    <span class="activity"><?php _e( 'Group Mod', 'buddypress' ) ?></span>
-                    <div class="clear"></div>
-                </li>
-            <?php } ?>
-            </ul>
-        <?php } else { ?>
-            <?php for ( $i = 0; $i < count($admins); $i++ ) { ?>
-                <?php echo bp_core_get_userlink( $group_mods[$i]->user_id ) . ' ' ?>
-            <?php } ?>
-        <?php } ?>
-    <?php } else { ?>
-        <span class="activity"><?php _e( 'No Mods', 'buddypress' ) ?></span>
-    <?php } ?>
-    
-<?php
-}
-
-function bp_group_all_members_permalink( $echo = true, $group = false ) {
-    global $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $echo )
-        echo apply_filters( 'bp_group_all_members_permalink', bp_group_permalink( $group, true ) . '/' . MEMBERS_SLUG );
-    else
-        return apply_filters( 'bp_group_all_members_permalink', bp_group_permalink( $group, false ) . '/' . MEMBERS_SLUG );
-}
-
-function bp_group_random_members( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    $members = &$group->random_members;
-?>  
-    <ul class="horiz-gallery">
-    <?php for ( $i = 0; $i < count( $members ); $i++ ) { ?>
-        <li>
-            <a href="<?php echo $members[$i]->user->user_url ?>"><?php echo $members[$i]->user->avatar_thumb ?></a>
-            <h5><?php echo $members[$i]->user->user_link ?></h5>
-        </li>
-    <?php } ?>
-    </ul>
-    <div class="clear"></div>
-<?php
-}
-
-function bp_group_active_forum_topics( $total_topics = 3, $group = false ) {
-    global $groups_template, $forum_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    $forum_id = groups_get_groupmeta( $group->id, 'forum_id' );
-
-    if ( $forum_id && $forum_id != '' ) {
-        if ( function_exists( 'bp_forums_setup' ) ) {
-            $latest_topics = bp_forums_get_topics( $forum_id, $total_topics, 1 );
-        
-            if ( $latest_topics ) { ?>
-                <ul class="item-list" id="recent-forum-topics"><?php
-                
-                $counter = 0;
-                
-                foreach( $latest_topics as $topic ) {
-                    $alt = ( $counter % 2 == 1 ) ? ' class="alt"' : '';
-                    $forum_template->topic = (object)$topic; ?>
-                    
-                    <li<?php echo $alt ?>>
-                        <div class="avatar">
-                            <?php bp_the_topic_poster_avatar() ?>
-                        </div>
-
-                        <a href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_title() ?></a> 
-                        <span class="small">- <?php bp_the_topic_total_post_count() ?> </span>
-                        <p><span class="activity"><?php echo sprintf( __( 'updated %s ago', 'buddypress' ), bp_the_topic_time_since_last_post( false ) ) ?></span></p>
-                
-                        <div class="latest-post">
-                            <?php _e( 'Latest by', 'buddypress' ) ?> <?php bp_the_topic_last_poster_name() ?>:
-                            <?php bp_the_topic_latest_post_excerpt() ?>
-                        </div>
-                    </li>
-                    <?php $counter++ ?>
-                    
-                <?php } ?>
-                </ul>
-                <?php
-            } else {
-            ?>
-                <div id="message" class="info">
-                    <p><?php _e( 'There are no active forum topics for this group', 'buddypress' ) ?></p>
-                </div>
-            <?php
-            }
-        }
-    }
-}
-
-function bp_group_search_form() {
-    global $groups_template, $bp;
-
-    $action = $bp->loggedin_user->domain . $bp->groups->slug . '/my-groups/search/';
-    $label = __('Filter Groups', 'buddypress');
-    $name = 'group-filter-box';
-?>
-    <form action="<?php echo $action ?>" id="group-search-form" method="post">
-        <label for="<?php echo $name ?>" id="<?php echo $name ?>-label"><?php echo $label ?> <img id="ajax-loader" src="<?php echo $bp->groups->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( 'Loading', 'buddypress' ) ?>" style="display: none;" /></label>
-        <input type="search" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo $value ?>"<?php echo $disabled ?> />
-    
-        <?php wp_nonce_field( 'group-filter-box', '_wpnonce_group_filter' ) ?>
-    </form>
-<?php
-}
-
-function bp_group_show_no_groups_message() {
-    global $bp;
-    
-    if ( !groups_total_groups_for_user( $bp->displayed_user->id ) )
-        return true;
-        
-    return false;
-}
-
-function bp_group_pagination() {
-    global $groups_template;
-    echo apply_filters( 'bp_group_pagination', $groups_template->pag_links );
-}
-
-function bp_total_group_count() {
-    global $groups_template;
-    
-    echo apply_filters( 'bp_total_group_count', $groups_template->total_group_count );
-}
-
-function bp_group_total_members( $echo = true, $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $echo )
-        echo apply_filters( 'groups_template', $group->total_member_count );
-    else
-        return apply_filters( 'groups_template', $group->total_member_count );
-}
-
-function bp_group_is_photos_enabled( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $group->enable_photos )
-        return true;
-    
-    return false;
-}
-
-function bp_group_show_wire_setting( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $group->enable_wire )
-        echo ' checked="checked"';
-}
-
-function bp_group_is_wire_enabled( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $group->enable_wire )
-        return true;
-    
-    return false;
-}
-
-function bp_group_forum_permalink( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo bp_group_permalink( $group, false ) . '/forum';
-}
-
-function bp_group_is_forum_enabled( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( function_exists( 'bp_forums_is_installed_correctly' ) ) {
-        if ( bp_forums_is_installed_correctly() ) {
-            if ( $group->enable_forum )
-                return true;
-            
-            return false;
-        } else {
-            return false;
-        }
-    }
-    
-    return false;   
-}
-
-function bp_group_show_forum_setting( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $group->enable_forum )
-        echo ' checked="checked"';
-}
-
-function bp_group_show_photos_setting( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $group->enable_photos )
-        echo ' checked="checked"';  
-}
-
-function bp_group_show_photos_upload_setting( $permission, $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( 'admin' == $permission && $group->photos_admin_only )
-        echo ' checked="checked"';
-    
-    if ( 'member' == $permission && !$group->photos_admin_only )
-        echo ' checked="checked"';
-}
-
-function bp_group_show_status_setting( $setting, $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( $setting == $group->status )
-        echo ' checked="checked"';
-}
-
-function bp_group_admin_memberlist( $admin_list = false, $group = false ) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    $admins = groups_get_group_admins( $group->id );
-?>
-    <?php if ( $admins ) { ?>
-        <ul id="admins-list" class="item-list<?php if ( $admin_list ) { ?> single-line<?php } ?>">
-        <?php foreach ( $admins as $admin ) { ?>
-            <?php if ( $admin_list ) { ?>
-            <li>
-                <?php echo bp_core_get_avatar( $admin->user_id, 1, 30, 30 ) ?>
-                <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5>
-            </li>
-            <?php } else { ?>
-            <li>
-                <?php echo bp_core_get_avatar( $admin->user_id, 1 ) ?>
-                <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5>
-                <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
-                
-                <?php if ( function_exists( 'friends_install' ) ) : ?>
-                    <div class="action">
-                        <?php bp_add_friend_button( $admin->user_id ) ?>
-                    </div>
-                <?php endif; ?>
-            </li>       
-            <?php } ?>
-        <?php } ?>
-        </ul>
-    <?php } else { ?>
-        <div id="message" class="info">
-            <p><?php _e( 'This group has no administrators', 'buddypress' ); ?></p>
-        </div>
-    <?php }
-}
-
-function bp_group_mod_memberlist( $admin_list = false, $group = false ) {
-    global $groups_template, $group_mods;   
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    $group_mods = groups_get_group_mods( $group->id );
-    ?>
-        <?php if ( $group_mods ) { ?>
-            <ul id="mods-list" class="item-list<?php if ( $admin_list ) { ?> single-line<?php } ?>">
-            <?php foreach ( $group_mods as $mod ) { ?>
-                <?php if ( $admin_list ) { ?>
-                <li>
-                    <?php echo bp_core_get_avatar( $mod->user_id, 1, 30, 30 ) ?>
-                    <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?>  <span class="small"> &mdash; <a href="<?php bp_group_member_ban_link() ?>"><?php _e( 'Kick &amp; Ban', 'buddypress' ) ?></a> | <a href="<?php bp_group_member_demote_link($mod->user_id) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a></span></h5>
-                </li>
-                <?php } else { ?>
-                <li>
-                    <?php echo bp_core_get_avatar( $mod->user_id, 1 ) ?>
-                    <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?></h5>
-                    <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
-                    
-                    <?php if ( function_exists( 'friends_install' ) ) : ?>
-                        <div class="action">
-                            <?php bp_add_friend_button( $mod->user_id ) ?>
-                        </div>
-                    <?php endif; ?>
-                </li>       
-                <?php } ?>          
-            <?php } ?>
-            </ul>
-        <?php } else { ?>
-            <div id="message" class="info">
-                <p><?php _e( 'This group has no moderators', 'buddypress' ); ?></p>
-            </div>
-        <?php }
-}
-
-function bp_group_has_moderators( $group = false ) {
-    global $group_mods, $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    return apply_filters( 'bp_group_has_moderators', groups_get_group_mods( $group->id ) );
-}
-
-function bp_group_member_promote_link( $group = false ) {
-    global $members_template, $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_member_promote_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/promote/' . $members_template->member->user_id, 'groups_promote_member' ) );
-}
-
-function bp_group_member_demote_link( $user_id = false, $group = false ) {
-    global $members_template, $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( !$user_id )
-        $user_id = $members_template->member->user_id;
-    
-    echo apply_filters( 'bp_group_member_demote_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/demote/' . $user_id, 'groups_demote_member' ) );
-}
-
-function bp_group_member_ban_link( $group = false ) {
-    global $members_template, $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_member_ban_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/ban/' . $members_template->member->user_id, 'groups_ban_member' ) );
-}
-
-function bp_group_member_unban_link( $group = false ) {
-    global $members_template, $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_member_unban_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/unban/' . $members_template->member->user_id, 'groups_unban_member' ) );   
-}
-
-function bp_group_admin_tabs( $group = false ) {
-    global $bp, $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    $current_tab = $bp->action_variables[0];
-?>
-    <?php if ( $bp->is_item_admin || $bp->is_item_mod ) { ?>
-        <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/edit-details"><?php _e('Edit Details', 'buddypress') ?></a></li>
-    <?php } ?>
-
-    <?php if ( $bp->is_item_admin ) { ?>    
-        <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/group-settings"><?php _e('Group Settings', 'buddypress') ?></a></li>
-    <?php } ?>
-    
-    <?php if ( $bp->is_item_admin ) { ?>    
-        <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/group-avatar"><?php _e('Group Avatar', 'buddypress') ?></a></li>
-    <?php } ?>
-
-    <?php if ( $bp->is_item_admin ) { ?>            
-        <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>
-    <?php } ?>
-    
-    <?php if ( $bp->is_item_admin && $groups_template->group->status == 'private' ) : ?>
-    <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
-    <?php endif; ?>
-
-    <?php if ( $bp->is_item_admin ) { ?>        
-        <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>
-    <?php } ?>
-    
-<?php
-    do_action( 'groups_admin_tabs' );
-}
-
-function bp_group_form_action( $page, $group = false ) {
-    global $bp, $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_form_action', bp_group_permalink( $group, false ) . '/' . $page );
-}
-
-function bp_group_admin_form_action( $page, $group = false ) {
-    global $bp, $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_admin_form_action', bp_group_permalink( $group, false ) . '/admin/' . $page );
-}
-
-function bp_group_has_requested_membership( $group = false ) {
-    global $bp, $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( groups_check_for_membership_request( $bp->loggedin_user->id, $group->id ) )
-        return true;
-    
-    return false;
-}
-
-function bp_group_is_member( $group = false ) {
-    global $bp, $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) )
-        return true;
-    
-    return false;
-}
-
-function bp_group_accept_invite_link( $group = false ) {
-    global $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_accept_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/accept/' . $group->id, 'groups_accept_invite' ) );  
-}
-
-function bp_group_reject_invite_link( $group = false ) {
-    global $groups_template, $bp;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_reject_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/reject/' . $group->id, 'groups_reject_invite' ) );
-}
-
-function bp_has_friends_to_invite( $group = false ) {
-    global $groups_template, $bp;
-    
-    if ( !function_exists('friends_install') )
-        return false;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( !friends_check_user_has_friends( $bp->loggedin_user->id ) || !friends_count_invitable_friends( $bp->loggedin_user->id, $group->id ) )
-        return false;
-    
-    return true;
-}
-
-function bp_group_leave_confirm_link( $group = false ) {
-    global $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( bp_group_permalink( $group, true ) . '/leave-group/yes', 'groups_leave_group' ) ); 
-}
-
-function bp_group_leave_reject_link( $group = false ) {
-    global $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    echo apply_filters( 'bp_group_leave_reject_link', bp_group_permalink( $group, true ) );
-}
-
-function bp_group_send_invite_form( $group = false ) {
-    global $bp, $groups_template, $invites;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-?>
-    <div class="left-menu">
-        <h4><?php _e( 'Select Friends', 'buddypress' ) ?> <img id="ajax-loader" src="<?php echo $bp->groups->image_base ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></h4>
-        <?php bp_group_list_invite_friends() ?>
-        <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ) ?>
-        <input type="hidden" name="group_id" id="group_id" value="<?php echo $group->id ?>" />
-    </div>
-
-    <div class="main-column">
-        
-        <div id="message" class="info">
-            <p><?php _e('Select people to invite from your friends list.', 'buddypress'); ?></p>
-        </div>
-
-        <?php $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group_obj->id ) ?>
-        
-        <ul id="friend-list" class="item-list">
-            <?php for ( $i = 0; $i < count($invites); $i++ ) {
-                if ( !$user = wp_cache_get( 'bp_user_' . $invites[$i], 'bp' ) ) {
-                    $user = new BP_Core_User( $invites[$i] );
-                    wp_cache_set( 'bp_user_' . $invites[$i], $user, 'bp' );
-                }
-                ?>
-                <li id="uid-<?php echo $user->id ?>">
-                    <?php echo $user->avatar_thumb ?>
-                    <h4><?php echo $user->user_link ?></h4>
-                    <span class="activity"><?php echo $user->last_active ?></span>
-                    <div class="action">
-                        <a class="remove" href="<?php echo wp_nonce_url( site_url( $bp->groups->slug . '/' . $group->id . '/invites/remove/' . $user->id ), 'groups_invite_uninvite_user' ) ?>" id="uid-<?php echo $user->id ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a> 
-                    </div>
-                </li>
-            <?php } // end for ?>
-        </ul>
-        
-        <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ) ?>
-    </div>
-<?php
-}
-
-function bp_group_send_invite_form_action( $group = false ) {
-    global $groups_template, $bp;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    echo apply_filters( 'bp_group_send_invite_form_action', bp_group_permalink( $group, true ) . '/send-invites/send' );
-}
-
-function bp_group_join_button( $group = false ) {
-    global $bp, $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    // If they're not logged in or are banned from the group, no join button.
-    if ( !is_user_logged_in() || groups_is_user_banned( $bp->loggedin_user->id, $group->id ) )
-        return false;
-    
-    echo '<div class="group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
-    
-    switch ( $group->status ) {
-        case 'public':
-            if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) )
-                echo '<a class="leave-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';                                  
-            else
-                echo '<a class="join-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';                    
-        break;
-        
-        case 'private':
-            if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) ) {
-                echo '<a class="leave-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';                                      
-            } else {
-                if ( !bp_group_has_requested_membership( $group ) )
-                    echo '<a class="request-membership" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';        
-                else
-                    echo '<a class="membership-requested" href="' . bp_group_permalink( $group, false ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';               
-            }
-        break;
-    }
-    
-    echo '</div>';
-}
-
-function bp_group_status_message( $group = false ) {
-    global $groups_template;
-    
-    if ( !$group )
-        $group =& $groups_template->group;
-    
-    if ( 'private' == $group->status ) {
-        if ( !bp_group_has_requested_membership() )
-            if ( is_user_logged_in() )
-                _e( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
-            else
-                _e( 'This is a private group. To join you must be a registered site member and request group membership.', 'buddypress' );
-        else 
-            _e( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );          
-    } else {
-        _e( 'This is a hidden group and only invited members can join.', 'buddypress' );
-    }
+    do_action( 'groups_header_tabs' );
 }
 
@@ -1306 +243 @@
 }
 
-function bp_groups_header_tabs() {
-    global $bp, $create_group_step, $completed_to_step;
-?>
-    <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'recently-joined' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'most-popular' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/most-popular""><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'admin-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/admin-of""><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'mod-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/mod-of""><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
-        
-<?php
-    do_action( 'groups_header_tabs' );
-}
-
 function bp_groups_filter_title() {
     global $bp;
@@ -1396 +319 @@
                     <?php bp_group_join_button( $group ) ?>
                     <div class="meta">
-                        <?php $member_count = groups_get_groupmeta( $group->id, 'total_member_count' ) ?>
+                        <?php $member_count = groups_get_groupmeta( $group->id, 'total_group_count' ) ?>
                         <?php echo ucwords($group->status) ?> <?php _e( 'Group', 'buddypress' ) ?> / 
                         <?php if ( 1 == $member_count ) : ?>
@@ -1469 +392 @@
 }
 
-/****
+
+/*****************************************************************************
+ * User Groups Template Class/Tags
+ **/
+
+class BP_Groups_User_Groups_Template {
+    var $current_group = -1;
+    var $group_count;
+    var $groups;
+    var $group;
+    
+    var $in_the_loop;
+    
+    var $pag_page;
+    var $pag_num;
+    var $pag_links;
+    var $total_group_count;
+    
+    var $single_group = false;
+    
+    var $sort_by;
+    var $order;
+    
+    function bp_groups_user_groups_template( $user_id = null, $group_slug = null, $groups_per_page = 10 ) {
+        global $bp, $current_user;
+        
+        if ( !$user_id )
+            $user_id = $current_user->id;
+        
+        $this->pag_page = isset( $_REQUEST['fpage'] ) ? intval( $_REQUEST['fpage'] ) : 1;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $groups_per_page;
+        
+        if ( ( 'my-groups' == $bp->current_action && empty( $_REQUEST['group-filter-box'] ) ) || ( !$bp->current_action && !isset($_REQUEST['page']) && empty( $_REQUEST['group-filter-box'] ) ) ) {
+
+            $order = $bp->action_variables[0];
+            
+            if ( 'recently-joined' == $order ) {
+                $this->groups = groups_get_recently_joined_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
+            } else if ( 'most-popular' == $order ) {
+                $this->groups = groups_get_most_popular_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );               
+            } else if ( 'admin-of' == $order ) {
+                $this->groups = groups_get_user_is_admin_of( $bp->displayed_user->id, $this->pag_num, $this->pag_page );                
+            } else if ( 'mod-of' == $order ) {
+                $this->groups = groups_get_user_is_mod_of( $bp->displayed_user->id, $this->pag_num, $this->pag_page );              
+            } else if ( 'alphabetically' == $order ) {
+                $this->groups = groups_get_alphabetically_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page ); 
+            } else {
+                $this->groups = groups_get_recently_active_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
+            }
+
+            $this->total_group_count = (int)$this->groups['total'];
+            $this->groups = $this->groups['groups'];
+            $this->group_count = count($this->groups);
+        
+        } else if ( ( 'my-groups' == $bp->current_action && $_REQUEST['group-filter-box'] != '' ) || ( !$bp->current_action && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] != '' ) ) {
+
+            $this->groups = groups_filter_user_groups( $_REQUEST['group-filter-box'], $this->pag_num, $this->pag_page );
+            $this->total_group_count = (int)$this->groups['total'];
+            $this->groups = $this->groups['groups'];
+            $this->group_count = count($this->groups);
+        
+        } else if ( 'invites' == $bp->current_action ) {
+        
+            $this->groups = groups_get_invites_for_user();
+            $this->total_group_count = count($this->groups);
+            $this->group_count = count($this->groups);
+        
+        } else if ( isset( $_REQUEST['page'] ) && 'groups_admin_settings' == $_REQUEST['page'] ) {
+            
+            $this->sort_by = $_REQUEST['sortby'];
+            $this->order = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : 'ASC';
+            
+            if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] != '' ) {
+                $this->groups = groups_search_groups( $_REQUEST['s'], $this->pag_num, $this->pag_page, $this->sort_by, $this->order );
+                $this->total_group_count = (int)$this->groups['total'];
+                $this->groups = $this->groups['groups'];
+                $this->group_count = count($this->groups);
+            } else {
+                $this->groups = groups_get_all( $this->pag_num, $this->pag_page, false, $this->sort_by, $this->order );
+                $this->total_group_count = count( groups_get_all() ); // TODO: not ideal
+                $this->group_count = count($this->groups);
+            }
+            
+        } else if ( $group_slug ) {
+            
+            $this->single_group = true;
+            
+            $group = new stdClass;
+            $group->group_id = BP_Groups_Group::get_id_from_slug($group_slug);
+            
+            $this->groups = array( $group );
+            $this->total_group_count = 1;
+            $this->group_count = 1;
+        
+        } else {
+            
+            $this->groups = groups_get_user_groups( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
+            $this->total_group_count = (int)$this->groups['total'];
+            $this->groups = $this->groups['groups'];
+            $this->group_count = count($this->groups);  
+                    
+        }
+        
+        $this->pag_links = paginate_links( array(
+            'base' => add_query_arg( array( 'fpage' => '%#%', 'num' => $this->pag_num, 's' => $_REQUEST['s'], 'sortby' => $this->sort_by, 'order' => $this->order ) ),
+            'format' => '',
+            'total' => ceil($this->total_group_count / $this->pag_num),
+            'current' => $this->pag_page,
+            'prev_text' => '&laquo;',
+            'next_text' => '&raquo;',
+            'mid_size' => 1
+        ));
+        
+    }
+    
+    function has_groups() {
+        if ( $this->group_count )
+            return true;
+        
+        return false;
+    }
+    
+    function next_group() {
+        $this->current_group++;
+        $this->group = $this->groups[$this->current_group];
+            
+        return $this->group;
+    }
+    
+    function rewind_groups() {
+        $this->current_group = -1;
+        if ( $this->group_count > 0 ) {
+            $this->group = $this->groups[0];
+        }
+    }
+    
+    function user_groups() { 
+        if ( $this->current_group + 1 < $this->group_count ) {
+            return true;
+        } elseif ( $this->current_group + 1 == $this->group_count ) {
+            do_action('loop_end');
+            // Do some cleaning up after the loop
+            $this->rewind_groups();
+        }
+
+        $this->in_the_loop = false;
+        return false;
+    }
+    
+    function the_group() {
+        global $group;
+
+        $this->in_the_loop = true;
+        $this->group = $this->next_group();
+        
+        // If this is a single group then instantiate group meta when creating the object.
+        if ( $this->single_group ) {
+            if ( !$group = wp_cache_get( 'groups_group_' . $this->group->group_id, 'bp' ) ) {
+                $group = new BP_Groups_Group( $this->group->group_id, true );
+                wp_cache_set( 'groups_group_' . $this->group->group_id, $group, 'bp' );
+            }
+        } else {
+            if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $this->group->group_id, 'bp' ) ) {
+                $group = new BP_Groups_Group( $this->group->group_id, false, false );
+                wp_cache_set( 'groups_group_nouserdata_' . $this->group->group_id, $group, 'bp' );
+            }
+        }
+        
+        $this->group = $group;
+        
+        if ( 0 == $this->current_group ) // loop has just started
+            do_action('loop_start');
+    }
+}
+
+function bp_has_groups( $groups_per_page = 10 ) {
+    global $groups_template, $bp;
+    global $group_obj;
+    
+    if ( !$bp->is_single_item ) {
+        $groups_template = new BP_Groups_User_Groups_Template( $bp->displayed_user->id, false, $groups_per_page );
+    } else {
+        $groups_template = new BP_Groups_User_Groups_Template( $bp->displayed_user->id, $group_obj->slug, $groups_per_page );       
+    }
+    
+    return $groups_template->has_groups();
+}
+
+function bp_groups() {
+    global $groups_template;
+    return $groups_template->user_groups();
+}
+
+function bp_the_group() {
+    global $groups_template;
+    return $groups_template->the_group();
+}
+
+function bp_group_is_visible( $group = false ) {
+    global $bp, $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+        
+    if ( 'public' == $group->status ) {
+        return true;
+    } else {
+        if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) ) {
+            return true;
+        }
+    }
+    
+    return false;
+}
+
+function bp_group_has_news( $group = false ) {
+    global $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( empty( $group->news ) )
+        return false;
+    
+    return true;
+}
+
+function bp_group_id( $echo = true, $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( $echo )
+        echo apply_filters( 'bp_group_id', $group->id );
+    else
+        return apply_filters( 'bp_group_id', $group->id );
+}
+
+function bp_group_name( $echo = true, $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    if ( $echo )
+        echo apply_filters( 'bp_group_name', $group->name );
+    else
+        return apply_filters( 'bp_group_name', $group->name ); 
+}
+
+function bp_group_type( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( 'public' == $group->status ) {
+        $type = __( "Public Group", "buddypress" );
+    } else if ( 'hidden' == $group->status ) {  
+        $type = __( "Hidden Group", "buddypress" );
+    } else if ( 'private' == $group->status ) {
+        $type = __( "Private Group", "buddypress" );
+    } else {
+        $type = ucwords( $group->status ) . ' ' . __( 'Group', 'buddypress' );
+    }
+    
+    echo apply_filters( 'bp_group_type',  $type );  
+}
+
+function bp_group_avatar( $group = false ) {
+    global $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    ?><img src="<?php echo $group->avatar_full ?>" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
+}
+
+function bp_group_avatar_thumb( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    ?><img src="<?php echo $group->avatar_thumb ?>" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
+}
+
+function bp_group_avatar_mini( $group = false) {
+    global $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    ?><img src="<?php echo $group->avatar_thumb ?>" width="30" height="30" class="avatar" alt="<?php echo $group->name ?> Avatar" /><?php
+}
+
+function bp_group_last_active( $echo = true, $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    $last_active = groups_get_groupmeta( $group->id, 'last_activity' );
+    
+    if ( empty( $last_active ) ) {
+        if ( $echo )
+            _e( 'not yet active', 'buddypress' );
+        else
+            return __( 'not yet active', 'buddypress' );
+    } else {
+        if ( $echo )
+            echo apply_filters( 'bp_group_last_active', bp_core_time_since( $last_active ) );
+        else
+            return apply_filters( 'bp_group_last_active', bp_core_time_since( $last_active ) );         
+    }
+}
+
+function bp_group_permalink( $group = false, $echo = true ) {
+    global $groups_template, $bp, $current_blog;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( $echo )
+        echo apply_filters( 'bp_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug );
+    else
+        return apply_filters( 'bp_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug );
+}
+
+function bp_group_admin_permalink( $echo = true, $group = false ) {
+    global $groups_template, $bp, $current_blog;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( $echo )
+        echo apply_filters( 'bp_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' );
+    else
+        return apply_filters( 'bp_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' ); 
+}
+
+function bp_group_slug( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    echo apply_filters( 'bp_group_slug', $group->slug );
+}
+
+function bp_group_description( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    echo apply_filters( 'bp_group_description', stripslashes($group->description) );
+}
+
+function bp_group_description_editable( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_description_editable', $group->description );
+}
+
+function bp_group_description_excerpt( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_description_excerpt', bp_create_excerpt( $group->description, 20 ) ); 
+}
+
+function bp_group_news( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    echo apply_filters( 'bp_group_news', stripslashes($groups_template->group->news) );
+}
+
+function bp_group_news_editable( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    echo apply_filters( 'bp_group_news_editable', $group->news );
+}
+
+function bp_group_public_status( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    if ( $group->is_public ) {
+        _e('Public', 'buddypress');
+    } else {
+        _e('Private', 'buddypress');
+    }
+}
+    function bp_group_is_public( $group = false ) {
+        global $groups_template;
+
+        if ( !$group )
+            $group =& $groups_template->group;
+
+        return apply_filters( 'bp_group_is_public', $group->is_public );
+    }
+
+
+function bp_group_date_created( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_date_created', date( get_option( 'date_format' ), $group->date_created ) );
+}
+
+function bp_group_list_admins( $full_list = true, $group = false ) {
+    global $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( !$admins = &$group->admins )
+        $admins = $group->get_administrators();
+
+    if ( $admins ) {
+        if ( $full_list ) { ?>
+            <ul id="group-admins">
+            <?php for ( $i = 0; $i < count($admins); $i++ ) { ?>
+                <li>
+                    <a href="<?php echo $admins[$i]->user->user_url ?>" title="<?php echo $admins[$i]->user->fullname ?>"><?php echo $admins[$i]->user->avatar_thumb ?></a>
+                    <h5><?php echo $admins[$i]->user->user_link ?></h5>
+                    <span class="activity"><?php echo $admins[$i]->user_title ?></span>
+                    <hr />
+                </li>
+            <?php } ?>
+            </ul>
+        <?php } else { ?>
+            <?php for ( $i = 0; $i < count($admins); $i++ ) { ?>
+                <?php echo $admins[$i]->user->user_link ?>
+            <?php } ?>
+        <?php } ?>
+    <?php } else { ?>
+        <span class="activity"><?php _e( 'No Admins', 'buddypress' ) ?></span>
+    <?php } ?>
+    
+<?php
+}
+
+function bp_group_list_mods( $full_list = true, $group = false ) {
+    global $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    $group_mods = groups_get_group_mods( $group->id );
+    
+    if ( $group_mods ) {
+        if ( $full_list ) { ?>
+            <ul id="group-mods" class="mods-list">
+            <?php for ( $i = 0; $i < count($group_mods); $i++ ) { ?>
+                <li>
+                    <a href="<?php echo bp_core_get_userlink( $group_mods[$i]->user_id, false, true ) ?>" title="<?php echo bp_fetch_user_fullname( $group_mods[$i]->user->user_id ) ?>"><?php echo bp_core_get_avatar( $group_mods[$i]->user_id, 1, 50, 50 ) ?></a>
+                    <h5><?php echo bp_core_get_userlink( $group_mods[$i]->user_id ) ?></h5>
+                    <span class="activity"><?php _e( 'Group Mod', 'buddypress' ) ?></span>
+                    <div class="clear"></div>
+                </li>
+            <?php } ?>
+            </ul>
+        <?php } else { ?>
+            <?php for ( $i = 0; $i < count($admins); $i++ ) { ?>
+                <?php echo bp_core_get_userlink( $group_mods[$i]->user_id ) . ' ' ?>
+            <?php } ?>
+        <?php } ?>
+    <?php } else { ?>
+        <span class="activity"><?php _e( 'No Mods', 'buddypress' ) ?></span>
+    <?php } ?>
+    
+<?php
+}
+
+function bp_group_all_members_permalink( $echo = true, $group = false ) {
+    global $groups_template, $bp;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( $echo )
+        echo apply_filters( 'bp_group_all_members_permalink', bp_group_permalink( $group, true ) . '/' . MEMBERS_SLUG );
+    else
+        return apply_filters( 'bp_group_all_members_permalink', bp_group_permalink( $group, false ) . '/' . MEMBERS_SLUG );
+}
+
+function bp_group_random_members( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    $members = &$group->random_members;
+?>  
+    <ul class="horiz-gallery">
+    <?php for ( $i = 0; $i < count( $members ); $i++ ) { ?>
+        <li>
+            <a href="<?php echo $members[$i]->user->user_url ?>"><?php echo $members[$i]->user->avatar_thumb ?></a>
+            <h5><?php echo $members[$i]->user->user_link ?></h5>
+        </li>
+    <?php } ?>
+    </ul>
+    <div class="clear"></div>
+<?php
+}
+
+function bp_group_active_forum_topics( $total_topics = 3, $group = false ) {
+    global $groups_template, $forum_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    $forum_id = groups_get_groupmeta( $group->id, 'forum_id' );
+
+    if ( $forum_id && $forum_id != '' ) {
+        if ( function_exists( 'bp_forums_setup' ) ) {
+            $latest_topics = bp_forums_get_topics( $forum_id, $total_topics, 1 );
+        
+            if ( $latest_topics ) { ?>
+                <ul class="item-list" id="recent-forum-topics"><?php
+                
+                $counter = 0;
+                
+                foreach( $latest_topics as $topic ) {
+                    $alt = ( $counter % 2 == 1 ) ? ' class="alt"' : '';
+                    $forum_template->topic = (object)$topic; ?>
+                    
+                    <li<?php echo $alt ?>>
+                        <div class="avatar">
+                            <?php bp_the_topic_poster_avatar() ?>
+                        </div>
+
+                        <a href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_title() ?></a> 
+                        <span class="small">- <?php bp_the_topic_total_post_count() ?> </span>
+                        <p><span class="activity"><?php echo sprintf( __( 'updated %s ago', 'buddypress' ), bp_the_topic_time_since_last_post( false ) ) ?></span></p>
+                
+                        <div class="latest-post">
+                            <?php _e( 'Latest by', 'buddypress' ) ?> <?php bp_the_topic_last_poster_name() ?>:
+                            <?php bp_the_topic_latest_post_excerpt() ?>
+                        </div>
+                    </li>
+                    <?php $counter++ ?>
+                    
+                <?php } ?>
+                </ul>
+                <?php
+            } else {
+            ?>
+                <div id="message" class="info">
+                    <p><?php _e( 'There are no active forum topics for this group', 'buddypress' ) ?></p>
+                </div>
+            <?php
+            }
+        }
+    }
+}
+
+function bp_group_search_form() {
+    global $groups_template, $bp;
+
+    $action = $bp->loggedin_user->domain . $bp->groups->slug . '/my-groups/search/';
+    $label = __('Filter Groups', 'buddypress');
+    $name = 'group-filter-box';
+?>
+    <form action="<?php echo $action ?>" id="group-search-form" method="post">
+        <label for="<?php echo $name ?>" id="<?php echo $name ?>-label"><?php echo $label ?> <img id="ajax-loader" src="<?php echo $bp->groups->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( 'Loading', 'buddypress' ) ?>" style="display: none;" /></label>
+        <input type="search" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo $value ?>"<?php echo $disabled ?> />
+    
+        <?php wp_nonce_field( 'group-filter-box', '_wpnonce_group_filter' ) ?>
+    </form>
+<?php
+}
+
+function bp_group_show_no_groups_message() {
+    global $bp;
+    
+    if ( !groups_total_groups_for_user( $bp->displayed_user->id ) )
+        return true;
+        
+    return false;
+}
+
+function bp_group_pagination() {
+    global $groups_template;
+    echo apply_filters( 'bp_group_pagination', $groups_template->pag_links );
+}
+
+function bp_total_group_count() {
+    global $groups_template;
+    
+    echo apply_filters( 'bp_total_group_count', $groups_template->total_group_count );
+}
+
+function bp_group_total_members( $echo = true, $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    if ( $echo )
+        echo apply_filters( 'groups_template', $group->total_group_count );
+    else
+        return apply_filters( 'groups_template', $group->total_group_count );
+}
+
+function bp_group_is_photos_enabled( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    if ( $group->enable_photos )
+        return true;
+    
+    return false;
+}
+
+function bp_group_show_wire_setting( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    if ( $group->enable_wire )
+        echo ' checked="checked"';
+}
+
+function bp_group_is_wire_enabled( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( $group->enable_wire )
+        return true;
+    
+    return false;
+}
+
+function bp_group_forum_permalink( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    echo bp_group_permalink( $group, false ) . '/forum';
+}
+
+function bp_group_is_forum_enabled( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    if ( function_exists( 'bp_forums_is_installed_correctly' ) ) {
+        if ( bp_forums_is_installed_correctly() ) {
+            if ( $group->enable_forum )
+                return true;
+            
+            return false;
+        } else {
+            return false;
+        }
+    }
+    
+    return false;   
+}
+
+function bp_group_show_forum_setting( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( $group->enable_forum )
+        echo ' checked="checked"';
+}
+
+function bp_group_show_photos_setting( $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( $group->enable_photos )
+        echo ' checked="checked"';  
+}
+
+function bp_group_show_photos_upload_setting( $permission, $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( 'admin' == $permission && $group->photos_admin_only )
+        echo ' checked="checked"';
+    
+    if ( 'member' == $permission && !$group->photos_admin_only )
+        echo ' checked="checked"';
+}
+
+function bp_group_show_status_setting( $setting, $group = false ) {
+    global $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( $setting == $group->status )
+        echo ' checked="checked"';
+}
+
+function bp_group_admin_memberlist( $admin_list = false, $group = false ) {
+    global $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    $admins = groups_get_group_admins( $group->id );
+?>
+    <?php if ( $admins ) { ?>
+        <ul id="admins-list" class="item-list<?php if ( $admin_list ) { ?> single-line<?php } ?>">
+        <?php foreach ( $admins as $admin ) { ?>
+            <?php if ( $admin_list ) { ?>
+            <li>
+                <?php echo bp_core_get_avatar( $admin->user_id, 1, 30, 30 ) ?>
+                <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5>
+            </li>
+            <?php } else { ?>
+            <li>
+                <?php echo bp_core_get_avatar( $admin->user_id, 1 ) ?>
+                <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5>
+                <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
+                
+                <?php if ( function_exists( 'friends_install' ) ) : ?>
+                    <div class="action">
+                        <?php bp_add_friend_button( $admin->user_id ) ?>
+                    </div>
+                <?php endif; ?>
+            </li>       
+            <?php } ?>
+        <?php } ?>
+        </ul>
+    <?php } else { ?>
+        <div id="message" class="info">
+            <p><?php _e( 'This group has no administrators', 'buddypress' ); ?></p>
+        </div>
+    <?php }
+}
+
+function bp_group_mod_memberlist( $admin_list = false, $group = false ) {
+    global $groups_template, $group_mods;   
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    $group_mods = groups_get_group_mods( $group->id );
+    ?>
+        <?php if ( $group_mods ) { ?>
+            <ul id="mods-list" class="item-list<?php if ( $admin_list ) { ?> single-line<?php } ?>">
+            <?php foreach ( $group_mods as $mod ) { ?>
+                <?php if ( $admin_list ) { ?>
+                <li>
+                    <?php echo bp_core_get_avatar( $mod->user_id, 1, 30, 30 ) ?>
+                    <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?>  <span class="small"> &mdash; <a href="<?php bp_group_member_ban_link() ?>"><?php _e( 'Kick &amp; Ban', 'buddypress' ) ?></a> | <a href="<?php bp_group_member_demote_link($mod->user_id) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a></span></h5>
+                </li>
+                <?php } else { ?>
+                <li>
+                    <?php echo bp_core_get_avatar( $mod->user_id, 1 ) ?>
+                    <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?></h5>
+                    <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
+                    
+                    <?php if ( function_exists( 'friends_install' ) ) : ?>
+                        <div class="action">
+                            <?php bp_add_friend_button( $mod->user_id ) ?>
+                        </div>
+                    <?php endif; ?>
+                </li>       
+                <?php } ?>          
+            <?php } ?>
+            </ul>
+        <?php } else { ?>
+            <div id="message" class="info">
+                <p><?php _e( 'This group has no moderators', 'buddypress' ); ?></p>
+            </div>
+        <?php }
+}
+
+function bp_group_has_moderators( $group = false ) {
+    global $group_mods, $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    return apply_filters( 'bp_group_has_moderators', groups_get_group_mods( $group->id ) );
+}
+
+function bp_group_member_promote_link( $group = false ) {
+    global $members_template, $groups_template, $bp;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    echo apply_filters( 'bp_group_member_promote_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/promote/' . $members_template->member->user_id, 'groups_promote_member' ) );
+}
+
+function bp_group_member_demote_link( $user_id = false, $group = false ) {
+    global $members_template, $groups_template, $bp;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( !$user_id )
+        $user_id = $members_template->member->user_id;
+    
+    echo apply_filters( 'bp_group_member_demote_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/demote/' . $user_id, 'groups_demote_member' ) );
+}
+
+function bp_group_member_ban_link( $group = false ) {
+    global $members_template, $groups_template, $bp;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_member_ban_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/ban/' . $members_template->member->user_id, 'groups_ban_member' ) );
+}
+
+function bp_group_member_unban_link( $group = false ) {
+    global $members_template, $groups_template, $bp;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_member_unban_link', wp_nonce_url( bp_group_permalink( $group, false ) . '/admin/manage-members/unban/' . $members_template->member->user_id, 'groups_unban_member' ) );   
+}
+
+function bp_group_admin_tabs( $group = false ) {
+    global $bp, $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    $current_tab = $bp->action_variables[0];
+?>
+    <?php if ( $bp->is_item_admin || $bp->is_item_mod ) { ?>
+        <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/edit-details"><?php _e('Edit Details', 'buddypress') ?></a></li>
+    <?php } ?>
+
+    <?php if ( $bp->is_item_admin ) { ?>    
+        <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/group-settings"><?php _e('Group Settings', 'buddypress') ?></a></li>
+    <?php } ?>
+    
+    <?php if ( $bp->is_item_admin ) { ?>    
+        <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/group-avatar"><?php _e('Group Avatar', 'buddypress') ?></a></li>
+    <?php } ?>
+
+    <?php if ( $bp->is_item_admin ) { ?>            
+        <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>
+    <?php } ?>
+    
+    <?php if ( $bp->is_item_admin && $groups_template->group->status == 'private' ) : ?>
+    <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
+    <?php endif; ?>
+
+    <?php if ( $bp->is_item_admin ) { ?>        
+        <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>
+    <?php } ?>
+    
+<?php
+    do_action( 'groups_admin_tabs' );
+}
+
+function bp_group_form_action( $page, $group = false ) {
+    global $bp, $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_form_action', bp_group_permalink( $group, false ) . '/' . $page );
+}
+
+function bp_group_admin_form_action( $page, $group = false ) {
+    global $bp, $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_admin_form_action', bp_group_permalink( $group, false ) . '/admin/' . $page );
+}
+
+function bp_group_has_requested_membership( $group = false ) {
+    global $bp, $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( groups_check_for_membership_request( $bp->loggedin_user->id, $group->id ) )
+        return true;
+    
+    return false;
+}
+
+function bp_group_is_member( $group = false ) {
+    global $bp, $groups_template;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) )
+        return true;
+    
+    return false;
+}
+
+function bp_group_accept_invite_link( $group = false ) {
+    global $groups_template, $bp;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_accept_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/accept/' . $group->id, 'groups_accept_invite' ) );  
+}
+
+function bp_group_reject_invite_link( $group = false ) {
+    global $groups_template, $bp;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_reject_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/reject/' . $group->id, 'groups_reject_invite' ) );
+}
+
+function bp_has_friends_to_invite( $group = false ) {
+    global $groups_template, $bp;
+    
+    if ( !function_exists('friends_install') )
+        return false;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( !friends_check_user_has_friends( $bp->loggedin_user->id ) || !friends_count_invitable_friends( $bp->loggedin_user->id, $group->id ) )
+        return false;
+    
+    return true;
+}
+
+function bp_group_leave_confirm_link( $group = false ) {
+    global $groups_template, $bp;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( bp_group_permalink( $group, true ) . '/leave-group/yes', 'groups_leave_group' ) ); 
+}
+
+function bp_group_leave_reject_link( $group = false ) {
+    global $groups_template, $bp;
+
+    if ( !$group )
+        $group =& $groups_template->group;
+
+    echo apply_filters( 'bp_group_leave_reject_link', bp_group_permalink( $group, true ) );
+}
+
+function bp_group_send_invite_form( $group = false ) {
+    global $bp, $groups_template, $invites;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+?>
+    <div class="left-menu">
+        <h4><?php _e( 'Select Friends', 'buddypress' ) ?> <img id="ajax-loader" src="<?php echo $bp->groups->image_base ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></h4>
+        <?php bp_group_list_invite_friends() ?>
+        <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ) ?>
+        <input type="hidden" name="group_id" id="group_id" value="<?php echo $group->id ?>" />
+    </div>
+
+    <div class="main-column">
+        
+        <div id="message" class="info">
+            <p><?php _e('Select people to invite from your friends list.', 'buddypress'); ?></p>
+        </div>
+
+        <?php $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group_obj->id ) ?>
+        
+        <ul id="friend-list" class="item-list">
+            <?php for ( $i = 0; $i < count($invites); $i++ ) {
+                if ( !$user = wp_cache_get( 'bp_user_' . $invites[$i], 'bp' ) ) {
+                    $user = new BP_Core_User( $invites[$i] );
+                    wp_cache_set( 'bp_user_' . $invites[$i], $user, 'bp' );
+                }
+                ?>
+                <li id="uid-<?php echo $user->id ?>">
+                    <?php echo $user->avatar_thumb ?>
+                    <h4><?php echo $user->user_link ?></h4>
+                    <span class="activity"><?php echo $user->last_active ?></span>
+                    <div class="action">
+                        <a class="remove" href="<?php echo wp_nonce_url( site_url( $bp->groups->slug . '/' . $group->id . '/invites/remove/' . $user->id ), 'groups_invite_uninvite_user' ) ?>" id="uid-<?php echo $user->id ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a> 
+                    </div>
+                </li>
+            <?php } // end for ?>
+        </ul>
+        
+        <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ) ?>
+    </div>
+<?php
+}
+
+function bp_group_send_invite_form_action( $group = false ) {
+    global $groups_template, $bp;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    echo apply_filters( 'bp_group_send_invite_form_action', bp_group_permalink( $group, true ) . '/send-invites/send' );
+}
+
+function bp_group_join_button( $group = false ) {
+    global $bp, $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    // If they're not logged in or are banned from the group, no join button.
+    if ( !is_user_logged_in() || groups_is_user_banned( $bp->loggedin_user->id, $group->id ) )
+        return false;
+    
+    echo '<div class="group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
+    
+    switch ( $group->status ) {
+        case 'public':
+            if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) )
+                echo '<a class="leave-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';                                  
+            else
+                echo '<a class="join-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';                    
+        break;
+        
+        case 'private':
+            if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) ) {
+                echo '<a class="leave-group" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';                                      
+            } else {
+                if ( !bp_group_has_requested_membership( $group ) )
+                    echo '<a class="request-membership" href="' . wp_nonce_url( bp_group_permalink( $group, false ) . '/request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';        
+                else
+                    echo '<a class="membership-requested" href="' . bp_group_permalink( $group, false ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';               
+            }
+        break;
+    }
+    
+    echo '</div>';
+}
+
+function bp_group_status_message( $group = false ) {
+    global $groups_template;
+    
+    if ( !$group )
+        $group =& $groups_template->group;
+    
+    if ( 'private' == $group->status ) {
+        if ( !bp_group_has_requested_membership() )
+            if ( is_user_logged_in() )
+                _e( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
+            else
+                _e( 'This is a private group. To join you must be a registered site member and request group membership.', 'buddypress' );
+        else 
+            _e( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );          
+    } else {
+        _e( 'This is a hidden group and only invited members can join.', 'buddypress' );
+    }
+}
+
+
+/***************************************************************************
  * Group Members Template Tags
  **/
@@ -1484 +1497 @@
     var $pag_num;
     var $pag_links;
-    var $total_member_count;
+    var $total_group_count;
     
     function bp_groups_group_members_template( $group_id, $num_per_page, $exclude_admins_mods, $exclude_banned ) {
@@ -1494 +1507 @@
         $members = BP_Groups_Member::get_all_for_group( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned );
         
-        $this->total_member_count = $members['count'];
+        $this->total_group_count = $members['count'];
         $this->members = $members['members'];
         
@@ -1502 +1515 @@
             'base' => add_query_arg( 'mlpage', '%#%' ),
             'format' => '',
-            'total' => ceil( $this->total_member_count / $this->pag_num ),
+            'total' => ceil( $this->total_group_count / $this->pag_num ),
             'current' => $this->pag_page,
             'prev_text' => '&laquo;',
@@ -1632 +1645 @@
     global $members_template;
 
-    if ( $members_template->total_member_count > $members_template->pag_num )
+    if ( $members_template->total_group_count > $members_template->pag_num )
         return true;
     
@@ -1655 +1668 @@
     
     $from_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
-    $to_num = ( $from_num + 4 > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + 4; 
-
-    echo apply_filters( 'bp_group_reject_invite_link', sprintf( __( 'Viewing members %d to %d (%d total members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count ) );  
+    $to_num = ( $from_num + 4 > $members_template->total_group_count ) ? $members_template->total_group_count : $from_num + 4; 
+
+    echo apply_filters( 'bp_group_reject_invite_link', sprintf( __( 'Viewing members %d to %d (%d total members)', 'buddypress' ), $from_num, $to_num, $members_template->total_group_count ) );  
 }
 
@@ -1666 +1679 @@
 }
 
-
-/****
+/********************************************************************************
+ * Site Groups Template Tags
+ **/
+
+class BP_Groups_Site_Groups_Template {
+    var $current_group = -1;
+    var $group_count;
+    var $groups;
+    var $group;
+    
+    var $in_the_loop;
+    
+    var $pag_page;
+    var $pag_num;
+    var $pag_links;
+    var $total_group_count;
+    
+    function bp_groups_site_groups_template( $type, $per_page, $max ) {
+        global $bp;
+
+        $this->pag_page = isset( $_REQUEST['page'] ) ? intval( $_REQUEST['page'] ) : 1;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+                
+        if ( isset( $_REQUEST['s'] ) && '' != $_REQUEST['s'] && $type != 'random' ) {
+            $this->groups = BP_Groups_Group::search_groups( $_REQUEST['s'], $this->pag_num, $this->pag_page );
+        } else if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
+            $this->groups = BP_Groups_Group::get_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
+        } else {
+            switch ( $type ) {
+                case 'random':
+                    $this->groups = BP_Groups_Group::get_random( $this->pag_num, $this->pag_page );
+                    break;
+                
+                case 'newest':
+                    $this->groups = BP_Groups_Group::get_newest( $this->pag_num, $this->pag_page );
+                    break;
+
+                case 'popular':
+                    $this->groups = BP_Groups_Group::get_popular( $this->pag_num, $this->pag_page );
+                    break;  
+                
+                case 'active': default:
+                    $this->groups = BP_Groups_Group::get_active( $this->pag_num, $this->pag_page );
+                    break;                  
+            }
+        }
+        
+        if ( !$max )
+            $this->total_group_count = (int)$this->groups['total'];
+        else
+            $this->total_group_count = (int)$max;
+
+        $this->groups = $this->groups['groups'];
+        $this->group_count = count($this->groups);
+
+        $this->pag_links = paginate_links( array(
+            'base' => add_query_arg( 'page', '%#%' ),
+            'format' => '',
+            'total' => ceil( (int) $this->total_group_count / (int) $this->pag_num ),
+            'current' => (int) $this->pag_page,
+            'prev_text' => '&laquo;',
+            'next_text' => '&raquo;',
+            'mid_size' => 1
+        ));     
+    }
+    
+    function has_groups() {
+        if ( $this->group_count )
+            return true;
+        
+        return false;
+    }
+    
+    function next_group() {
+        $this->current_group++;
+        $this->group = $this->groups[$this->current_group];
+        
+        return $this->group;
+    }
+    
+    function rewind_groups() {
+        $this->current_group = -1;
+        if ( $this->group_count > 0 ) {
+            $this->group = $this->groups[0];
+        }
+    }
+    
+    function groups() { 
+        if ( $this->current_group + 1 < $this->group_count ) {
+            return true;
+        } elseif ( $this->current_group + 1 == $this->group_count ) {
+            do_action('loop_end');
+            // Do some cleaning up after the loop
+            $this->rewind_groups();
+        }
+
+        $this->in_the_loop = false;
+        return false;
+    }
+    
+    function the_group() {
+        global $group;
+
+        $this->in_the_loop = true;
+        $this->group = $this->next_group();
+        
+        if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $this->group->group_id, 'bp' ) ) {
+            $group = new BP_Groups_Group( $this->group->group_id, false, false );
+            wp_cache_set( 'groups_group_nouserdata_' . $this->group->group_id, $group, 'bp' );
+        }
+        
+        $this->group = $group;
+        
+        if ( 0 == $this->current_group ) // loop has just started
+            do_action('loop_start');
+    }
+}
+
+function bp_rewind_site_groups() {
+    global $site_groups_template;
+    
+    $site_groups_template->rewind_groups(); 
+}
+
+function bp_has_site_groups( $args = '' ) {
+    global $site_groups_template;
+
+    $defaults = array(
+        'type' => 'active',
+        'per_page' => 10,
+        'max' => false
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    
+    // type: active ( default ) | random | newest | popular
+    
+    if ( $max ) {
+        if ( $per_page > $max )
+            $per_page = $max;
+    }
+        
+    $site_groups_template = new BP_Groups_Site_Groups_Template( $type, $per_page, $max );
+
+    return $site_groups_template->has_groups();
+}
+
+function bp_site_groups() {
+    global $site_groups_template;
+    
+    return $site_groups_template->groups();
+}
+
+function bp_the_site_group() {
+    global $site_groups_template;
+    
+    return $site_groups_template->the_group();
+}
+
+function bp_site_groups_pagination_count() {
+    global $bp, $site_groups_template;
+    
+    $from_num = intval( ( $site_groups_template->pag_page - 1 ) * $site_groups_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $site_groups_template->pag_num - 1 ) > $site_groups_template->total_group_count ) ? $site_groups_template->total_group_count : $from_num + ( $site_groups_template->pag_num - 1) ;
+
+    echo sprintf( __( 'Viewing group %d to %d (of %d groups)', 'buddypress' ), $from_num, $to_num, $site_groups_template->total_group_count ); ?> &nbsp;
+    <img id="ajax-loader-groups" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" /><?php
+}
+
+function bp_site_groups_pagination_links() {
+    global $site_groups_template;
+    echo $site_groups_template->pag_links;
+}
+
+function bp_the_site_group_avatar() {
+    global $site_groups_template;
+    echo bp_group_avatar( $site_groups_template->group );
+}
+
+function bp_the_site_group_avatar_thumb() {
+    global $site_groups_template;
+    echo bp_group_avatar_thumb( $site_groups_template->group );
+}
+
+function bp_the_site_group_avatar_mini() {
+    global $site_groups_template;
+    echo bp_group_avatar_mini( $site_groups_template->group );
+}
+
+function bp_the_site_group_link() {
+    global $site_groups_template;
+    echo bp_group_permalink( $site_groups_template->group );
+}
+
+function bp_the_site_group_name() {
+    global $site_groups_template;
+    echo bp_group_name( true, $site_groups_template->group );
+}
+
+function bp_the_site_group_last_active() {
+    global $site_groups_template;
+    
+    printf( __( 'active %s ago', 'buddypress' ), bp_group_last_active( false, $site_groups_template->group ) );
+}
+
+function bp_the_site_group_join_button() {
+    global $site_groups_template;
+    
+    echo bp_group_join_button( $site_groups_template->group );
+}
+
+function bp_the_site_group_description() {
+    global $site_groups_template;
+
+    echo bp_group_description( $site_groups_template->group );  
+}
+
+function bp_the_site_group_member_count() {
+    global $site_groups_template;
+
+    if ( 1 == (int) $site_groups_template->group->total_member_count )
+        printf( '%d member', (int) $site_groups_template->group->total_member_count );
+    else
+        printf( '%d members', (int) $site_groups_template->group->total_member_count );     
+}
+
+function bp_the_site_group_type() {
+    global $site_groups_template;
+    
+    echo bp_group_type( $site_groups_template->group );
+}
+
+
+function bp_the_site_group_hidden_fields() {
+    if ( isset( $_REQUEST['s'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
+    
+    if ( isset( $_REQUEST['letter'] ) ) {
+        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_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" />';
+    }
+}
+
+function bp_directory_groups_search_form() {
+    global $bp; ?>
+    <form action="<?php echo $bp->root_domain . '/' . groups_SLUG  . '/search/' ?>" method="post" id="search-groups-form">
+        <label><input type="text" name="groups_search" id="groups_search" value="<?php if ( isset( $_GET['s'] ) ) { echo attribute_escape( $_GET['s'] ); } else { _e( 'Search anything...', 'buddypress' ); } ?>"  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>
+<?php
+}
+
+/************************************************************************************
  * Membership Requests Template Tags
  **/
@@ -1809 +2078 @@
 }
 
+
+
+
 ?>

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

@@ -10 +10 @@
     
     /* Include the javascript needed for activated widgets only */
-    if ( is_active_widget( 'groups_widget_groups_list' ) )
+    if ( is_active_widget( 'groups_widget_groups_list' ) ) {
         wp_enqueue_script( 'groups_widget_groups_list-js', WPMU_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array('jquery', 'jquery-livequery-pack') );      
+        wp_enqueue_style( 'groups_widget_members-css', WPMU_PLUGIN_URL . '/bp-groups/css/widget-groups.css' );      
+    }
 }
 add_action( 'plugins_loaded', 'groups_register_widgets' );

trunk/bp-groups/js/directory-groups.js

@@ -16 +16 @@
                 '_wpnonce': jQuery("input#_wpnonce-group-filter").val(),
                 'letter': letter[1],
-                'page': 1,
-                'num': 10
+                'page': 1
             },
             function(response)
             {   
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    jQuery("#group-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-groups').toggle();
-                            jQuery("#group-dir-list").html(response[1]);
-                            jQuery("#group-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {                    
-                    jQuery("ul#groups-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-groups').toggle();
-                            var message = response[1];
-                            jQuery("#group-dir-list").html(message);
-                            jQuery("#group-dir-list").fadeIn(200);
-                        }
-                    );
-                }
+                jQuery("#group-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-groups').toggle();
+                        jQuery("#group-dir-list").html(response);
+                        jQuery("#group-dir-list").fadeIn(200);
+                    }
+                );
             });
         
@@ -56 +41 @@
                 'cookie': encodeURIComponent(document.cookie),
                 '_wpnonce': jQuery("input#_wpnonce-group-filter").val(),
-                'groups_search': jQuery("input#groups_search").val(),
-                'page': 1,
-                'num': 10
+                's': jQuery("input#groups_search").val(),
+                'page': 1
             },
             function(response)
             {   
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    
-                    jQuery("#group-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-groups').toggle();
-                            jQuery("#group-dir-list").html(response[1]);
-                            jQuery("#group-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {
-                                        
-                    jQuery("#group-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-groups').toggle();
-                            var message = response[1];
-                            jQuery("#group-dir-list").html(message);
-                            jQuery("#group-dir-list").fadeIn(200);
-                        }
-                    );
-                    
-                }
+                jQuery("#group-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-groups').toggle();
+                        jQuery("#group-dir-list").html(response);
+                        jQuery("#group-dir-list").fadeIn(200);
+                    }
+                );
             });
         
@@ -115 +82 @@
                 '_wpnonce': jQuery("input#_wpnonce").val(),
                 'page': page[1],
-                'num': 10,
                 '_wpnonce': jQuery("input#_wpnonce-group-filter").val(),
                 
                 'letter': letter,
-                'groups_search': search_terms
+                's': search_terms
             },
             function(response)
             {   
                 response = response.substr(0, response.length-1);
-                response = response.split('[[SPLIT]]');
-
-                if ( response[0] != "-1" ) {
-                    
-                    jQuery("#group-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-groups').toggle();
-                            jQuery("#group-dir-list").html(response[1]);
-                            jQuery("#group-dir-list").fadeIn(200);
-                        }
-                    );
-
-                } else {
-                                        
-                    jQuery("#group-dir-list").fadeOut(200, 
-                        function() {
-                            jQuery('#ajax-loader-groups').toggle();
-                            var message = response[1];
-                            jQuery("#group-dir-list").html(message);
-                            jQuery("#group-dir-list").fadeIn(200);
-                        }
-                    );
-                    
-                }           
+                jQuery("#group-dir-list").fadeOut(200, 
+                    function() {
+                        jQuery('#ajax-loader-groups').toggle();
+                        jQuery("#group-dir-list").html(response);
+                        jQuery("#group-dir-list").fadeIn(200);
+                    }
+                );      
             });
             

trunk/bp-messages.php

@@ -117 +117 @@
     $bp->version_numbers->messages = BP_MESSAGES_VERSION;
 }
-add_action( 'wp', 'messages_setup_globals', 1 );    
+add_action( 'plugins_loaded', 'messages_setup_globals', 5 );    
 add_action( 'admin_menu', 'messages_setup_globals', 1 );
 

trunk/bp-wire.php

@@ -42 +42 @@
     $bp->version_numbers->wire = BP_WIRE_VERSION;
 }
-add_action( 'wp', 'bp_wire_setup_globals', 1 ); 
+add_action( 'plugins_loaded', 'bp_wire_setup_globals', 5 ); 
 add_action( 'admin_menu', 'bp_wire_setup_globals', 1 );
 

trunk/bp-xprofile.php

@@ -169 +169 @@
         $bp->profile->table_name_wire = $wpdb->base_prefix . 'bp_xprofile_wire';
 }
-add_action( 'wp', 'xprofile_setup_globals', 1 );    
+add_action( 'plugins_loaded', 'xprofile_setup_globals', 5 );    
 add_action( 'admin_menu', 'xprofile_setup_globals', 1 );
 
@@ -975 +975 @@
     global $bp; 
     wp_cache_delete( 'xprofile_fields_' . $group_id . '_' . $bp->loggedin_user->id, 'bp' );
+    wp_cache_delete( 'bp_user_fullname_' . $bp->loggedin_user->id, 'bp' );
     wp_cache_delete( 'online_users', 'bp' );
     wp_cache_delete( 'newest_users', 'bp' );