Changeset 511

Timestamp:

11/07/2008 06:01:12 PM (18 years ago)

Author:

apeatling

Message:

Added wp_redirect() to all confirmation messages to stop double posting
Added group delete option for group administrators

Location:

trunk

Files:

• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-blogs.php (modified) (1 diff)
• bp-blogs/bp-blogs-classes.php (modified) (1 diff)
• bp-core.php (modified) (7 diffs)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (21 diffs)
• bp-groups/bp-groups-classes.php (modified) (4 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)
• bp-messages.php (modified) (12 diffs)
• bp-messages/bp-messages-templatetags.php (modified) (2 diffs)
• bp-wire.php (modified) (2 diffs)
• bp-wire/bp-wire-classes.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

trunk/bp-activity/bp-activity-templatetags.php

@@ -174 +174 @@
 
 function bp_activity_insert_time_since( $content, $date ) {
+        if ( !$content || !$date )
+                return false;
+                
         return sprintf( $content, '  ' . bp_core_time_since( strtotime( $date ) ) . ' ' . __('ago', 'buddypress') );
 }

trunk/bp-blogs.php

@@ -485 +485 @@
 }
 
+function bp_blogs_get_random_blog() {
+        return BP_Blogs_Blog::get_random();
+}
+
 function bp_blogs_get_all_posts() {
         return BP_Blogs_Post::get_all();
 }
 
-function bp_blogs_get_random_blog() {
+function bp_blogs_redirect_to_random_blog() {
         global $bp, $wpdb;
         
         if ( $bp['current_component'] == $bp['blogs']['slug'] && isset( $_GET['random-blog'] ) ) {
-                $blogs = bp_blogs_get_all_blogs();
-
-                wp_redirect( get_blog_option( $blogs[rand( 0, count($blogs) - 1)], 'siteurl') );
-        }
-}
-add_action( 'wp', 'bp_blogs_get_random_blog', 6 );
+                $blog_id = bp_blogs_get_random_blog();
+
+                wp_redirect( get_blog_option( $blog_id, 'siteurl') );
+        }
+}
+add_action( 'wp', 'bp_blogs_redirect_to_random_blog', 6 );
 
 

trunk/bp-blogs/bp-blogs-classes.php

@@ -111 +111 @@
                 return $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM " . $bp['blogs']['table_name'] ) );
         }
+        
+        function get_random() {
+                global $bp, $wpdb;
+                
+                return $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM " . $bp['blogs']['table_name'] . " ORDER BY rand() LIMIT 1" ) );
+        }
+        
 }
 

trunk/bp-core.php

@@ -7 +7 @@
 define( 'MEMBERS_SLUG', 'members' );
 
-/* These components are accessed via the root, and not under a blog name or home base.
+/* These components are accessed via the root, and not under a blog name or member home.
    e.g Groups is accessed via: http://domain.com/groups/group-name NOT http://domain.com/andy/groups/group-name */
 define( 'BP_CORE_ROOT_COMPONENTS', 'groups' . ',' . MEMBERS_SLUG );
@@ -119 +119 @@
         /* Sets up container used for the avatar of the current component being viewed. Rendered by bp_get_options_avatar() */
         $bp['bp_options_avatar'] = '';
-        
-        /* Sets up container for callback messages rendered by bp_core_render_notice() */
-        $bp['message'] = '';
-        
-        /* Sets up container for callback message type rendered by bp_core_render_notice() */
-        $bp['message_type'] = ''; // error/success
 
         /* Fetch the full name for the logged in and current user */
@@ -146 +140 @@
 add_action( 'wp', 'bp_core_setup_globals', 1 );
 add_action( '_admin_menu', 'bp_core_setup_globals', 1 ); // must be _admin_menu hook.
+
+
+function bp_core_setup_session() {
+        // Start a session for error/success feedback on redirect and for signup functions.
+        session_start();
+        
+        // Render any error/success feedback on the template
+        if ( $_SESSION['message'] != '' )
+                add_action( 'template_notices', 'bp_core_render_notice' );
+}
+add_action( 'wp', 'bp_core_setup_session', 3 );
 
 
@@ -423 +428 @@
         
         if ( $bp['current_component'] == MEMBERS_SLUG && isset( $_GET['random'] ) ) {
-                $users = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM " . $wpdb->base_prefix . "users WHERE user_status = 0 AND spam = 0 AND deleted = 0" ) );
-
-                $ud = get_userdata( $users[rand( 0, count($users) - 1)] );
+                $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->base_prefix . "users WHERE user_status = 0 AND spam = 0 AND deleted = 0 ORDER BY rand() LIMIT 1" ) );
+
+                $ud = get_userdata( $user_id );
                 wp_redirect( $bp['root_domain'] . '/' . MEMBERS_SLUG . '/' . $ud->user_login );
         }
@@ -763 +768 @@
 }
 
