<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [3200] branches/1.2/bp-groups.php:
  Clean up groups_screen_group_admin_manage_members function and add 'remove
 ' action.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>3200</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-18 23:53:30 +0000 (Wed, 18 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean up groups_screen_group_admin_manage_members function and add 'remove' action.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (3199 => 3200)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php        2010-08-18 23:47:57 UTC (rev 3199)
+++ branches/1.2/bp-groups.php        2010-08-18 23:53:30 UTC (rev 3200)
</span><span class="lines">@@ -791,16 +791,15 @@
</span><span class="cx">                         $user_id = $bp-&gt;action_variables[3];
</span><span class="cx">                         $status = $bp-&gt;action_variables[2];
</span><span class="cx"> 
</span><del>-                        /* Check the nonce first. */
</del><ins>+                        // Check the nonce first.
</ins><span class="cx">                         if ( !check_admin_referer( 'groups_promote_member' ) )
</span><span class="cx">                                 return false;
</span><span class="cx"> 
</span><span class="cx">                         // Promote a user.
</span><del>-                        if ( !groups_promote_member( $user_id, $bp-&gt;groups-&gt;current_group-&gt;id, $status ) ) {
</del><ins>+                        if ( !groups_promote_member( $user_id, $bp-&gt;groups-&gt;current_group-&gt;id, $status ) )
</ins><span class="cx">                                 bp_core_add_message( __( 'There was an error when promoting that user, please try again', 'buddypress' ), 'error' );
</span><del>-                        } else {
</del><ins>+                        else
</ins><span class="cx">                                 bp_core_add_message( __( 'User promoted successfully', 'buddypress' ) );
</span><del>-                        }
</del><span class="cx"> 
</span><span class="cx">                         do_action( 'groups_promoted_member', $user_id, $bp-&gt;groups-&gt;current_group-&gt;id );
</span><span class="cx"> 
</span><span class="lines">@@ -810,16 +809,15 @@
</span><span class="cx">                 if ( 'demote' == $bp-&gt;action_variables[1] &amp;&amp; is_numeric( $bp-&gt;action_variables[2] ) ) {
</span><span class="cx">                         $user_id = $bp-&gt;action_variables[2];
</span><span class="cx"> 
</span><del>-                        /* Check the nonce first. */
</del><ins>+                        // Check the nonce first.
</ins><span class="cx">                         if ( !check_admin_referer( 'groups_demote_member' ) )
</span><span class="cx">                                 return false;
</span><span class="cx"> 
</span><span class="cx">                         // Demote a user.
</span><del>-                        if ( !groups_demote_member( $user_id, $bp-&gt;groups-&gt;current_group-&gt;id ) ) {
</del><ins>+                        if ( !groups_demote_member( $user_id, $bp-&gt;groups-&gt;current_group-&gt;id ) )
</ins><span class="cx">                                 bp_core_add_message( __( 'There was an error when demoting that user, please try again', 'buddypress' ), 'error' );
</span><del>-                        } else {
</del><ins>+                        else
</ins><span class="cx">                                 bp_core_add_message( __( 'User demoted successfully', 'buddypress' ) );
</span><del>-                        }
</del><span class="cx"> 
</span><span class="cx">                         do_action( 'groups_demoted_member', $user_id, $bp-&gt;groups-&gt;current_group-&gt;id );
</span><span class="cx"> 
</span><span class="lines">@@ -829,16 +827,15 @@
</span><span class="cx">                 if ( 'ban' == $bp-&gt;action_variables[1] &amp;&amp; is_numeric( $bp-&gt;action_variables[2] ) ) {
</span><span class="cx">                         $user_id = $bp-&gt;action_variables[2];
</span><span class="cx"> 
</span><del>-                        /* Check the nonce first. */
</del><ins>+                        // Check the nonce first.
</ins><span class="cx">                         if ( !check_admin_referer( 'groups_ban_member' ) )
</span><span class="cx">                                 return false;
</span><span class="cx"> 
</span><span class="cx">                         // Ban a user.
</span><del>-                        if ( !groups_ban_member( $user_id, $bp-&gt;groups-&gt;current_group-&gt;id ) ) {
</del><ins>+                        if ( !groups_ban_member( $user_id, $bp-&gt;groups-&gt;current_group-&gt;id ) )
</ins><span class="cx">                                 bp_core_add_message( __( 'There was an error when banning that user, please try again', 'buddypress' ), 'error' );
</span><del>-                        } else {
</del><ins>+                        else
</ins><span class="cx">                                 bp_core_add_message( __( 'User banned successfully', 'buddypress' ) );
</span><del>-                        }
</del><span class="cx"> 
</span><span class="cx">                         do_action( 'groups_banned_member', $user_id, $bp-&gt;groups-&gt;current_group-&gt;id );
</span><span class="cx"> 
</span><span class="lines">@@ -848,22 +845,39 @@
</span><span class="cx">                 if ( 'unban' == $bp-&gt;action_variables[1] &amp;&amp; is_numeric( $bp-&gt;action_variables[2] ) ) {
</span><span class="cx">                         $user_id = $bp-&gt;action_variables[2];
</span><span class="cx"> 
</span><del>-                        /* Check the nonce first. */
</del><ins>+                        // Check the nonce first.
</ins><span class="cx">                         if ( !check_admin_referer( 'groups_unban_member' ) )
</span><span class="cx">                                 return false;
</span><span class="cx"> 
</span><span class="cx">                         // Remove a ban for user.
</span><del>-                        if ( !groups_unban_member( $user_id, $bp-&gt;groups-&gt;current_group-&gt;id ) ) {
</del><ins>+                        if ( !groups_unban_member( $user_id, $bp-&gt;groups-&gt;current_group-&gt;id ) )
</ins><span class="cx">                                 bp_core_add_message( __( 'There was an error when unbanning that user, please try again', 'buddypress' ), 'error' );
</span><del>-                        } else {
</del><ins>+                        else
</ins><span class="cx">                                 bp_core_add_message( __( 'User ban removed successfully', 'buddypress' ) );
</span><del>-                        }
</del><span class="cx"> 
</span><span class="cx">                         do_action( 'groups_unbanned_member', $user_id, $bp-&gt;groups-&gt;current_group-&gt;id );
</span><span class="cx"> 
</span><span class="cx">                         bp_core_redirect( bp_get_group_permalink( $bp-&gt;groups-&gt;current_group ) . 'admin/manage-members/' );
</span><span class="cx">                 }
</span><span class="cx"> 
</span><ins>+                if ( 'remove' == $bp-&gt;action_variables[1] &amp;&amp; is_numeric( $bp-&gt;action_variables[2] ) ) {
+                        $user_id = $bp-&gt;action_variables[2];
+
+                        // Check the nonce first.
+                        if ( !check_admin_referer( 'groups_remove_member' ) )
+                                return false;
+
+                        // Remove a user.
+                        if ( !groups_leave_group( $bp-&gt;groups-&gt;current_group-&gt;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-&gt;groups-&gt;current_group-&gt;id );
+
+                        bp_core_redirect( bp_get_group_permalink( $bp-&gt;groups-&gt;current_group ) . 'admin/manage-members/' );
+                }
+
</ins><span class="cx">                 do_action( 'groups_screen_group_admin_manage_members', $bp-&gt;groups-&gt;current_group-&gt;id );
</span><span class="cx"> 
</span><span class="cx">                 bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/single/home' ) );
</span></span></pre>
</div>
</div>

</body>
</html>