Changeset 2919

Timestamp:

04/13/2010 04:01:07 PM (16 years ago)

Author:

apeatling

Message:

Replacing function_exists() checks with bp_is_active() checks.

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-core.php (modified) (3 diffs)
• bp-core/admin/bp-core-admin.php (modified) (3 diffs)
• bp-core/bp-core-adminbar.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (8 diffs)
• bp-core/bp-core-templatetags.php (modified) (3 diffs)
• bp-forums.php (modified) (2 diffs)
• bp-friends/bp-friends-classes.php (modified) (4 diffs)
• bp-groups.php (modified) (2 diffs)
• bp-groups/bp-groups-classes.php (modified) (8 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (9 diffs)

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

@@ -132 +132 @@
 
                 /* Get the fullnames of users so we don't have to query in the loop */
-                if ( function_exists( 'xprofile_install' ) && $activities ) {
+                if ( bp_is_active( 'xprofile' ) && $activities ) {
                         foreach ( (array)$activities as $activity ) {
                                 if ( (int)$activity->user_id )
@@ -354 +354 @@
                 if ( !$comments = wp_cache_get( 'bp_activity_comments_' . $activity_id ) ) {
                         /* Select the user's fullname with the query so we don't have to fetch it for each comment */
-                        if ( function_exists( 'xprofile_install' ) ) {
+                        if ( bp_is_active( 'xprofile' ) ) {
                                 $fullname_select = ", pd.value as user_fullname";
                                 $fullname_from = ", {$bp->profile->table_name_data} pd ";

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

@@ -494 +494 @@
                 global $activities_template, $bp;
 
-                /* Strip any legacy time since placeholders -- TODO: Remove this in 1.3 */
-                $content = str_replace( '<span class="time-since">%s</span>', '', $content );
+                $meta = '<span class="activity-actions">';
 
                 /* Insert the time since. */
-                $content .= ' ' . apply_filters( 'bp_activity_time_since', '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity );
+                $meta .= apply_filters( 'bp_activity_time_since', '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity );
 
                 /* Insert the permalink */
-                $content .= apply_filters( 'bp_activity_permalink', ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', &$activities_template->activity );
+                $meta .= apply_filters( 'bp_activity_permalink', ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', &$activities_template->activity );
 
                 /* Add the delete link if the user has permission on this item */
                 if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || $bp->loggedin_user->is_site_admin )
-                         $content .= apply_filters( 'bp_activity_delete_link', ' &middot; ' . bp_get_activity_delete_link(), &$activities_template->activity );
-
-                return apply_filters( 'bp_insert_activity_meta', $content );
+                         $meta .= apply_filters( 'bp_activity_delete_link', ' &middot; ' . bp_get_activity_delete_link(), &$activities_template->activity );
+
+                $meta .= '</span>';
+
+                return apply_filters( 'bp_insert_activity_meta', $content . ' ' . $meta, $content, $meta );
         }
 

trunk/bp-core.php

@@ -298 +298 @@
          * built in WordPress profile information
          */
-        if ( !function_exists( 'xprofile_install' ) ) {
+        if ( !bp_is_active( 'xprofile' ) ) {
                 /* Fallback values if xprofile is disabled */
                 $bp->core->profile->slug = 'profile';
@@ -1077 +1077 @@
 
         if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
-                if ( function_exists('xprofile_install') ) {
+                if ( bp_is_active( 'xprofile' ) ) {
                         $fullname = xprofile_get_field_data( 1, $user_id );
 
@@ -1267 +1267 @@
         @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
 }
-add_action( 'wp', 'bp_core_setup_message' );
+add_action( 'bp_init', 'bp_core_setup_message' );
 
 /**

trunk/bp-core/admin/bp-core-admin.php

@@ -33 +33 @@
                 foreach ( (array)$_POST['bp-admin'] as $key => $value ) {
 
-                        if ( function_exists( 'xprofile_install' ) ) {
+                        if ( bp_is_active( 'xprofile' ) ) {
                                 if ( 'bp-xprofile-base-group-name' == $key ) {
                                         $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s WHERE id = 1", $value ) );
@@ -62 +62 @@
                         <table class="form-table">
                         <tbody>
-                                <?php if ( function_exists( 'xprofile_install' ) ) :?>
+                                <?php if ( is_active( 'xprofile' ) ) :?>
                                 <tr>
                                         <th scope="row"><?php _e( 'Base profile group name', 'buddypress' ) ?>:</th>
@@ -113 +113 @@
                                 </tr>
                                 <?php endif; ?>
-                                <?php if ( function_exists( 'bp_activity_install') ) : ?>
+                                <?php if ( bp_is_active( 'activity' ) ) : ?>
                                 <tr>
                                         <th scope="row"><?php _e( 'Disable activity stream commenting on blog and forum posts?', 'buddypress' ) ?>:</th>

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

@@ -224 +224 @@
                         <li><a href="<?php echo $bp->root_domain . '/' . $bp->members->slug . '/?random-member' ?>"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
 
-                        <?php if ( function_exists('groups_install') ) : ?>
+                        <?php if ( bp_is_active( 'groups' ) ) : ?>
                         <li class="alt"><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug . '/?random-group' ?>"><?php _e( 'Random Group', 'buddypress' ) ?></a></li>
                         <?php endif; ?>
 
-                        <?php if ( function_exists('bp_blogs_install') && bp_core_is_multisite() ) : ?>
+                        <?php if ( bp_is_active( 'blogs' ) && bp_core_is_multisite() ) : ?>
                         <li><a href="<?php echo $bp->root_domain . '/' . $bp->blogs->slug . '/?random-blog' ?>"><?php _e( 'Random Blog', 'buddypress' ) ?></a></li>
 

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

@@ -256 +256 @@
         global $bp;
 
-        if ( !function_exists('xprofile_install') )
+        if ( !bp_is_active( 'xprofile' ) )
                 bp_core_load_template( apply_filters( 'bp_core_template_display_profile', 'members/single/home' ) );
 }

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

@@ -56 +56 @@
          */
         function populate() {
-                if ( function_exists( 'xprofile_install' ) )
+                if ( bp_is_active( 'xprofile' ) )
                         $this->profile_data = $this->get_profile_data();
 
@@ -86 +86 @@
                 global $bp;
 
-                if ( function_exists('friends_install') )
+                if ( bp_is_active( 'friends' ) )
                         $this->total_friends = BP_Friends_Friendship::total_friend_count( $this->id );
 
-                if ( function_exists('groups_install') ) {
+                if ( bp_is_active( 'groups' ) ) {
                         $this->total_groups = BP_Groups_Member::total_group_count( $this->id );
 
@@ -125 +125 @@
                 $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
 
-                if ( $search_terms && function_exists( 'xprofile_install' ) || 'alphabetical' == $type )
+                if ( $search_terms && bp_is_active( 'xprofile' ) || 'alphabetical' == $type )
                         $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
 
@@ -142 +142 @@
                         $sql['where_alpha'] = "AND pd.field_id = 1";
 
-                if ( $user_id && function_exists( 'friends_install' ) ) {
+                if ( $user_id && bp_is_active( 'friends' ) ) {
                         $friend_ids = friends_get_friend_user_ids( $user_id );
                         $friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );
@@ -154 +154 @@
                 }
 
-                if ( $search_terms && function_exists( 'xprofile_install' ) ) {
+                if ( $search_terms && bp_is_active( 'xprofile' ) ) {
                         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
                         $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
@@ -320 +320 @@
 
                 /* Fetch the user's full name */
-                if ( function_exists( 'xprofile_install' ) && 'alphabetical' != $type ) {
+                if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
                         $names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
                         for ( $i = 0; $i < count( $paged_users ); $i++ ) {
@@ -342 +342 @@
 
                 /* Fetch whether or not the user is a friend */
-                if ( function_exists( 'friends_install' ) ) {
+                if ( bp_is_active( 'friends' ) ) {
                         $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", $bp->loggedin_user->id, $bp->loggedin_user->id ) );
                         for ( $i = 0; $i < count( $paged_users ); $i++ ) {
@@ -381 +381 @@
                         }
                 }
+
+                var_dump( $paged_users );
 
                 return $paged_users;

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

@@ -248 +248 @@
         function bp_get_member_name() {
                 global $members_template;
+
+                var_dump( $members_template );
 
                 if ( empty($members_template->member->fullname) )
@@ -688 +690 @@
 }
 
-function bp_user_firstname() {
-        echo bp_get_user_firstname();
+function bp_user_firstname( $name = false ) {
+        echo bp_get_user_firstname( $name );
 }
         function bp_get_user_firstname( $name = false ) {
@@ -989 +991 @@
 function bp_search_form_type_select() {
         global $bp;
-        
+
         // Eventually this won't be needed and a page will be built to integrate all search results.
         $selection_box = '<select name="search-which" id="search-which" style="width: auto">';

trunk/bp-forums.php

@@ -356 +356 @@
 
         /* Fetch fullname for the topic's last poster */
-        if ( function_exists( 'xprofile_install' ) ) {
+        if ( bp_is_active( 'xprofile' ) ) {
                 $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, pd.value FROM {$bp->profile->table_name_data} pd, {$bbdb->topics} t WHERE pd.user_id = t.topic_last_poster AND pd.field_id = 1 AND t.topic_id IN ( {$topic_ids} )" ) );
                 for ( $i = 0; $i < count( $topics ); $i++ ) {
@@ -474 +474 @@
 
         /* Fetch fullname for each poster. */
-        if ( function_exists( 'xprofile_install' ) ) {
+        if ( bp_is_active( 'xprofile' ) ) {
                 $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id, pd.value FROM {$bp->profile->table_name_data} pd WHERE pd.user_id IN ( {$user_ids} )" ) );
                 for ( $i = 0; $i < count( $posts ); $i++ ) {

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

@@ -157 +157 @@
 
                 // filter the user_ids based on the search criteria.
-                if ( function_exists('xprofile_install') ) {
+                if ( bp_is_active( 'xprofile' ) ) {
                         $sql = "SELECT DISTINCT user_id FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%' {$pag_sql}";
                         $total_sql = "SELECT COUNT(DISTINCT user_id) FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%'";
@@ -223 +223 @@
 
                 // filter the user_ids based on the search criteria.
-                if ( function_exists('xprofile_install') ) {
+                if ( bp_is_active( 'xprofile' ) ) {
                         $sql = $wpdb->prepare( "SELECT DISTINCT d.user_id as id FROM {$bp->profile->table_name_data} d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql" );
                 } else {
@@ -246 +246 @@
 
                 // filter the user_ids based on the search criteria.
-                if ( function_exists('xprofile_install') ) {
+                if ( bp_is_active( 'xprofile' ) ) {
                         $sql = $wpdb->prepare( "SELECT COUNT(DISTINCT d.user_id) FROM {$bp->profile->table_name_data} d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%'" );
                 } else {
@@ -263 +263 @@
                 global $wpdb, $bp;
 
-                if ( !function_exists( 'xprofile_install') )
+                if ( !bp_is_active( 'xprofile' ) )
                         return false;
 

trunk/bp-groups.php

@@ -1658 +1658 @@
                 'type' => 'active', // active, newest, alphabetical, random, popular, most-forum-topics or most-forum-posts
                 'user_id' => false, // Pass a user_id to limit to only groups that this user is a member of
+                'include' => false, // Only include these specific groups (group_ids)
                 'search_terms' => false, // Limit to groups that match these search terms
 
@@ -1668 +1669 @@
         extract( $params, EXTR_SKIP );
 
-        switch ( $type ) {
-                case 'active': default:
-                        $groups = BP_Groups_Group::get_active( $per_page, $page, $user_id, $search_terms, $populate_extras );
-                        break;
-                case 'newest':
-                        $groups = BP_Groups_Group::get_newest( $per_page, $page, $user_id, $search_terms, $populate_extras );
-                        break;
-                case 'popular':
-                        $groups = BP_Groups_Group::get_popular( $per_page, $page, $user_id, $search_terms, $populate_extras );
-                        break;
-                case 'alphabetical':
-                        $groups = BP_Groups_Group::get_alphabetically( $per_page, $page, $user_id, $search_terms, $populate_extras );
-                        break;
-                case 'random':
-                        $groups = BP_Groups_Group::get_random( $per_page, $page, $user_id, $search_terms, $populate_extras );
-                        break;
-                case 'most-forum-topics':
-                        $groups = BP_Groups_Group::get_by_most_forum_topics( $per_page, $page, $user_id, $search_terms, $populate_extras );
-                        break;
-                case 'most-forum-posts':
-                        $groups = BP_Groups_Group::get_by_most_forum_posts( $per_page, $page, $user_id, $search_terms, $populate_extras );
-                        break;
-        }
+        $groups = BP_Groups_Group::get( $type, $per_page, $page, $user_id, $search_terms, $include, $populate_extras );
 
         return apply_filters( 'groups_get_groups', $groups, &$params );

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

@@ -256 +256 @@
         }
 
-        /* TODO: Merge all these get_() functions into one. */
-
-        function get_newest( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
-                global $wpdb, $bp;
-
-                if ( $limit && $page )
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        function get( $type = 'newest', $per_page = null, $page = null, $user_id = false, $search_terms = false, $include = false, $populate_extras = true ) {
+                global $wpdb, $bp;
+
+                $sql = array();
+
+                $sql['select'] = "SELECT g.*, gm1.meta_value AS total_member_count, gm2.meta_value AS last_activity";
+                $sql['from']   = " FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2,";
+
+                if ( !empty( $user_id ) )
+                        $sql['members_from'] = " {$bp->groups->table_name_members} m,";
+
+                $sql['group_from'] = " {$bp->groups->table_name} g WHERE";
+
+                if ( !empty( $user_id ) )
+                        $sql['user_where'] = " g.id = m.group_id AND";
+
+                $sql['where'] = " g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'";
 
                 if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
-                        $hidden_sql = "AND g.status != 'hidden'";
+                        $sql['hidden'] = " AND g.status != 'hidden'";
 
                 if ( $search_terms ) {
                         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
-                        $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
-                }
-
-                if ( $user_id ) {
-                        $user_id = $wpdb->escape( $user_id );
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY g.date_created DESC {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
-                } else {
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY g.date_created DESC {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm INNER JOIN {$bp->groups->table_name} g ON gm.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql}" );
-                }
-
+                        $sql['search'] = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+                }
+
+                if ( !empty( $user_id ) )
+                        $sql['user'] = $wpdb->prepare( " AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id );
+
+                if ( !empty( $include ) ) {
+                        $include = $wpdb->escape( $include );
+                        $sql['include'] = " AND g.id IN ({$include})";
+                }
+
+                switch ( $type ) {
+                        case 'newest': default:
+                                $sql['order'] = " ORDER BY g.date_created DESC";
+                                break;
+                        case 'active':
+                                $sql[] = "ORDER BY last_activity DESC";
+                                break;
+                        case 'popular':
+                                $sql[] = "ORDER BY CONVERT(gm1.meta_value, SIGNED) DESC";
+                                break;
+                        case 'alphabetical':
+                                $sql[] = "ORDER BY g.name ASC";
+                                break;
+                        case 'random':
+                                $sql[] = "ORDER BY rand()";
+                                break;
+                }
+
+                if ( $per_page && $page )
+                        $sql['pagination'] = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page), intval( $per_page ) );
+
+                /* Get paginated results */
+                $paged_groups = $wpdb->get_results( join( ' ', (array)$sql ) );
+
+                $total_sql['select'] = "SELECT COUNT(g.id) FROM {$bp->groups->table_name} g";
+
+                if ( !empty( $user_id ) )
+                        $total_sql['select'] .= ", {$bp->groups->table_name_members} m";
+
+                if ( !empty( $sql['hidden'] ) )
+                        $total_sql['where'][] = "g.status != 'hidden'";
+
+                if ( !empty( $sql['search'] ) )
+                        $total_sql['where'][] = "( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+
+                if ( !empty( $user_id ) )
+                        $total_sql['where'][] = "m.group_id = g.id AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0";
+
+                $t_sql = $total_sql['select'];
+
+                if ( !empty( $total_sql['where'] ) )
+                        $t_sql .= " WHERE " . join( ' AND ', (array)$total_sql['where'] );
+
+                /* Get total group results */
+                $total_groups = $wpdb->get_var( join( ' ', (array)$t_sql ) );
+
+                /* Populate some extra information instead of querying each time in the loop */
                 if ( !empty( $populate_extras ) ) {
                         foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
                         $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
-                }
-
-                return array( 'groups' => $paged_groups, 'total' => $total_groups );
-        }
-
-        function get_active( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
-                global $wpdb, $bp;
-
-                if ( $limit && $page )
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
-                        $hidden_sql = "AND g.status != 'hidden'";
-
-                if ( $search_terms ) {
-                        $search_terms = like_escape( $wpdb->escape( $search_terms ) );
-                        $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
-                }
-
-                if ( $user_id ) {
-                        $user_id = $wpdb->escape( $user_id );
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY last_activity DESC {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
-                } else {
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY last_activity DESC {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm INNER JOIN {$bp->groups->table_name} g ON gm.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql}" );
-                }
-
-                if ( !empty( $populate_extras ) ) {
-                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
-                }
-
-                return array( 'groups' => $paged_groups, 'total' => $total_groups );
-        }
-
-        function get_popular( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
-                global $wpdb, $bp;
-
-                if ( $limit && $page ) {
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-                }
-
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
-                        $hidden_sql = "AND g.status != 'hidden'";
-
-                if ( $search_terms ) {
-                        $search_terms = like_escape( $wpdb->escape( $search_terms ) );
-                        $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
-                }
-
-                if ( $user_id ) {
-                        $user_id = $wpdb->escape( $user_id );
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY CONVERT(gm1.meta_value, SIGNED) DESC {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
-                } else {
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY CONVERT(gm1.meta_value, SIGNED) DESC {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql}" );
-                }
-
-                if ( !empty( $populate_extras ) ) {
-                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
-                }
-
-                return array( 'groups' => $paged_groups, 'total' => $total_groups );
-        }
-
-        function get_alphabetically( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
-                global $wpdb, $bp;
-
-                if ( $limit && $page )
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
-                        $hidden_sql = " AND g.status != 'hidden'";
-
-                if ( $search_terms ) {
-                        $search_terms = like_escape( $wpdb->escape( $search_terms ) );
-                        $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
-                }
-
-                if ( $user_id ) {
-                        $user_id = $wpdb->escape( $user_id );
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY g.name ASC {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
-                } else {
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql}" );
-                }
-
-                if ( !empty( $populate_extras ) ) {
-                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
-                }
+                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, $type );
+                }
+
+                unset( $sql, $total_sql );
 
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -459 +420 @@
         }
 
-        function get_all( $limit = null, $page = null, $only_public = true, $sort_by = false, $order = false ) {
-                global $wpdb, $bp;
-
-                // Default sql WHERE conditions are blank. TODO: generic handler function.
-                $where_sql = null;
-                $where_conditions = array();
-
-                // Limit results to public status
-                if ( $only_public )
-                        $where_conditions[] = $wpdb->prepare( "g.status = 'public'" );
-
-                if ( !is_site_admin() )
-                        $where_conditions[] = $wpdb->prepare( "g.status != 'hidden'");
-
-                // Build where sql statement if necessary
-                if ( !empty( $where_conditions ) )
-                        $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
-
-                if ( $limit && $page )
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-
-                if ( $sort_by && $order ) {
-                        $sort_by = $wpdb->escape( $sort_by );
-                        $order = $wpdb->escape( $order );
-                        $order_sql = "ORDER BY g.$sort_by $order";
-
-                        switch ( $sort_by ) {
-                                default:
-                                        $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
-                                        break;
-                                case 'members':
-                                        $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'total_member_count' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
-                                        break;
-                                case 'last_active':
-                                        $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'last_activity' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
-                                        break;
-                        }
-                } else {
-                        $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
-                }
-
-                return $wpdb->get_results($sql);
-        }
-
         function get_by_letter( $letter, $limit = null, $page = null, $populate_extras = true ) {
                 global $wpdb, $bp;
@@ -520 +437 @@
 
                 $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}"  ) );
-
-                if ( !empty( $populate_extras ) ) {
-                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
-                }
-
-                return array( 'groups' => $paged_groups, 'total' => $total_groups );
-        }
-
-        function get_random( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true ) {
-                global $wpdb, $bp;
-
-                if ( $limit && $page )
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
-                        $hidden_sql = "AND g.status != 'hidden'";
-
-                if ( $search_terms ) {
-                        $search_terms = like_escape( $wpdb->escape( $search_terms ) );
-                        $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
-                }
-
-                if ( $user_id ) {
-                        $user_id = $wpdb->escape( $user_id );
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY rand() {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0" );
-                } else {
-                        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY rand() {$pag_sql}" );
-                        $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm INNER JOIN {$bp->groups->table_name} g ON gm.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql}" );
-                }
 
                 if ( !empty( $populate_extras ) ) {
@@ -1013 +898 @@
                 $user_ids = $wpdb->escape( join( ',', (array)$user_ids ) );
 
-                if ( function_exists( 'friends_install' ) ) {
+                if ( bp_is_active( 'friends' ) ) {
                         $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", $bp->loggedin_user->id, $bp->loggedin_user->id ) );
                         for ( $i = 0; $i < count( $members ); $i++ ) {
@@ -1103 +988 @@
                 global $bp;
 
+                /* When we are viewing a single group, add the group extension nav item */
+                if ( $this->visbility == 'public' || ( $this->visbility != 'public' && $bp->groups->current_group->user_has_access ) ) {
+                        if ( $this->enable_nav_item ) {
+                                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item )
+                                        bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ), 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
+
+                                /* When we are viewing the extension display page, set the title and options title */
+                                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && $bp->current_action == $this->slug ) {
+                                        add_action( 'bp_template_content_header', create_function( '', 'echo "' . attribute_escape( $this->name ) . '";' ) );
+                                        add_action( 'bp_template_title', create_function( '', 'echo "' . attribute_escape( $this->name ) . '";' ) );
+                                }
+                        }
+
+                        /* Hook the group home widget */
+                        if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
+                                add_action( $this->display_hook, array( &$this, 'widget_display' ) );
+                }
+
                 if ( $this->enable_create_step ) {
                         /* Insert the group creation step for the new group extension */
@@ -1120 +1023 @@
                         /* Catch the edit screen and forward it to the plugin template */
                         if ( $bp->current_component == $bp->groups->slug && 'admin' == $bp->current_action && $this->slug == $bp->action_variables[0] ) {
-                                add_action( 'wp', array( &$this, 'edit_screen_save' ) );
+                                $this->edit_screen_save();
                                 add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
 
@@ -1132 +1035 @@
                         }
                 }
-
-                /* When we are viewing a single group, add the group extension nav item */
-                if ( $this->visbility == 'public' || ( $this->visbility != 'public' && $bp->groups->current_group->user_has_access ) ) {
-                        if ( $this->enable_nav_item ) {
-                                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item )
-                                        bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ), 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
-
-                                /* When we are viewing the extension display page, set the title and options title */
-                                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && $bp->current_action == $this->slug ) {
-                                        add_action( 'bp_template_content_header', create_function( '', 'echo "' . attribute_escape( $this->name ) . '";' ) );
-                                        add_action( 'bp_template_title', create_function( '', 'echo "' . attribute_escape( $this->name ) . '";' ) );
-                                }
-                        }
-
-                        /* Hook the group home widget */
-                        if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
-                                add_action( $this->display_hook, array( &$this, 'widget_display' ) );
-                }
         }
 
@@ -1165 +1050 @@
 
         /* Register the group extension on the plugins_loaded action so we have access to all plugins */
-        add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "wp", array( &$extension, "_register" ), 2 );' ), 11 );
+        add_action( 'init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "pre_get_posts", array( &$extension, "_register" ) );' ) );
 }
 

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

@@ -23 +23 @@
         var $order;
 
-        function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $populate_extras ) {
+        function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras ) {
                 global $bp;
 
@@ -36 +36 @@
                         $this->groups = array( $group );
                 } else
-                        $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' =>$this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
+                        $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'include' => $include, 'populate_extras' => $populate_extras ) );
 
                 if ( 'invites' == $type ) {
@@ -169 +169 @@
                 'slug' => $slug, // Pass a group slug to only return that group
                 'search_terms' => $search_terms, // Pass search terms to return only matching groups
+                'include' => false, // Pass comma separated list of group ID's to return only these groups
 
                 'populate_extras' => true // Get extra meta - is_member, is_banned
@@ -176 +177 @@
         extract( $r );
 
-        $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, (bool)$populate_extras );
+        $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, $include, (bool)$populate_extras );
         return apply_filters( 'bp_has_groups', $groups_template->has_groups(), &$groups_template );
 }
@@ -726 +727 @@
                                 <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' ) ) : ?>
+                                <?php if ( bp_is_active( 'friends' ) ) : ?>
                                         <div class="action">
                                                 <?php bp_add_friend_button( $admin->user_id ) ?>
@@ -764 +765 @@
                                         <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' ) ) : ?>
+                                        <?php if ( bp_is_active( 'friends' ) ) : ?>
                                                 <div class="action">
                                                         <?php bp_add_friend_button( $mod->user_id ) ?>
@@ -1034 +1035 @@
         global $groups_template, $bp;
 
-        if ( !function_exists('friends_install') )
+        if ( !bp_is_active( 'friends' ) )
                 return false;
 
@@ -1047 +1048 @@
 
 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() || $group->is_banned )
-                return false;
-
-        if ( !$group->status )
-                return false;
-
-        if ( 'hidden' == $group->status && !$group->is_member )
-                return false;
-
-        echo '<div class="generic-button group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
-
-        switch ( $group->status ) {
-                case 'public':
-                        if ( $group->is_member )
-                                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
-                        else
-                                echo '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
-                break;
-
-                case 'private':
-                        if ( $group->is_member ) {
-                                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '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_get_group_permalink( $group ) . 'request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';
+        echo bp_get_group_join_button( $group );
+}
+        function bp_get_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() || $group->is_banned )
+                        return false;
+
+                if ( !$group->status )
+                        return false;
+
+                if ( 'hidden' == $group->status && !$group->is_member )
+                        return false;
+
+                $button = '<div class="generic-button group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
+
+                switch ( $group->status ) {
+                        case 'public':
+                                if ( $group->is_member )
+                                        $button .= '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
                                 else
-                                        echo '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
-                        }
-                break;
-
-                case 'hidden':
-                        if ( $group->is_member )
-                                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
-                break;
-        }
-
-        echo '</div>';
-}
+                                        $button .= '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
+                        break;
+
+                        case 'private':
+                                if ( $group->is_member ) {
+                                        $button .= '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                                } else {
+                                        if ( !bp_group_has_requested_membership( $group ) )
+                                                $button .= '<a class="request-membership" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';
+                                        else
+                                                $button .= '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
+                                }
+                        break;
+
+                        case 'hidden':
+                                if ( $group->is_member )
+                                        $button .= '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                        break;
+                }
+
+                $button .= '</div>';
+
+                return apply_filters( 'bp_get_group_join_button', $button );
+        }
 
 function bp_group_status_message( $group = false ) {
@@ -1640 +1646 @@
                 global $bp;
 
-                if ( !function_exists('friends_install') )
+                if ( !bp_is_active( 'friends' ) )
                         return false;