+function bp_core_add_message( $message, $type = false ) {
+        if ( !$type )
+                $type = 'success';
+        
+        $_SESSION['message'] = $message;
+        $_SESSION['message_type'] = $type;
+}
+
 /**
  * bp_core_render_notice()
@@ -768 +781 @@
  * Renders a feedback notice (either error or success message) to the theme template.
  * The hook action 'template_notices' is used to call this function, it is not called directly.
- * The message and message type are stored in the $bp global, and are set up right before
- * the add_action( 'template_notices', 'bp_core_render_notice' ); is called where needed. 
  * 
  * @package BuddyPress Core
@@ -775 +786 @@
  */
 function bp_core_render_notice() {
-        global $bp;
-
-        if ( $bp['message'] != '' ) {
-                $type = ( $bp['message_type'] == 'success' ) ? 'updated' : 'error';
+        if ( $_SESSION['message'] ) {
+                $type = ( $_SESSION['message_type'] == 'success' ) ? 'updated' : 'error';
         ?>
                 <div id="message" class="<?php echo $type; ?>">
-                        <p><?php echo $bp['message']; ?></p>
+                        <p><?php echo $_SESSION['message']; ?></p>
                 </div>
         <?php 
+                unset( $_SESSION['message'] );
+                unset( $_SESSION['message_type'] );
         }
 }

trunk/bp-friends.php

@@ -122 +122 @@
                 
                 if ( friends_accept_friendship( $bp['action_variables'][1] ) ) {
-                        $bp['message'] = __('Friendship accepted', 'buddypress');
-                        $bp['message_type'] = 'success';
+                        bp_core_add_message( __('Friendship accepted', 'buddypress') );
                 } else {
-                        $bp['message'] = __('Friendship could not be accepted', 'buddypress');
-                        $bp['message_type'] = 'error';                                  
+                        bp_core_add_message( __('Friendship could not be accepted', 'buddypress'), 'error' );
                 }
-                add_action( 'template_notices', 'bp_core_render_notice' );
+                wp_redirect( $_SERVER['HTTP_REFERER'] );
                 
         } else if ( isset($bp['action_variables']) && in_array( 'reject', $bp['action_variables'] ) && is_numeric($bp['action_variables'][1]) ) {
                 
                 if ( friends_reject_friendship( $bp['action_variables'][1] ) ) {
-                        $bp['message'] = __('Friendship rejected', 'buddypress');
-                        $bp['message_type'] = 'success';
+                        bp_core_add_message( __('Friendship rejected', 'buddypress') );
                 } else {
-                        $bp['message'] = __('Friendship could not be rejected', 'buddypress');
-                        $bp['message_type'] = 'error';                          
-                }
-                add_action( 'template_notices', 'bp_core_render_notice' );
-                
-        }
+                        bp_core_add_message( __('Friendship could not be rejected', 'buddypress'), 'error' );
+                }       
+                wp_redirect( $_SERVER['HTTP_REFERER'] );        
+        }
+        
         bp_catch_uri( 'friends/requests' );
 }

trunk/bp-groups.php

@@ -260 +260 @@
 
                 if ( $member->save() ) {
-                        $bp['message'] = __('Group invite accepted', 'buddypress');
-                        $bp['message_type'] = 'success';
+                        bp_core_add_message( __('Group invite accepted', 'buddypress') );
                 } else {
-                        $bp['message'] = __('Group invite could not be accepted', 'buddypress');
-                        $bp['message_type'] = 'error';                                  
+                        bp_core_add_message( __('Group invite could not be accepted', 'buddypress'), 'error' );                 
                 }
-                add_action( 'template_notices', 'bp_core_render_notice' );
+                wp_redirect( $_SERVER['HTTP_REFERER'] );
+                
         } else if ( isset($bp['action_variables']) && in_array( 'reject', $bp['action_variables'] ) && is_numeric($bp['action_variables'][1]) ) {
                 if ( BP_Groups_Member::delete( $bp['loggedin_userid'], $bp['action_variables'][1] ) ) {
-                        $bp['message'] = __('Group invite rejected', 'buddypress');
-                        $bp['message_type'] = 'success';
+                        bp_core_add_message( __('Group invite rejected', 'buddypress') );
                 } else {
-                        $bp['message'] = __('Group invite could not be rejected', 'buddypress');
-                        $bp['message_type'] = 'error';                          
+                        bp_core_add_message( __('Group invite could not be rejected', 'buddypress'), 'error' );                 
                 }
-                add_action( 'template_notices', 'bp_core_render_notice' );
-        }
+                wp_redirect( $_SERVER['HTTP_REFERER'] );
+        }
+        
         bp_catch_uri( 'groups/list-invites' );  
 }
@@ -308 +306 @@
                         //var_dump($create_group_step, $_COOKIE['group_obj_id']);
                         if ( !$group_obj_id = &groups_manage_group( $create_group_step, $_COOKIE['group_obj_id'] ) ) {
-                                $bp['message'] = __('There was an error saving group details. Please try again.', 'buddypress');
-                                $bp['message_type'] = 'error';
-                
-                                add_action( 'template_notices', 'bp_core_render_notice' );
+                                bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
+                                wp_redirect( $_SERVER['HTTP_REFERER'] );
                         } else {
                                 $create_group_step++;
@@ -364 +360 @@
                                 bp_catch_uri( 'groups/group-home' );
                         } else {
-                                $bp['message'] = __('Wire message successfully posted.', 'buddypress');
-                                $bp['message_type'] = 'success';
-
-                                add_action( 'template_notices', 'bp_core_render_notice' );
-                                if ( !strpos( $_SERVER['HTTP_REFERER'], 'wire' ) ) {
-                                        bp_catch_uri( 'groups/group-home' );
+                                bp_core_add_message( __('Wire message successfully posted.', 'buddypress') );
+                                
+                                if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
+                                        wp_redirect( bp_group_permalink( $group_obj, false ) );
                                 } else {
-                                        bp_catch_uri( 'groups/wire' );
+                                        wp_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
                                 }
                         }
@@ -381 +375 @@
                                 bp_catch_uri( 'groups/group-home' );
                         } else {
-                                $bp['message'] = __('Wire message successfully deleted.', 'buddypress');
-                                $bp['message_type'] = 'success';
-
-                                add_action( 'template_notices', 'bp_core_render_notice' );
-
-                                if ( !strpos( $_SERVER['HTTP_REFERER'], 'wire' ) ) {
-                                        bp_catch_uri( 'groups/group-home' );
+                                bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
+                                
+                                if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
+                                        wp_redirect( bp_group_permalink( $group_obj, false ) );
                                 } else {
-                                        bp_catch_uri( 'groups/wire' );
-                                }                                                                       
+                                        wp_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
+                                }
                         }
                 
@@ -429 +420 @@
                         groups_send_invites($group_obj);
                         
