Changeset 1655 for trunk/bp-messages.php

Timestamp:

08/13/2009 01:24:21 AM (17 years ago)

Author:

apeatling

Message:

Add first revision of new default BuddyPress parent theme. This theme is designed to be extended from with child themes, not used directly. The original default themes from the old two theme system are deprecated, but will remain compatible with 1.1. Still more work to do there.

File:

• trunk/bp-messages.php (modified) (7 diffs)

trunk/bp-messages.php

@@ -284 +284 @@
     $thread_id = $bp->action_variables[0];
     
-    if ( !$thread_id || ( !messages_check_thread_access($thread_id) && !is_site_admin() ) )
+    if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access($thread_id) && !is_site_admin() ) )
         bp_core_redirect( $bp->displayed_user->domain . $bp->current_component );
         
@@ -291 +291 @@
         
         /* Check the nonce */
-        check_admin_referer( 'messages_send_message' );
+        check_admin_referer( 'messages_send_message', 'send_message_nonce' );
         
         /* Send the reply */
@@ -310 +310 @@
     global $bp, $thread_id;
     
-    if ( $bp->current_component != $bp->messages->slug || $bp->action_variables[0] != 'delete' )
+    if ( $bp->current_component != $bp->messages->slug || 'notices' == $bp->current_action || $bp->action_variables[0] != 'delete' )
         return false;
     
@@ -453 +453 @@
     }
     
-    return $message->send();
+    if ( $message->send() ) {
+        require_once( BP_PLUGIN_DIR . '/bp-messages/bp-messages-notifications.php' );
+
+        // Send screen notifications to the recipients
+        foreach ( $message->recipients as $recipient ) {
+            bp_core_add_notification( $message->id, $recipient, 'messages', 'new_message' );    
+        }
+        
+        // Send email notifications to the recipients
+        messages_notification_new_message( array( 'item_id' => $message->id, 'recipient_ids' => $message->recipients, 'thread_id' => $message->thread_id, 'component_name' => $bp->messages->slug, 'component_action' => 'message_sent', 'is_private' => 1 ) );
+    
+        do_action( 'messages_message_sent', &$message );
+        
+        return $message->thread_id;
+    }
+    
+    return false;
 }
 
@@ -537 +553 @@
 }
 
+function messages_is_valid_thread( $thread_id ) {
+    return BP_Messages_Thread::is_valid( $thread_id );
+}
+
 function messages_ajax_autocomplete_results() {
     global $bp;
@@ -545 +565 @@
     if ( function_exists( 'friends_search_friends' ) )
         $friends = friends_search_friends( $_GET['q'], $bp->loggedin_user->id, $_GET['limit'], 1 );
-    
+
     $friends = apply_filters( 'bp_friends_autocomplete_list', $friends, $_GET['q'], $_GET['limit'] );
 
@@ -552 +572 @@
             $ud = get_userdata($user_id);
             $username = $ud->user_login;
-            echo  bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) )  . ' ' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
+            echo bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) )  . ' ' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
             ';
         }