Changeset 11761

Timestamp:

12/06/2017 03:46:07 PM (7 years ago)

Author:

djpaul

Message:

Groups: use class methods to check if user has visibility of a group.

Improves upon existing duplication of logic.

Fixes #7608

Props dcavins

Location:

trunk/src

Files:

• bp-activity/bp-activity-screens.php (modified) (1 diff)
• bp-groups/bp-groups-actions.php (modified) (3 diffs)
• bp-groups/bp-groups-template.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-screens.php

@@ -231 +231 @@
         }
 
-        // Check to see if the group is not public, if so, check the
-        // user has access to see this activity.
+        // Check to see if the user has access to to the activity's parent group.
         if ( $group = groups_get_group( $activity->item_id ) ) {
-
-            // Group is not public.
-            if ( 'public' != $group->status ) {
-
-                // User is not a member of group.
-                if ( !groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
-                    $has_access = false;
-                }
-            }
+            $has_access = $group->user_has_access;
         }
     }

trunk/src/bp-groups/bp-groups-actions.php

@@ -42 +42 @@
     $current_group   = groups_get_current_group();
     $user_has_access = $current_group->user_has_access;
+    $is_visible      = $current_group->is_visible;
     $no_access_args  = array();
 
-    if ( ! $user_has_access && 'hidden' !== $current_group->status ) {
+    // The user can know about the group but doesn't have full access.
+    if ( ! $user_has_access && $is_visible ) {
         // Always allow access to home and request-membership.
         if ( bp_is_current_action( 'home' ) || bp_is_current_action( 'request-membership' ) ) {
@@ -91 +93 @@
     }
 
-    // Hidden groups should return a 404 for non-members.
+    // Groups that the user cannot know about should return a 404 for non-members.
     // Unset the current group so that you're not redirected
     // to the default group tab.
-    if ( 'hidden' == $current_group->status ) {
+    if ( ! $is_visible ) {
         buddypress()->groups->current_group = 0;
         buddypress()->is_single_item        = false;
@@ -489 +491 @@
         }
 
-        $redirect = bp_get_group_permalink( groups_get_current_group() );
-
-        if( 'hidden' == $bp->groups->current_group->status ) {
+        $group = groups_get_current_group();
+        $redirect = bp_get_group_permalink( $group );
+
+        if ( ! $group->is_visible ) {
             $redirect = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() );
         }

trunk/src/bp-groups/bp-groups-template.php

@@ -486 +486 @@
     }
 
-    if ( 'public' == $group->status ) {
+    if ( ! empty( $group->is_visible ) ) {
         return true;
-    } else {
-        if ( groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
-            return true;
-        }
     }