Ticket #7610: 7610-after-ray.patch

src/bp-groups/actions/join.php

@@ -28 +28 @@
         // Skip if banned or already a member.
         if ( !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) && !groups_is_user_banned( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
 
-                // User wants to join a group that is not public.
-                if ( bp_current_user_can( 'groups_join_group', array( 'group_id' => $bp->groups->current_group->id ) ) ) {
+                // User wants to join a group that requires an invitation to join.
+                if ( ! bp_current_user_can( 'groups_join_group', array( 'group_id' => $bp->groups->current_group->id ) ) ) {
                         if ( !groups_check_user_has_invite( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
                                 bp_core_add_message( __( 'There was an error joining the group.', 'buddypress' ), 'error' );
                                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
@@ -54 +54 @@
          */
         bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
 }
-add_action( 'bp_actions', 'groups_action_join_group' );
- No newline at end of file
+add_action( 'bp_actions', 'groups_action_join_group' );

src/bp-groups/bp-groups-filters.php

@@ -216 +216 @@
                                 break;
                         }
 
+                        // Set to false to begin with.
+                        $retval = false;
+
                         // The group must allow joining, and the user should not currently be a member.
                         $group = groups_get_group( $group_id );
-                        if ( 'public' === bp_get_group_status( $group )
+                        if ( ( 'public' === bp_get_group_status( $group )
                                 && ! groups_is_user_member( $user_id, $group->id )
-                                && ! groups_is_user_banned( $user_id, $group->id )
+                                && ! groups_is_user_banned( $user_id, $group->id ) )
+                                // Site admins can join any group they are not a member of.
+                                || ( bp_user_can( $user_id, 'bp_moderate' )
+                                && ! groups_is_user_member( $user_id, $group->id ) )
                         ) {
                                 $retval = true;
                         }
@@ -232 +238 @@
                                 break;
                         }
 
+                        // Set to false to begin with.
+                        $retval = false;
+
                         /*
                         * The group must accept membership requests, and the user should not
                         * currently be a member, have an active request, or be banned.
@@ -256 +265 @@
                         * The group must allow invitations, and the user should not
                         * currently be a member or be banned from the group.
                         */
-                        $group = groups_get_group( $group_id );
                         // Users with the 'bp_moderate' cap can always send invitations.
                         if ( bp_user_can( $user_id, 'bp_moderate' ) ) {
                                 $retval = true;
@@ -291 +299 @@
                                 break;
                         }
 
+                        // Set to false to begin with.
+                        $retval = false;
+
                         /*
                         * The group must allow invitations, and the user should not
                         * currently be a member or be banned from the group.

tests/phpunit/testcases/groups/user_can.php

@@ -24 +24 @@
                 $this->assertFalse( bp_user_can( $u1, 'groups_join_group', array( 'group_id' => $g1 ) ) );
         }
 
+        /**
+         * @ticket BP7610
+         */
+        public function test_user_cannot_join_public_group_if_already_member_even_superadmin() {
+                $g1 = $this->factory->group->create( array(
+                        'status'      => 'public'
+                ) );
+                $u1 = $this->factory->user->create();
+                $this->add_user_to_group( $u1, $g1 );
+
+                // Grant super admin status.
+                grant_super_admin( $u1 );
+
+                $this->assertFalse( bp_user_can( $u1, 'groups_join_group', array( 'group_id' => $g1 ) ) );
+        }
+
         public function test_user_cannot_join_private_group() {
                 $g1 = $this->factory->group->create( array(
                         'status'      => 'private'
@@ -134 +150 @@
                 $this->assertFalse( bp_user_can( $u1, 'groups_receive_invitation', array( 'group_id' => $g1 ) ) );
         }
 
+        /**
+         * @ticket BP7610
+         */
+        public function test_user_cannot_receive_invitation_to_private_group_if_already_member_even_superadmin() {
+                $g1 = $this->factory->group->create( array(
+                        'status'      => 'private'
+                ) );
+                $u1 = $this->factory->user->create();
+                $this->add_user_to_group( $u1, $g1 );
+
+                // Grant super admin status.
+                grant_super_admin( $u1 );
+
+                $this->assertFalse( bp_user_can( $u1, 'groups_receive_invitation', array( 'group_id' => $g1 ) ) );
+        }
 
         public function test_user_cannot_receive_invitation_to_private_group_if_banned() {
                 $g1 = $this->factory->group->create( array(
@@ -368 +399 @@
                 $this->assertTrue( bp_user_can( $u1, 'groups_see_group', array( 'group_id' => $g1 ) ) );
         }
 
+        /**
+         * @ticket BP7610
+         */
+        public function test_user_can_groups_request_membership_for_super_admin() {
+                if ( ! is_multisite() ) {
+                        return;
+                }
+
+                $g1 = $this->factory->group->create( array(
+                        'status' => 'public'
+                ) );
+                $u1 = $this->factory->user->create();
+                $this->add_user_to_group( $u1, $g1 );
+
+                // Grant super admin status.
+                grant_super_admin( $u1 );
+
+                // Assert false since public groups shouldn't be able to request membership.
+                $this->assertFalse( bp_user_can( $u1, 'groups_request_membership', array( 'group_id' => $g1 ) ) );
+        }
 }