Changeset 3200

Timestamp:

08/18/2010 11:53:30 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Clean up groups_screen_group_admin_manage_members function and add 'remove' action.

File:

• branches/1.2/bp-groups.php (modified) (4 diffs)

branches/1.2/bp-groups.php

@@ -792 +792 @@
             $status = $bp->action_variables[2];
 
-            /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_promote_member' ) )
                 return false;
 
             // Promote a user.
-            if ( !groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) ) {
+            if ( !groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) )
                 bp_core_add_message( __( 'There was an error when promoting that user, please try again', 'buddypress' ), 'error' );
-            } else {
+            else
                 bp_core_add_message( __( 'User promoted successfully', 'buddypress' ) );
-            }
 
             do_action( 'groups_promoted_member', $user_id, $bp->groups->current_group->id );
@@ -811 +810 @@
             $user_id = $bp->action_variables[2];
 
-            /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_demote_member' ) )
                 return false;
 
             // Demote a user.
-            if ( !groups_demote_member( $user_id, $bp->groups->current_group->id ) ) {
+            if ( !groups_demote_member( $user_id, $bp->groups->current_group->id ) )
                 bp_core_add_message( __( 'There was an error when demoting that user, please try again', 'buddypress' ), 'error' );
-            } else {
+            else
                 bp_core_add_message( __( 'User demoted successfully', 'buddypress' ) );
-            }
 
             do_action( 'groups_demoted_member', $user_id, $bp->groups->current_group->id );
@@ -830 +828 @@
             $user_id = $bp->action_variables[2];
 
-            /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_ban_member' ) )
                 return false;
 
             // Ban a user.
-            if ( !groups_ban_member( $user_id, $bp->groups->current_group->id ) ) {
+            if ( !groups_ban_member( $user_id, $bp->groups->current_group->id ) )
                 bp_core_add_message( __( 'There was an error when banning that user, please try again', 'buddypress' ), 'error' );
-            } else {
+            else
                 bp_core_add_message( __( 'User banned successfully', 'buddypress' ) );
-            }
 
             do_action( 'groups_banned_member', $user_id, $bp->groups->current_group->id );
@@ -849 +846 @@
             $user_id = $bp->action_variables[2];
 
-            /* Check the nonce first. */
+            // Check the nonce first.
             if ( !check_admin_referer( 'groups_unban_member' ) )
                 return false;
 
             // Remove a ban for user.
-            if ( !groups_unban_member( $user_id, $bp->groups->current_group->id ) ) {
+            if ( !groups_unban_member( $user_id, $bp->groups->current_group->id ) )
                 bp_core_add_message( __( 'There was an error when unbanning that user, please try again', 'buddypress' ), 'error' );
-            } else {
+            else
                 bp_core_add_message( __( 'User ban removed successfully', 'buddypress' ) );
-            }
 
             do_action( 'groups_unbanned_member', $user_id, $bp->groups->current_group->id );
+
+            bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . 'admin/manage-members/' );
+        }
+
+        if ( 'remove' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
+            $user_id = $bp->action_variables[2];
+
+            // Check the nonce first.
+            if ( !check_admin_referer( 'groups_remove_member' ) )
+                return false;
+
+            // Remove a user.
+            if ( !groups_leave_group( $bp->groups->current_group->id, $user_id ) )
+                bp_core_add_message( __( 'There was an error removing that user from the group, please try again', 'buddypress' ), 'error' );
+            else
+                bp_core_add_message( __( 'User removed successfully', 'buddypress' ) );
+
+            do_action( 'groups_removed_member', $user_id, $bp->groups->current_group->id );
 
             bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . 'admin/manage-members/' );