Changeset 2389 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

01/21/2010 11:19:32 AM (15 years ago)

Author:

apeatling

Message:

Fixed issues with the listing of hidden groups when you are logged in. Switched all references of bp_is_home() to the more appropriate bp_is_my_profile().

File:

• trunk/bp-groups/bp-groups-classes.php (modified) (12 diffs)

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

@@ -345 +345 @@
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-        if ( !is_site_admin() )
+        if ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) )
             $hidden_sql = "AND g.status != 'hidden'";
 
@@ -371 +371 @@
         }
 
-        if ( !is_site_admin() )
+        if ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) )
             $hidden_sql = "AND g.status != 'hidden'";
 
@@ -396 +396 @@
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-        if ( !is_site_admin() )
+        if ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -425 +425 @@
         }
 
+        if ( !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 ) );
@@ -450 +453 @@
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         }
+
+        if ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) )
+            $hidden_sql = " AND g.status != 'hidden'";
 
         if ( $search_terms ) {
@@ -566 +572 @@
         global $wpdb, $bp;
 
-        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name}" ) );
+        if ( !is_site_admin() )
+            $hidden_sql = "WHERE status != 'hidden'";
+
+        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql}" ) );
     }
 
@@ -751 +760 @@
 
         // If the user is logged in and viewing their own groups, we can show hidden and private groupss
-        if ( bp_is_home() ) {
+        if ( $user_id != $bp->loggedin_user->id ) {
             $group_sql = $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0{$pag_sql}", $user_id );
             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT group_id) FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0", $user_id ) );
@@ -775 +784 @@
         }
 
-        if ( !bp_is_home() )
+        if ( $user_id != $bp->loggedin_user->id )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -795 +804 @@
         }
 
-        if ( !bp_is_home() )
+        if ( $user_id != $bp->loggedin_user->id )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -815 +824 @@
         }
 
-        if ( !bp_is_home() )
+        if ( $user_id != $bp->loggedin_user->id )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -830 +839 @@
             $user_id = $bp->displayed_user->id;
 
-        if ( bp_is_home() ) {
-            return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT group_id) FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0", $user_id ) );
-        } else {
+        if ( $user_id != $bp->loggedin_user->id && !is_site_admin() ) {
             return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        } else {
+            return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
         }
     }
@@ -924 +933 @@
 
         // If the user is logged in and viewing their random groups, we can show hidden and private groups
-        if ( bp_is_home() ) {
+        if ( bp_is_my_profile() ) {
             return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND is_confirmed = 1 AND is_banned = 0 ORDER BY rand() LIMIT $total_groups", $user_id ) );
         } else {