-                        $bp['message'] = __('Group invites sent.', 'buddypress');
-                        $bp['message_type'] = 'success';
-                        
-                        add_action( 'template_notices', 'bp_core_render_notice' );
-                        bp_catch_uri( 'groups/group-home' );
+                        bp_core_add_message( __('Group invites sent.', 'buddypress') );
+                        wp_redirect( bp_group_permalink( $group_obj, false ) );
                 } else {
                         // Show send invite page
@@ -449 +437 @@
                         // remove the user from the group.
                         if ( !groups_leave_group( $group_obj->id ) ) {
-                                $bp['message'] = __('There was an error leaving the group. Please try again.', 'buddypress');
-                                $bp['message_type'] = 'error';                                                                          
+                                bp_core_add_message(  __('There was an error leaving the group. Please try again.', 'buddypress'), 'error' );
+                                wp_redirect( bp_group_permalink( $group_obj, false) );
                         } else {
-                                $bp['message'] = __('You left the group successfully.', 'buddypress');
-                                $bp['message_type'] = 'success';        
+                                bp_core_add_message( __('You left the group successfully.', 'buddypress') );
+                                wp_redirect( $bp['loggedin_domain'] . $bp['groups']['slug'] );
                         }
-                        add_action( 'template_notices', 'bp_core_render_notice' );
-                
-                        $bp['current_action'] = 'group-home';
-                        bp_catch_uri( 'groups/group-home' );
-                
                 } else if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'no' ) {
-                        bp_catch_uri( 'groups/group-home' );
+                        wp_redirect( bp_group_permalink( $group_obj, false) );
                 } else {
                         // Show leave group page
@@ -476 +459 @@
         
         if ( $group_obj->status == 'private' ) {
-                
                 // If the user has submitted a request, send it.
                 if ( isset( $_POST['group-request-send']) ) {
                         if ( !groups_send_membership_request( $bp['loggedin_userid'], $group_obj->id ) ) {
-                                $bp['message'] = __( 'There was an error sending your group membership request, please try again.', 'buddypress' );
-                                $bp['message_type'] = 'error';
+                                bp_core_add_message( __( 'There was an error sending your group membership request, please try again.', 'buddypress' ), 'error' );
                         } else {
-                                $bp['message'] = __( 'Your membership request was sent to the group administrator successfully. You will be notified when the group administrator responds to your request.', 'buddypress' );
-                                $bp['message_type'] = 'success';
+                                bp_core_add_message( __( 'Your membership request was sent to the group administrator successfully. You will be notified when the group administrator responds to your request.', 'buddypress' ) );
                         }
-                        add_action( 'template_notices', 'bp_core_render_notice' );
-
                 }
                 bp_catch_uri( 'groups/request-membership' );
@@ -501 +479 @@
 
 function groups_screen_group_admin_edit_details() {
-        global $bp;
+        global $bp, $group_obj;
         
         if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'edit-details' ) {
@@ -507 +485 @@
                 if ( !$bp['is_item_admin'] )
                         return false;
-                        
+                
                 // If the edit form has been submitted, save the edited details
                 if ( isset( $_POST['save'] ) ) {
                         if ( !groups_edit_base_group_details( $_POST['group-id'], $_POST['group-name'], $_POST['group-desc'], $_POST['group-news'], (int)$_POST['group-notify-members'] ) ) {
-                                $bp['message'] = __( 'There was an error updating group details, please try again.', 'buddypress' );
-                                $bp['message_type'] = 'error';
+                                bp_core_add_message( __( 'There was an error updating group details, please try again.', 'buddypress' ), 'error' );
                         } else {
-                                $bp['message'] = __( 'Group details were successfully updated.', 'buddypress' );
-                                $bp['message_type'] = 'success';
+                                bp_core_add_message( __( 'Group details were successfully updated.', 'buddypress' ) );
                         }
-                        add_action( 'template_notices', 'bp_core_render_notice' );
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
                 }
 
@@ -523 +499 @@
         }
 }
-add_action( 'wp', 'groups_screen_group_admin_edit_details', 3 );
+add_action( 'wp', 'groups_screen_group_admin_edit_details', 4 );
 
 
@@ -543 +519 @@
                         
                         if ( !groups_edit_group_settings( $_POST['group-id'], $enable_wire, $enable_forum, $enable_photos, $photos_admin_only, $status ) ) {
-                                $bp['message'] = __( 'There was an error updating group settings, please try again.', 'buddypress' );
-                                $bp['message_type'] = 'error';
+                                bp_core_add_message( __( 'There was an error updating group settings, please try again.', 'buddypress' ), 'error' );
                         } else {
-                                $bp['message'] = __( 'Group settings were successfully updated.', 'buddypress' );
-                                $bp['message_type'] = 'success';
+                                bp_core_add_message( __( 'Group settings were successfully updated.', 'buddypress' ) );
                         }
-                        add_action( 'template_notices', 'bp_core_render_notice' );
+                        
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
                 }
                 
@@ -555 +530 @@
         }
 }
-add_action( 'wp', 'groups_screen_group_admin_settings', 3 );
+add_action( 'wp', 'groups_screen_group_admin_settings', 4 );
 
 
@@ -576 +551 @@
                                 // Accept the membership request
                                 if ( !groups_accept_membership_request( $membership_id ) ) {
-                                        $bp['message'] = __( 'There was an error accepting the membership request, please try again.', 'buddypress' );
-                                        $bp['message_type'] = 'error';
+                                        bp_core_add_message( __( 'There was an error accepting the membership request, please try again.', 'buddypress' ), 'error' );
                                 } else {
-                                        $bp['message'] = __( 'Group membership request accepted', 'buddypress' );
-                                        $bp['message_type'] = 'success';
+                                        bp_core_add_message( __( 'Group membership request accepted', 'buddypress' ) );
                                 }
                         } else if ( $request_action == 'reject' && is_numeric($membership_id) ) {
                                 // Reject the membership request
                                 if ( !groups_reject_membership_request( $membership_id ) ) {
-                                        $bp['message'] = __( 'There was an error rejecting the membership request, please try again.', 'buddypress' );
-                                        $bp['message_type'] = 'error';
+                                        bp_core_add_message( __( 'There was an error rejecting the membership request, please try again.', 'buddypress' ), 'error' );
                                 } else {
-                                        $bp['message'] = __( 'Group membership request rejected', 'buddypress' );
-                                        $bp['message_type'] = 'success';
+                                        bp_core_add_message( __( 'Group membership request rejected', 'buddypress' ) );
                                 }       
                         }
-                        add_action( 'template_notices', 'bp_core_render_notice' );
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
                 }
                 
@@ -598 +569 @@
         }
 }
