Changeset 1082

Timestamp:

02/12/2009 09:14:59 PM (17 years ago)

Author:

apeatling

Message:

Fixed bug with rejecting group invites. Added support for mass deleting notifications and invites when a group is deleted.

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-core/bp-core-notifications.php (modified) (1 diff)
• bp-groups.php (modified) (8 diffs)
• bp-groups/bp-groups-classes.php (modified) (2 diffs)

trunk/bp-core/bp-core-classes.php

@@ -309 +309 @@
     }
     
+    function delete_all_by_type( $item_id, $component_name, $component_action, $secondary_item_id ) {
+        global $wpdb, $bp;
+        
+        if ( $component_action )
+            $component_action_sql = $wpdb->prepare( "AND component_action = %s", $compoennt_action );
+        
+        if ( $secondary_item_id )
+            $secondary_item_sql = $wpdb->prepare( "AND secondary_item_id = %d", $secondary_item_id );
+        
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE item_id = %d AND component_name = %s {$component_action_sql} {$secondary_item_sql}", $item_id, $component_name ) );
+    }
 }   
 

trunk/bp-core/bp-core-notifications.php

@@ -81 +81 @@
 }
 
+function bp_core_delete_all_notifications_by_type( $item_id, $component_name, $component_action = false, $secondary_item_id = false ) {
+    return BP_Core_Notification::delete_all_by_type( $item_id, $component_name, $component_action, $secondary_item_id );
+}
+
 function bp_core_check_notification_access( $user_id, $notification_id ) {
     if ( !BP_Core_Notification::check_access( $user_id, $notification_id ) )

trunk/bp-groups.php

@@ -324 +324 @@
     } else if ( isset($bp->action_variables) && in_array( 'reject', $bp->action_variables ) && is_numeric($group_id) ) {
         
-        if ( !groups_reject_invite( $group_id, $bp->loggedin_user->id ) ) {
+        if ( !groups_reject_invite( $bp->loggedin_user->id, $group_id ) ) {
             bp_core_add_message( __('Group invite could not be rejected', 'buddypress'), 'error' );                         
         } else {            
@@ -515 +515 @@
             
             bp_core_add_message( __('Group invites sent.', 'buddypress') );
+
+            do_action( 'groups_screen_group_invite', $group_obj->id );
+
             bp_core_redirect( bp_group_permalink( $group_obj, false ) );
         } else {
-            do_action( 'groups_screen_group_invite', $group_obj->id );
-            
             // Show send invite page
             bp_core_load_template( 'groups/send-invite' );  
@@ -843 +844 @@
             } else {
                 bp_core_add_message( __( 'The group was deleted successfully', 'buddypress' ) );
+
+                do_action( 'groups_group_deleted', $_POST['group-id'] );
+
                 bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/' );
             }
-
-            do_action( 'groups_group_deleted', $_POST['group-id'] );
 
             bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component );
@@ -1647 +1649 @@
     
     do_action( 'groups_reject_invite', $user_id, $group_id );
+    
     return true;
 }
@@ -1672 +1675 @@
 
     if ( !$skip_check ) {
-        if ( !check_admin_referer( 'groups_send_invites' ) )
+        if ( !check_admin_referer( 'groups_send_invites', '_wpnonce_send_invites' ) )
             return false;
     }
@@ -1688 +1691 @@
     
     do_action( 'groups_send_invites', $group_obj->id, $invited_users );
+}
+
+function groups_delete_all_group_invites( $group_id ) {
+    return BP_Groups_Group::delete_all_invites( $group_id );
 }
 
@@ -2040 +2047 @@
     // Remove the activity stream item
     groups_delete_activity( array( 'item_id' => $group_id, 'component_name' => 'groups', 'component_action' => 'created_group', 'user_id' => $bp->loggedin_user->id ) );
-    
+ 
+    // Remove all outstanding invites for this group
+    groups_delete_all_group_invites( $group_id );
+
+    // Remove all notifications for any user belonging to this group
+    bp_core_delete_all_notifications_by_type( $group_id, $bp->groups->slug );
+    
     do_action( 'groups_delete_group', $group_id );
     
@@ -2240 +2253 @@
 add_action( 'wpmu_delete_user', 'groups_remove_data', 1 );
 add_action( 'delete_user', 'groups_remove_data', 1 );
+
 
 // List actions to clear super cached pages on, if super cache is installed

trunk/bp-groups/bp-groups-classes.php

@@ -476 +476 @@
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
     }
+    
+    function delete_all_invites( $group_id ) {
+        global $wpdb, $bp;
+        
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE group_id = %d AND invite_sent = 1", $group_id ) );
+    }
 }
 
@@ -616 +622 @@
     function delete( $user_id, $group_id, $check_empty = true ) {
         global $wpdb, $bp;
-        
+
         $delete_result = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );