Changeset 2550

Timestamp:

02/02/2010 10:58:17 PM (15 years ago)

Author:

apeatling

Message:

Group member listing and pag fixes.

Location:

trunk

Files:

• bp-groups/bp-groups-classes.php (modified) (2 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)
• bp-themes/bp-default/groups/single/admin.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/members.php (modified) (1 diff)

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

@@ -969 +969 @@
 
         if ( bp_is_active( 'xprofile' ) )
-            $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} {$pag_sql}", $group_id ) );
+            $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
         else
-            $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u WHERE u.ID = m.user_id AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} {$pag_sql}", $group_id ) );
+            $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u WHERE u.ID = m.user_id AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
 
         if ( !$members )
@@ -980 +980 @@
         else
             $total_member_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(user_id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql}", $group_id ) );
+
+        /* Fetch whether or not the user is a friend */
+        foreach ( $members as $user ) $user_ids[] = $user->user_id;
+        $user_ids = $wpdb->escape( join( ',', (array)$user_ids ) );
+
+        if ( function_exists( 'friends_install' ) ) {
+            $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++ ) {
+                foreach ( $friend_status as $status ) {
+                    if ( $status->initiator_user_id == $members[$i]->user_id || $status->friend_user_id == $members[$i]->user_id )
+                        $members[$i]->is_friend = $status->is_confirmed;
+                }
+            }
+        }
 
         return array( 'members' => $members, 'count' => $total_member_count );

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

@@ -1324 +1324 @@
     $defaults = array(
         'group_id' => $bp->groups->current_group->id,
-        'per_page' => 10,
+        'per_page' => 20,
         'max' => false,
         'exclude_admins_mods' => 1,
@@ -1401 +1401 @@
 
         return apply_filters( 'bp_get_group_member_link', '<a href="' . bp_core_get_user_domain( $members_template->member->user_id, $members_template->member->user_nicename, $members_template->member->user_login ) . '">' . $members_template->member->display_name . '</a>' );
+    }
+
+function bp_group_member_is_friend() {
+    echo bp_get_group_member_is_friend();
+}
+    function bp_get_group_member_is_friend() {
+        global $members_template;
+
+        if ( null === $members_template->member->is_friend )
+            $friend_status = 'not_friends';
+        else
+            $friend_status = ( 0 == $members_template->member->is_friend ) ? 'pending' : 'is_friend';
+
+        return apply_filters( 'bp_get_group_member_is_friend', $friend_status );
     }
 

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

@@ -178 +178 @@
             <?php if ( bp_group_member_needs_pagination() ) : ?>
 
-                <div class="pagination">
+                <div class="pagination no-ajax">
 
                     <div id="member-count" class="pag-count">

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

@@ -3 +3 @@
     <?php do_action( 'bp_before_group_members_content' ) ?>
 
-    <div class="pagination">
+    <div class="pagination no-ajax">
 
         <div id="member-count" class="pag-count">