-add_action( 'wp', 'groups_screen_group_admin_requests', 3 );
-
+add_action( 'wp', 'groups_screen_group_admin_requests', 4 );
+
+function groups_screen_group_admin_delete_group() {
+        global $bp, $group_obj;
+        
+        if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'delete-group' ) {
+                
+                if ( !$bp['is_item_admin'] )
+                        return false;
+                
+                if ( isset( $_POST['delete-group-button'] ) && isset( $_POST['delete-group-understand'] ) ) {
+                        // Group admin has deleted the group, now do it.
+                        if ( !groups_delete_group( $_POST['group-id']) ) {
+                                bp_core_add_message( __( 'There was an error deleting the group, please try again.', 'buddypress' ), 'error' );
+                        } else {
+                                bp_core_add_message( __( 'The group was deleted successfully', 'buddypress' ) );
+                                wp_redirect( site_url() . '/' . $bp['groups']['slug'] . '/' );
+                        }
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
+                } else {
+                        bp_catch_uri( 'groups/admin/delete-group' );
+                }
+        }
+}
+add_action( 'wp', 'groups_screen_group_admin_delete_group', 4 );
 
 function groups_screen_notification_settings() { 
@@ -660 +654 @@
         if ( !groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) ) {
                 if ( !groups_join_group($group_obj->id) ) {
-                        $bp['message'] = __('There was an error joining the group. Please try again.', 'buddypress');
-                        $bp['message_type'] = 'error';
+                        bp_core_add_message( __('There was an error joining the group. Please try again.', 'buddypress'), 'error' );
                 } else {
-                        $bp['message'] = __('You joined the group!', 'buddypress');
-                        $bp['message_type'] = 'success';        
+                        bp_core_add_message( __('You joined the group!', 'buddypress') );
                 }
-
-                add_action( 'template_notices', 'bp_core_render_notice' );
+                wp_redirect( $_SERVER['HTTP_REFERER'] );
         }
 
@@ -1192 +1183 @@
 }
 
+function groups_is_group_admin( $user_id, $group_id ) {
+        return BP_Groups_Member::check_is_admin( $user_id, $group_id );
+}
+
 function groups_new_wire_post( $group_id, $content ) {
         if ( $wire_post_id = bp_wire_new_post( $group_id, $content ) ) {
@@ -1229 +1224 @@
         if ( !$group->save() )
                 return false;
-        
+
         if ( $notify_members )
                 groups_notification_group_updated( $group->id );
@@ -1312 +1307 @@
 }
 
-function groups_get_random_group() {
+function groups_redirect_to_random_group() {
         global $bp, $wpdb;
         
         if ( $bp['current_component'] == $bp['groups']['slug'] && isset( $_GET['random'] ) ) {
-                $groups = groups_get_all();
-
-                wp_redirect( $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $groups[rand( 0, count($groups) - 1)]->slug );
-        }
-}
-add_action( 'wp', 'groups_get_random_group', 6 );
+                $group = groups_get_random_group();
+
+                wp_redirect( $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $group->slug );
+        }
+}
+add_action( 'wp', 'groups_redirect_to_random_group', 6 );
+
+function groups_delete_group( $group_id ) {
+        global $bp;
+        
+        // Check the user is the group admin.
+        if ( !groups_is_group_admin( $bp['loggedin_userid'], $group_id ) )
+                return false;
+        
+        // Get the group object
+        $group = new BP_Groups_Group( $group_id );
+        
+        if ( !$group->delete() )
+                return false;
+        
+        return true;
+}
 
 function groups_check_for_membership_request( $user_id, $group_id ) {
@@ -1341 +1352 @@
 function groups_get_all() {
         return BP_Groups_Group::get_all();
+}
+
+function groups_get_random_group() {
+        return BP_Groups_Group::get_random();
 }
 
@@ -1349 +1364 @@
 //
 
-function groups_delete_groupmeta( $group_id, $meta_key, $meta_value = '' ) {
+function groups_delete_groupmeta( $group_id, $meta_key = false, $meta_value = false ) {
         global $wpdb, $bp;
         
@@ -1362 +1377 @@
         $meta_value = trim( $meta_value );
 
-        if ( !empty($meta_value) )
-                $wpdb->query( $wpdb->prepare("DELETE FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE groups_id = %d AND meta_key = %s AND meta_value = %s", $group_id, $meta_key, $meta_value) );
-        else
-                $wpdb->query( $wpdb->prepare("DELETE FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key) );
-
+        if ( !$meta_key ) {
+                $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d", $group_id ) );           
+        } else if ( !$meta_value ) {
+                $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s AND meta_value = %s", $group_id, $meta_key, $meta_value ) );
+        } else {
+                $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
+        }
+        
         // TODO need to look into using this.
         // wp_cache_delete($group_id, 'groups');

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

@@ -164 +164 @@
                         );
                 }
-
-                if ( !$result = $wpdb->query($sql) )
+                
+                if ( $wpdb->query($sql) === false )
                         return false;
                 
@@ -228 +228 @@
                 return false;
         }
+        
+        function delete() {
+                global $wpdb, $bp;
+                
+                // Delete groupmeta for the group
+                groups_delete_groupmeta( $this->id );
+
+                // Modify group count usermeta for members
+                for ( $i = 0; $i < count($this->user_dataset); $i++ ) {
+                        $user = $this->user_dataset[$i];
+
+                        if ( $total_count = get_usermeta( $user->user_id, 'total_group_count' ) != '' ) {
+                                update_usermeta( $user->user_id, 'total_group_count', (int)$total_count - 1 );
+                        }
+                        
+                        // Now delete the group member record
+                        BP_Groups_Member::delete( $user->user_id, $this->id, false );
+                }
+                
+                // Delete the wire posts for this group if the wire is installed
+                if ( function_exists('bp_wire_install') ) {
+                        BP_Wire_Post::delete_all_for_item( $this->id, $bp['groups']['table_name_wire'] );
+                }
+                
+                do_action( 'bp_groups_delete_group_content', $this->id );
+                
+                // Finally remove the group entry from the DB
+                if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['groups']['table_name'] . " WHERE id = %d", $this->id ) ) )
+                        return false;
+
+                return true;
+        }
+        
 
         /* Static Functions */
-        
-        function delete( $group_id ) {
-                global $wpdb, $bp;
-                
-                if ( $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['groups']['table_name'] . " WHERE id = %d", $group_id ) ) )
-                        return false;
-                
-                /* Remove groupmeta */
-                groups_delete_groupmeta( $group_id );
-                
-                return true;
-        }
-        
+                
         function group_exists( $slug, $table_name = false ) {
                 global $wpdb, $bp;
@@ -379 +400 @@
                 
                 return $wpdb->get_results( $wpdb->prepare( "SELECT id, slug FROM " . $bp['groups']['table_name'] . " WHERE status = 'public'" ) ); 
+        }
+        
+        function get_random() {
+                global $wpdb, $bp;
+                
+                return $wpdb->get_row( $wpdb->prepare( "SELECT id, slug FROM " . $bp['groups']['table_name'] . " WHERE status = 'public' ORDER BY rand() LIMIT 1" ) );          
         }
 }
@@ -476 +503 @@
         /* Static Functions */
 
-        function delete( $user_id, $group_id ) {
+        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 ) );
-        
-                // Check to see if there are any members left for the group, if not, delete it.
-                if ( !BP_Groups_Group::has_members( $group_id ) ) {
-                        BP_Groups_Group::delete( $group_id );
-                }
-                
+
                 return $delete_result;
         }

trunk/bp-groups/bp-groups-templatetags.php

