Ticket #6020: 6020.1.diff

src/bp-groups/bp-groups-actions.php

@@ -365 +365 @@
  * @since BuddyPress (1.2.4)
  */
 function groups_action_leave_group() {
+
+        $group_id = bp_get_current_group_id();
+        $user_id = bp_loggedin_user_id();
+
         if ( ! bp_is_single_item() || ! bp_is_groups_component() || ! bp_is_current_action( 'leave-group' ) ) {
                 return false;
         }
@@ -375 +379 @@
         }
 
         // User wants to leave any group
-        if ( groups_is_user_member( bp_loggedin_user_id(), bp_get_current_group_id() ) ) {
+        if ( groups_is_user_member( $user_id, $group_id ) ) {
                 $bp = buddypress();
-
+                
                 // Stop sole admins from abandoning their group
-                $group_admins = groups_get_group_admins( bp_get_current_group_id() );
+                $group_admins = groups_get_group_admins( $group_id );
 
-                if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == bp_loggedin_user_id() ) {
+                if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == $user_id ) {
                         bp_core_add_message( __( 'This group must have at least one admin', 'buddypress' ), 'error' );
                 } elseif ( ! groups_leave_group( $bp->groups->current_group->id ) ) {
                         bp_core_add_message( __( 'There was an error leaving the group.', 'buddypress' ), 'error' );
                 } else {
-                        bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );
+                        //if users can leave, unsubscribe them from the forum and topics
+                        groups_leave_group_unsubscribe_forum( $group_id, $user_id );
+                         bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );         
                 }
 
                 $redirect = bp_get_group_permalink( groups_get_current_group() );

src/bp-groups/bp-groups-forums.php

@@ -428 +428 @@
 function groups_total_forum_topic_count( $status = 'public', $search_terms = false ) {
         return apply_filters( 'groups_total_forum_topic_count', BP_Groups_Group::get_global_topic_count( $status, $search_terms ) );
 }
+
+/**
+ * Unsubscribe user from all forums and topics when leaving a group
+ *
+ * @since 
+ *
+ * @param int $group_id  ID of the group.
+ * @param int $user_id The user whose subscriptions need to be deleted.
+ * @return bool true if any have been deleted
+ */
+function groups_leave_group_unsubscribe_forum( $group_id, $user_id ){
+        
+        //check if bbPress is active
+        if(  !class_exists('bbPress') ){
+                return false;
+        }
+
+        //get the forum associated with the group
+        $forums = groups_get_groupmeta( $group_id, 'forum_id' );
+        if( empty( $forums ) ){
+                return false;
+        }
+
+        foreach( $forums as $forum ){
+                
+                //get a user's forum and topic subscriptions    
+                $forum_subscriptions = bbp_get_user_subscribed_forum_ids( $user_id );
+                $topic_subscriptions = bbp_get_user_subscribed_topic_ids( $user_id );
+        
+                //bail if no subscriptions
+                if( empty( $forum_subscriptions ) && empty( $topic_subscriptions ) ){
+                        return false;
+                }
+                
+                $group_forums_subscribed = array_intersect( (array) $forum, $forum_subscriptions );
+                //unsubscribe if subscribed to the forum
+                if( !empty( $group_forums_subscribed ) ){
+                        foreach( $group_forums_subscribed as $group_forum_subscribed ){
+                                bbp_remove_user_subscription( $user_id, $group_forum_subscribed );
+                        }
+                }
+        
+                //get all the child topics for the forum, no matter what they are 
+                $topics = (array) bbp_get_all_child_ids( $forum, 'topic' );
+        
+                //are any of the forum topics in the user's topic subscriptions?
+                $group_topics_subscribed = array_intersect( $topics, $topic_subscriptions );
+
+                //if they are, unsubscribe them
+                if( !empty( $group_topics_subscribed ) ){
+                        foreach( $group_topics_subscribed as $group_topic_subscribed ){
+                                bbp_remove_user_subscription( $user_id, $group_topic_subscribed );
+                        }
+        
+                }
+        }
+
+        $unsubs = ( !empty( $group_forums_subscribed ) || !empty( $group_topics_subscribed ) ) ? true : false;
+        return $unsubs;
+}
+add_action( 'groups_ban_member', 'groups_leave_group_unsubscribe_forum', 10, 2);
+add_action( 'groups_remove_member', 'groups_leave_group_unsubscribe_forum', 10, 2);
+ No newline at end of file

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

@@ -371 +371 @@
                 return false;
         }
 
+        //if users can leave, unsubscribe them from the forum and topics
+        groups_leave_group_unsubscribe_forum( $group_id, $user_id );
+
         bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );
 
         do_action( 'groups_leave_group', $group_id, $user_id );