Ticket #5281: 5281.diff

bp-templates/bp-legacy/buddypress-functions.php

@@ -930 +930 @@
 
                 $user = new BP_Core_User( $friend_id );
 
+                $uninvite_url = bp_is_current_action( 'create' ) ? bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/group-invites/?user_id='. $user->id : bp_get_group_permalink( $group ) . 'send-invites/remove/' . $user->id;
+
                 echo '<li id="uid-' . $user->id . '">';
                 echo $user->avatar_thumb;
                 echo '<h4>' . $user->user_link . '</h4>';
                 echo '<span class="activity">' . esc_attr( $user->last_active ) . '</span>';
                 echo '<div class="action">
-                                <a class="button remove" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . esc_attr( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
+                                <a class="button remove" href="' . wp_nonce_url( $uninvite_url, 'groups_invite_uninvite_user' ) . '" id="uid-' . esc_attr( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
                           </div>';
 
                 if ( 'is_pending' == $user_status ) {

bp-groups/bp-groups-actions.php

@@ -116 +116 @@
                         groups_update_groupmeta( $bp->groups->new_group_id, 'invite_status', $invite_status );
                 }
 
-                if ( 'group-invites' == bp_get_groups_current_create_step() )
+                if ( 'group-invites' == bp_get_groups_current_create_step() ) {
+
+                        if ( !empty( $_POST['friends'] ) ) {
+                                foreach( (array) $_POST['friends'] as $friend ) {
+                                        groups_invite_user( array( 'user_id' => $friend, 'group_id' => $bp->groups->new_group_id ) );
+                                }
+                        }
+
                         groups_send_invites( bp_loggedin_user_id(), $bp->groups->new_group_id );
+                }
 
                 do_action( 'groups_create_group_step_save_' . bp_get_groups_current_create_step() );
                 do_action( 'groups_create_group_step_complete' ); // Mostly for clearing cache on a generic action name
@@ -173 +181 @@
                 }
         }
 
+        if( 'group-invites' == bp_get_groups_current_create_step() && ! empty( $_REQUEST['user_id'] ) && is_numeric( $_REQUEST['user_id'] ) ) {
+
+                if ( !check_admin_referer( 'groups_invite_uninvite_user' ) )
+                        return false;
+
+                $message = __( 'Invite successfully removed', 'buddypress' );
+                $error   = false;
+
+                if( ! groups_uninvite_user( (int) $_REQUEST['user_id'], $bp->groups->new_group_id ) ) {
+                        $message = __( 'There was an error removing the invite', 'buddypress' );
+                        $error   = 'error';
+                }
+                         
+                bp_core_add_message( $message, $error );
+                bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/group-invites/' );     
+
+        }
+
         // Group avatar is handled separately
         if ( 'group-avatar' == bp_get_groups_current_create_step() && isset( $_POST['upload'] ) ) {
                 if ( ! isset( $bp->avatar_admin ) ) {

bp-groups/bp-groups-screens.php

@@ -447 +447 @@
         }
 }
 
+function groups_remove_group_invite() {
+
+        if ( !bp_is_single_item() )
+                return false;
+
+        if ( bp_is_group_invites() && bp_is_action_variable( 'remove', 0 ) && is_numeric( bp_action_variable( 1 ) ) ) {
+
+                if ( !check_admin_referer( 'groups_invite_uninvite_user' ) )
+                        return false;
+
+                $friend_id =  intval( bp_action_variable( 1 ) );
+                $group_id = bp_get_current_group_id();
+                $message = __( 'Invite successfully removed', 'buddypress' );
+                $redirect = wp_get_referer();
+                $error = false;
+
+                if ( ! bp_groups_user_can_send_invites( $group_id ) ) {
+                        $message = __( 'You are not allowed to send or remove invites', 'buddypress' );
+                        $error = 'error';
+                } else if ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
+                        $message = __( 'The member requested to join the group.', 'buddypress' );
+                        $error = 'error';
+                } else if ( ! groups_uninvite_user( $friend_id, $group_id ) ) {
+                        $message = __( 'There was an error removing the invite', 'buddypress' );
+                        $error = 'error';
+                }
+
+                bp_core_add_message( $message, $error );
+                bp_core_redirect( $redirect );
+
+        } else {
+                bp_do_404();
+        }
+}
+
+add_action( 'bp_screens', 'groups_remove_group_invite' );
+
 function groups_screen_group_request_membership() {
         global $bp;
 

bp-groups/bp-groups-template.php

@@ -2995 +2995 @@
         function bp_get_group_invite_user_remove_invite_url() {
                 global $invites_template;
 
-                return wp_nonce_url( site_url( bp_get_groups_slug() . '/' . $invites_template->invite->group_id . '/invites/remove/' . $invites_template->invite->user->id ), 'groups_invite_uninvite_user' );
+                $uninvite_url = bp_is_current_action( 'create' ) ? bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/group-invites/?user_id='. $invites_template->invite->user->id : bp_get_group_permalink( groups_get_current_group() ) . 'send-invites/remove/' . $invites_template->invite->user->id;
+
+                return wp_nonce_url( $uninvite_url, 'groups_invite_uninvite_user' );
         }
 
 /***