@@ -414 +414 @@
         <li<?php if ( $current_tab == 'edit-details' || $current_tab == '' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/edit-details"><?php _e('Edit Details', 'buddypress') ?></a></li>
         <li<?php if ( $current_tab == 'group-settings' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/group-settings"><?php _e('Group Settings', 'buddypress') ?></a></li>
-        <!--<li<?php if ( $current_tab == 'manage-members' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>-->
-        <!--<li<?php if ( $current_tab == 'delete-group' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>-->
+        <li<?php if ( $current_tab == 'manage-members' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>
+        
         <?php if ( $groups_template->group->status == 'private' ) : ?>
         <li<?php if ( $current_tab == 'membership-requests' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
         <?php endif; ?>
+        
+        <li<?php if ( $current_tab == 'delete-group' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>
+        
 <?php
         do_action( 'bp_groups_admin_tabs' );
@@ -575 +578 @@
                                                 bp_group_send_invite_form( $group_obj );
                                         } else {
-                                                $group_link = bp_group_permalink( $group, false );
+                                                $group_link = bp_group_permalink( $group_obj, false );
                                                 ?>
                                                 <div id="message" class="info">

trunk/bp-messages.php

@@ -117 +117 @@
 
 function messages_check_installed() {   
-        global $wpdb, $bp, $userdata;
+        global $wpdb, $bp;
 
         if ( is_site_admin() ) {
@@ -174 +174 @@
 
 function messages_screen_compose() {
+        
+        if ( isset($_POST['send_to']) || ( isset($_POST['send-notice']) && is_site_admin() ) ) {
+                messages_send_message( $_POST['send_to'], $_POST['subject'], $_POST['content'], $_POST['thread_id'], false, true );
+        }
+        
         bp_catch_uri( 'messages/compose' );
 }
@@ -193 +198 @@
                 if ( $bp['action_variables'][0] == 'deactivate' ) {
                         if ( !$notice->deactivate() ) {
-                                $bp['message'] = __('There was a problem deactivating that notice.', 'buddypress');     
+                                bp_core_add_message( __('There was a problem deactivating that notice.', 'buddypress'), 'error' );      
                         } else {
-                                $bp['message'] = __('Notice deactivated.', 'buddypress');
-                                $bp['message_type'] = 'success';
+                                bp_core_add_message( __('Notice deactivated.', 'buddypress') );
                         }
                 } else if ( $bp['action_variables'][0] == 'activate' ) {
                         if ( !$notice->activate() ) {
-                                $bp['message'] = __('There was a problem activating that notice.', 'buddypress');
+                                bp_core_add_message( __('There was a problem activating that notice.', 'buddypress'), 'error' );
                         } else {
-                                $bp['message'] = __('Notice activated.', 'buddypress');
-                                $bp['message_type'] = 'success';
+                                bp_core_add_message( __('Notice activated.', 'buddypress') );
                         }
                 } else if ( $bp['action_variables'][0] == 'delete' ) {
                         if ( !$notice->delete() ) {
-                                $bp['message'] = __('There was a problem deleting that notice.', 'buddypress');
+                                bp_core_add_message( __('There was a problem deleting that notice.', 'buddypress'), 'buddypress' );
                         } else {
-                                $bp['message'] = __('Notice deleted.', 'buddypress');
-                                $bp['message_type'] = 'success';
+                                bp_core_add_message( __('Notice deleted.', 'buddypress') );
                         }
                 }
         }
-                
-        add_action( 'template_notices', 'bp_core_render_notice' );
         bp_catch_uri( 'messages/notices' );     
 }
@@ -279 +279 @@
 
         if ( !$thread_id || !is_numeric($thread_id) || !BP_Messages_Thread::check_access($thread_id) ) {
-                $bp['current_action'] = 'inbox';
-                bp_catch_uri( 'messages/index' );
+                wp_redirect( $_SERVER['HTTP_REFERER'] );
         } else {
                 // delete message
                 if ( !BP_Messages_Thread::delete($thread_id) ) {
-                        $bp['message'] = __('There was an error deleting that message.', 'buddypress');
-                        add_action( 'template_notices', 'bp_core_render_notice' );
-
-                        $bp['current_action'] = 'inbox';
-                        bp_catch_uri( 'messages/index' );
-                } else {
-                        $bp['message'] = __('Message deleted.', 'buddypress');
-                        $bp['message_type'] = 'success';
-                        add_action( 'template_notices', 'bp_core_render_notice' );
-
-                        $bp['current_action'] = 'inbox';
-                        bp_catch_uri( 'messages/index' );
+                        bp_core_add_message( __('There was an error deleting that message.', 'buddypress'), 'error' );
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
+                } else {
+                        bp_core_add_message( __('Message deleted.', 'buddypress') );
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
                 }
         }
@@ -315 +307 @@
         } else {
                 if ( !BP_Messages_Thread::delete( explode(',', $thread_ids ) ) ) {
-                        $message = __('There was an error deleting messages.', 'buddypress');
-                        add_action( 'template_notices', 'bp_core_render_notice' );
-
-                        $bp['current_action'] = 'inbox';
-                        bp_catch_uri( 'messages/index' );
-                } else {
-                        $bp['message'] = __('Messages deleted.', 'buddypress');
-                        $bp['message_type'] = 'success';
-                        add_action( 'template_notices', 'bp_core_render_notice' );
-
-                        $bp['current_action'] = 'inbox';
-                        bp_catch_uri( 'messages/index' );
+                        bp_core_add_message( __('There was an error deleting messages.', 'buddypress'), 'error' );
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
+                } else {
+                        bp_core_add_message( __('Messages deleted.', 'buddypress') );
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
                 }
         }
@@ -360 +345 @@
 
 /**************************************************************************
- messages_write_new()
- 
- Handle and display the write new messages screen.
- **************************************************************************/
-
-function messages_write_new( $username = '', $subject = '', $content = '', $type = '', $message = '' ) { ?>
-        <?php
-        global $messages_write_new_action;
-        ?>
-        
-        <div class="wrap">
-                <h2><?php _e('Compose Message', 'buddypress') ?></h2>
-                
-                <?php
-                        if ( $message != '' ) {
-                                $type = ( $type == 'error' ) ? 'error' : 'updated';
-                ?>
-                        <div id="message" class="<?php echo $type; ?> fade">
-                                <p><?php echo $message; ?></p>
-                        </div>
-                <?php } ?>
-                                                
-                <form action="<?php echo $messages_write_new_action ?>" method="post" id="send_message_form">
-                <div id="poststuff">
-                        <p>                     
-                        <div id="titlediv">
-                                <h3><?php _e("Send To", 'buddypress') ?> <small>(Use username - autocomplete coming soon)</small></h3>
-                                <div id="titlewrap">
-                                        <input type="text" name="send_to" id="send_to" value="<?php echo $username; ?>" />
-                                        <?php if ( is_site_admin() ) : ?><br /><input type="checkbox" id="send-notice" name="send-notice" value="1" /> This is a notice to all users.<?php endif; ?>
-                                </div>
-                        </div>
-                        </p>
-
-                        <p>
-                        <div id="titlediv">
-                                <h3><?php _e("Subject", 'buddypress') ?></h3>
-                                <div id="titlewrap">
-                                        <input type="text" name="subject" id="subject" value="<?php echo $subject; ?>" />
-                                </div>
-                        </div>
-                        </p>
-                        
-                        <p>
-                                <div id="postdivrich" class="postarea">
-                                        <h3><?php _e("Message", 'buddypress') ?></h3>
-                                        <div id="editorcontainer">
-                                                <textarea name="content" id="message_content" rows="15" cols="40"><?php echo $content; ?></textarea>
-                                        </div>
-                                </div>
-                        </p>
-                        
-                        <p class="submit">
-                                        <input type="submit" value="<?php _e("Send", 'buddypress') ?> &raquo;" name="send" id="send" style="font-weight: bold" />
-                        </p>
-                </div>
-                </form>
-                <script type="text/javascript">
-                        document.getElementById("send_to").focus();
-                </script>
-                
-        </div>
-        <?php
-}
-
-/**************************************************************************
  messages_send_message()
   
@@ -432 +351 @@
 
 function messages_send_message( $recipients, $subject, $content, $thread_id, $from_ajax = false, $from_template = false, $is_reply = false ) {
-        global $userdata;
-        global $messages_write_new_action;
         global $pmessage;
         global $message, $type;
@@ -440 +357 @@
         if ( isset( $_POST['send-notice'] ) ) {
                 messages_send_notice( $subject, $content, $from_template );
-        } else {
-                if ( $recipients == '' ) {
-                        if ( !$from_ajax ) {
-                                messages_write_new( '', $subject, $content, 'error', __('Please enter at least one valid user to send this message to.', 'buddypress'), $messages_write_new_action );
+                return true;
+        }
+
+        messages_add_callback_values( $recipients, $subject, $content );
+
+        if ( $recipients == '' ) {
+                if ( !$from_ajax ) {    
+                        bp_core_add_message( __('Please enter at least one valid user to send this message to.', 'buddypress'), 'error' );
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
+                } else {
+                        return array('status' => 0, 'message' => __('There was an error sending the reply, please try again.', 'buddypress'));
+                }
+        } else if ( $subject == '' || $content == '' ) {
+                if ( !$from_ajax ) {
+                        bp_core_add_message( __('Please make sure you fill in all the fields.', 'buddypress'), 'error' );
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
+                } else {
+                        return array('status' => 0, 'message' => __('Please make sure you have typed a message before sending a reply.', 'buddypress'));
+                }
+        } else {
+                $pmessage = new BP_Messages_Message;
+
+                $pmessage->sender_id = $bp['loggedin_userid'];
+                $pmessage->subject = $subject;
+                $pmessage->message = $content;
+                $pmessage->thread_id = $thread_id;
+                $pmessage->date_sent = time();
+                $pmessage->message_order = 0; // TODO
+                $pmessage->sender_is_group = 0;
+                
+                if ( $is_reply ) {
+                        $thread = new BP_Messages_Thread($thread_id);
+                        $pmessage->recipients = $thread->get_recipients();
+                } else {
+                        $pmessage->recipients = BP_Messages_Message::get_recipient_ids( explode( ',', $recipients ) );
+                }
+
+                if ( !is_null( $pmessage->recipients ) ) {
+                        if ( !$pmessage->send() ) {
+                                $message = __('Message could not be sent, please try again.', 'buddypress');
+                                $type = 'error';
+                
+                                if ( $from_ajax ) {
+                                        return array('status' => 0, 'message' => $message);
+                                } else {
+                                        bp_core_add_message( $message, $type );
+                                        wp_redirect( $_SERVER['HTTP_REFERER'] );
+                                } 
                         } else {
-                                return array('status' => 0, 'message' => __('There was an error sending the reply, please try again.', 'buddypress'));
-                        }
-                } else if ( $subject == '' || $content == '' ) {
-                        if ( !$from_ajax ) {
-                                messages_write_new( $to_user, $subject, $content, 'error', __('Please make sure you fill in all the fields.', 'buddypress'), $messages_write_new_action );
-                        } else {
-                                return array('status' => 0, 'message' => __('Please make sure you have typed a message before sending a reply.', 'buddypress'));
-                        }
-                } else {
-                        $pmessage = new BP_Messages_Message;
-
-                        $pmessage->sender_id = $userdata->ID;
-                        $pmessage->subject = $subject;
-                        $pmessage->message = $content;
-                        $pmessage->thread_id = $thread_id;
-                        $pmessage->date_sent = time();
-                        $pmessage->message_order = 0; // TODO
-                        $pmessage->sender_is_group = 0;
-                        
-                        if ( $is_reply ) {
-                                $thread = new BP_Messages_Thread($thread_id);
-                                $pmessage->recipients = $thread->get_recipients();
-                        } else {
-                                $pmessage->recipients = BP_Messages_Message::get_recipient_ids( explode( ',', $recipients ) );
-                        }
-                        
-                        unset($_GET['mode']);
-
-                        if ( !is_null( $pmessage->recipients ) ) {
-                                if ( !$pmessage->send() ) {
-                                        $message = __('Message could not be sent, please try again.', 'buddypress');
-                                        $type = 'error';
-                        
-                                        if ( $from_ajax ) {
-                                                return array('status' => 0, 'message' => $message);
-                                        } else if ( $from_template ) {
-                                                unset($_POST['send_to']);
-                                                $bp['message'] = $message;
-                                                $bp['message_type'] = $type;
-                                                
-                                                bp_core_render_notice();
-                                                messages_write_new();
-                                        } else {
-                                                messages_box( 'inbox', __('Inbox', 'buddypress'), $message, $type );    
-                                        }
-                                } else {
-                                        $message = __('Message sent successfully!', 'buddypress') . ' <a href="' . $bp['loggedin_domain'] . $bp['messages']['slug'] . '/view/' . $pmessage->thread_id . '">' . __('View Message', 'buddypress') . '</a> &raquo;';
-                                        $type = 'success';
-                                        
-                                        // Send notices to the recipients
-                                        for ( $i = 0; $i < count($pmessage->recipients); $i++ ) {
-                                                if ( $pmessage->recipients[$i] != $bp['loggedin_userid'] ) {
-                                                        bp_core_add_notification( $pmessage->id, $pmessage->recipients[$i], 'messages', 'new_message' );        
-                                                }
-                                        }
-                                        
-                                        do_action( 'bp_messages_message_sent', array( 'item_id' => $pmessage->id, 'recipient_ids' => $pmessage->recipients, 'thread_id' => $pmessage->thread_id, 'component_name' => 'messages', 'component_action' => 'message_sent', 'is_private' => 1 ) );
-                        
-                                        if ( $from_ajax ) {
-                                                return array('status' => 1, 'message' => $message, 'reply' => $pmessage);
-                                        } else if ( $from_template ) {
-                                                unset($_POST['send_to']);
-                                                $bp['message'] = $message;
-                                                $bp['message_type'] = $type;
-                                                
-                                                bp_core_render_notice();
-                                                messages_write_new();
-                                        } else {
-                                                messages_box( 'inbox', __('Inbox', 'buddypress'), $message, $type );
+                                $message = __('Message sent successfully!', 'buddypress') . ' <a href="' . $bp['loggedin_domain'] . $bp['messages']['slug'] . '/view/' . $pmessage->thread_id . '">' . __('View Message', 'buddypress') . '</a> &raquo;';
+                                $type = 'success';
+                                
+                                // Send notices to the recipients
+                                for ( $i = 0; $i < count($pmessage->recipients); $i++ ) {
+                                        if ( $pmessage->recipients[$i] != $bp['loggedin_userid'] ) {
+                                                bp_core_add_notification( $pmessage->id, $pmessage->recipients[$i], 'messages', 'new_message' );        
                                         }
                                 }
-                        } else {
-                                unset($_POST['send_to']);
-                                unset($_POST['send-notice']);
-                        
-                                $message = __('Message could not be sent, please try again.', 'buddypress');
-                                $type = 'error';
-                        
+                                
+                                do_action( 'bp_messages_message_sent', array( 'item_id' => $pmessage->id, 'recipient_ids' => $pmessage->recipients, 'thread_id' => $pmessage->thread_id, 'component_name' => 'messages', 'component_action' => 'message_sent', 'is_private' => 1 ) );
+                
                                 if ( $from_ajax ) {
-                                        return array('status' => 0, 'message' => $message);
-                                } else if ( $from_template ) {
-                                        $bp['message'] = $message;
-                                        $bp['message_type'] = $type;
-                                        
-                                        bp_core_render_notice();
-                                        messages_write_new();
+                                        return array('status' => 1, 'message' => $message, 'reply' => $pmessage);
                                 } else {
-                                        messages_box( 'inbox', __('Inbox', 'buddypress'), $message, $type );    
+                                        bp_core_add_message( $message );
+                                        wp_redirect( $bp['loggedin_domain'] . $bp['messages']['slug'] . '/inbox' );
                                 }
                         }
-                }
-        }
+                } else {
+                        $message = __('Message could not be sent, please try again.', 'buddypress');
+                        $type = 'error';
+                
+                        if ( $from_ajax ) {
+                                return array('status' => 0, 'message' => $message);
+                        } else {
+                                bp_core_add_message( $message, $type );
+                                wp_redirect( $bp['loggedin_domain'] . $bp['messages']['slug'] . '/compose' );
+                        }
+                }
+        }
+
+}
+
+function messages_add_callback_values( $recipients, $subject, $content ) {
+        $_SESSION['send_to'] = $recipients;
+        $_SESSION['subject'] = $subject;
+        $_SESSION['content'] = $content;
 }
 
@@ -570 +477 @@
                 do_action( 'bp_messages_notice_sent', $subject, $message );
         }
-                
 }
 
@@ -615 +521 @@
 
 function messages_view_thread( $thread_id ) {
-        global $userdata, $bp;
+        global $bp;
 
         $thread = new BP_Messages_Thread( $thread_id, true );
@@ -634 +540 @@
                                                                 <img src="<?php echo $bp['messages']['image_base'] ?>/email_open.gif" alt="Message" style="vertical-align: top;" /> &nbsp;
                                                                 <?php _e('Sent between ', 'buddypress') ?> <?php echo BP_Messages_Thread::get_recipient_links($thread->recipients) ?> 
-                                                                <?php _e('and', 'buddypress') ?> <?php echo bp_core_get_userlink($userdata->ID) ?>. 
+                                                                <?php _e('and', 'buddypress') ?> <?php echo bp_core_get_userlink($bp['loggedin_userid']) ?>. 
                                                         </td>
                                                 </tr>
@@ -665 +571 @@
                                                                 <div class="avatar-box">
                                                                         <?php if ( function_exists('bp_core_get_avatar') ) 
-                                                                                echo bp_core_get_avatar($userdata->ID, 1);
+                                                                                echo bp_core_get_avatar($bp['loggedin_userid'], 1);
                                                                         ?>
                                         

trunk/bp-messages/bp-messages-templatetags.php

@@ -190 +190 @@
 }
 
-function bp_compose_message_form() {
-        global $bp;
-        global $messages_write_new_action;
-                
-        $messages_write_new_action = $bp['loggedin_domain'] . $bp['messages']['slug'] . '/compose/';
-        
-        if ( isset($_POST['send_to']) || ( isset($_POST['send-notice']) && is_site_admin() ) ) {
-                messages_send_message( $_POST['send_to'], $_POST['subject'], $_POST['content'], $_POST['thread_id'], false, true );
-        } else {
-                messages_write_new();
-        }
-}
-
 function bp_messages_pagination() {
         global $messages_template;
@@ -212 +199 @@
         
         echo $bp['loggedin_domain'] . $bp['messages']['slug'] . '/' . $bp['current_action'];
+}
+
+function bp_messages_username_value() {
+        echo $_SESSION['send_to'];
+}
+
+function bp_messages_subject_value() {
+        echo $_SESSION['subject'];
+}
+
+function bp_messages_content_value() {
+        echo $_SESSION['content'];
 }
 

trunk/bp-wire.php

@@ -85 +85 @@
         global $bp;
         
-        if ( $bp['current_action'] != 'post' )
+        if ( $bp['current_component'] != $bp['xprofile']['slug'] && $bp['current_action'] != 'post' )
                 return false;
         
-        if ( $wire_post_id = bp_wire_new_post( $bp['current_userid'], $_POST['wire-post-textarea'], $bp['profile']['table_name_wire'] ) ) {
-                $bp['message'] = __('Wire message successfully posted.', 'buddypress');
-                $bp['message_type'] = 'success';
-
-                do_action( 'bp_xprofile_new_wire_post', array( 'item_id' => $wire_post_id, 'component_name' => 'profile', 'component_action' => 'new_wire_post', 'is_private' => 0 ) );
-                add_action( 'template_notices', 'bp_core_render_notice' );
+        if ( !$wire_post_id = bp_wire_new_post( $bp['current_userid'], $_POST['wire-post-textarea'], $bp['profile']['table_name_wire'] ) ) {
+                bp_core_add_message( __('Wire message could not be posted. Please try again.', 'buddypress'), 'error' );
+        } else {
+                bp_core_add_message( __('Wire message successfully posted.', 'buddypress') );
+                do_action( 'bp_xprofile_new_wire_post', array( 'item_id' => $wire_post_id, 'component_name' => 'profile', 'component_action' => 'new_wire_post', 'is_private' => 0 ) ); 
         }
         
         if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
-                $bp['current_component'] = $bp['profile']['slug'];
-                $bp['current_action'] = 'public';
-                bp_catch_uri( 'profile/index' );
+                wp_redirect( $bp['current_domain'] );
         } else {
-                bp_catch_uri( 'wire/latest' );
-        }       
+                wp_redirect( $bp['current_domain']. $bp['wire']['slug'] );
+        }
 }
 add_action( 'wp', 'bp_wire_action_post', 3 );
@@ -109 +106 @@
         global $bp;
         
-        if ( $bp['current_action'] != 'delete' )
+        if ( $bp['current_component'] != $bp['xprofile']['slug'] && $bp['current_action'] != 'delete' )
                 return false;
         
         if ( bp_wire_delete_post( $bp['action_variables'][0], $bp['profile']['table_name_wire'] ) ) {
-                $bp['message'] = __('Wire message successfully deleted.', 'buddypress');
-                $bp['message_type'] = 'success';
-                
-                do_action( 'bp_xprofile_delete_wire_post' );
-                add_action( 'template_notices', 'bp_core_render_notice' );                                                                      
+                bp_core_add_message( __('Wire message successfully deleted.', 'buddypress'), false, true );
+                do_action( 'bp_xprofile_delete_wire_post' );                                            
         }
         
         if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
-                $bp['current_component'] = $bp['profile']['slug'];
-                $bp['current_action'] = 'public';
-                bp_catch_uri( 'profile/index' );
+                wp_redirect( $bp['current_domain'] );
         } else {
-                bp_catch_uri( 'wire/latest' );
+                wp_redirect( $bp['current_domain']. $bp['wire']['slug'] );
         }
 }

trunk/bp-wire/bp-wire-classes.php

@@ -100 +100 @@
                 return array( 'wire_posts' => $wire_posts, 'count' => $count );
         }
+        
+        function delete_all_for_item( $item_id, $table_name ) {
+                global $wpdb, $bp;
+                
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$table_name} WHERE item_id = %d", $item_id ) );
+        }
 }
 

trunk/bp-xprofile.php

@@ -126 +126 @@
 function xprofile_setup_globals() {
         global $bp, $wpdb;
-        
-        /* Need to start a session for signup metadata purposes */
-        session_start();
         
         $bp['profile'] = array(