Changeset 10687

Timestamp:

04/05/2016 02:46:58 PM (10 years ago)

Author:

dcavins

Message:

Make sure invites include an inviter_id.

• When creating an invite, make sure that the

inviter_id is not 0.

• Add tests for empty values for user_id,

group_id and inviter_id in
groups_send_invites().

Props danbrellis.

Fixes #6941.

Location:

trunk

Files:

• src/bp-groups/bp-groups-functions.php (modified) (1 diff)
• tests/phpunit/testcases/groups/class-bp-groups-member.php (modified) (1 diff)

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

@@ -1101 +1101 @@
         extract( $args, EXTR_SKIP );
 
-        if ( empty( $user_id ) || empty( $group_id ) )
-                return false;
+        if ( ! $user_id || ! $group_id || ! $inviter_id ) {
+                return false;
+        }
 
         // If the user has already requested membership, accept the request.

trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php

@@ -1087 +1087 @@
 
         /**
+         * @group groups_invite_user
+         * @group group_invitations
+         * @group group_membership
+         */
+        public function test_groups_send_invites_fail_on_empty_group_id() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+
+                // Create draft invitation with empty inviter_id
+                $invite_created = groups_invite_user( array(
+                        'user_id'       => $u2,
+                        'group_id'      => 0,
+                        'inviter_id'    => $u1,
+                        'date_modified' => bp_core_current_time(),
+                        'is_confirmed'  => 0
+                ) );
+
+                $this->assertFalse( $invite_created );
+        }
+
+        /**
+         * @group groups_invite_user
+         * @group group_invitations
+         * @group group_membership
+         */
+        public function test_groups_send_invites_fail_on_empty_user_id() {
+                $u1 = $this->factory->user->create();
+                $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+                // Create draft invitation with empty inviter_id
+                $invite_created = groups_invite_user( array(
+                        'user_id'       => 0,
+                        'group_id'      => $g1,
+                        'inviter_id'    => $u1,
+                        'date_modified' => bp_core_current_time(),
+                        'is_confirmed'  => 0
+                ) );
+
+                $this->assertFalse( $invite_created );
+        }
+
+        /**
+         * @group groups_invite_user
+         * @group group_invitations
+         * @group group_membership
+         */
+        public function test_groups_send_invites_fail_on_empty_inviter_id() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+                // Create draft invitation with empty inviter_id
+                $invite_created = groups_invite_user( array(
+                        'user_id'       => $u2,
+                        'group_id'      => $g1,
+                        'inviter_id'    => 0,
+                        'date_modified' => bp_core_current_time(),
+                        'is_confirmed'  => 0
+                ) );
+
+                $this->assertFalse( $invite_created );
+        }
+
+        /**
          * @group groups_send_membership_request
          * @group group_membership_requests