Changeset 3537 for trunk/bp-groups.php

Timestamp:

12/18/2010 04:03:10 PM (14 years ago)

Author:

djpaul

Message:

Prevent banned group users posting new topics, and re-joining groups. Fixes #2661 and #2957, props r-a-y for initial patch.

File:

• trunk/bp-groups.php (modified) (10 diffs)

trunk/bp-groups.php

@@ -52 +52 @@
         /* This is a single group page. */
         $bp->is_single_item = true;
-        $bp->groups->current_group = new BP_Groups_Group( $group_id );
+        $bp->groups->current_group = groups_get_groups( array( 'type' => 'active', 'include' => $group_id ) );
+        $bp->groups->current_group = $bp->groups->current_group['groups'][0];
 
         /* Using "item" not "group" for generic support in other components. */
@@ -292 +293 @@
         $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
 
+        $user_is_banned = false;
+        if ( !is_super_admin() && groups_is_user_banned( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+            $user_is_banned = true;
+
         if ( $topic_slug && $topic_id ) {
 
             /* Posting a reply */
-            if ( !isset( $bp->action_variables[2] ) && isset( $_POST['submit_reply'] ) ) {
+            if ( !$user_is_banned && !isset( $bp->action_variables[2] ) && isset( $_POST['submit_reply'] ) ) {
                 /* Check the nonce */
                 check_admin_referer( 'bp_forums_new_reply' );
@@ -373 +378 @@
 
             /* Delete a topic */
-            else if ( isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
+            else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
                 /* Fetch the topic */
                 $topic = bp_forums_get_topic_details( $topic_id );
@@ -387 +392 @@
                     bp_core_add_message( __( 'There was an error deleting the topic', 'buddypress'), 'error' );
                 else
-                    bp_core_add_message( __( 'The topic was deleted successfully', 'buddypress') );
 
                 do_action( 'groups_delete_forum_topic', $topic_id );
@@ -394 +398 @@
 
             /* Editing a topic */
-            else if ( isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
+            else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
                 /* Fetch the topic */
                 $topic = bp_forums_get_topic_details( $topic_id );
@@ -419 +423 @@
 
             /* Delete a post */
-            else if ( isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
+            else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
                 /* Fetch the post */
                 $post = bp_forums_get_post( $post_id );
@@ -440 +444 @@
 
             /* Editing a post */
-            else if ( isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
+            else if ( !$user_is_banned && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) {
                 /* Fetch the post */
                 $post = bp_forums_get_post( $bp->action_variables[4] );
@@ -469 +473 @@
             /* Standard topic display */
             else {
+                if ( $user_is_banned )
+                    bp_core_add_message( __( "You have been banned from this group.", 'buddypress' ) );
+
                 bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/single/home' ) );
             }
 
         } else {
-
             /* Posting a topic */
             if ( isset( $_POST['submit_topic'] ) && function_exists( 'bp_forums_new_topic') ) {
@@ -479 +485 @@
                 check_admin_referer( 'bp_forums_new_topic' );
 
-                /* Auto join this user if they are not yet a member of this group */
-                if ( $bp->groups->auto_join && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                if ( $user_is_banned ) {
+                    $error_message = __( "You have been banned from this group.", 'buddypress' );
+
+                } elseif ( $bp->groups->auto_join && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+                    // Auto join this user if they are not yet a member of this group
                     groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
+                }
 
                 if ( empty( $_POST['topic_title'] ) )
@@ -500 +510 @@
                     }
                 }
-                
+
                 bp_core_redirect( $redirect );
-                
             }