Changeset 462 for trunk/bp-messages.php

Timestamp:

10/30/2008 12:18:36 AM (18 years ago)

Author:

apeatling

Message:

Added message email notifications.

File:

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

trunk/bp-messages.php

@@ -10 +10 @@
 include_once( 'bp-messages/bp-messages-admin.php' );
 include_once( 'bp-messages/bp-messages-templatetags.php' );
+include_once( 'bp-messages/bp-messages-notifications.php' );
 
 /**************************************************************************
@@ -346 +347 @@
 }
 
-
-/**************************************************************************
- messages_format_activity()
- 
- Selects and formats recorded messages component activity.
- **************************************************************************/
-
-function messages_format_activity( $friendship_id, $action, $for_secondary_user = false  ) {
-    global $bp;
-    
-    switch( $action ) {
-        // no actions set yet.
-    }
-    
-    return false;
-}
-
 function messages_format_notifications( $action, $item_id, $total_items ) {
     global $bp;
@@ -512 +496 @@
                     // Send notices to the recipients
                     for ( $i = 0; $i < count($pmessage->recipients); $i++ ) {
-                        if ( $pmessage->recipients[$i] != $bp['loggedin_userid'] )
+                        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, 'component_name' => 'messages', 'component_action' => 'message_sent', 'is_private' => 1 ) );
+                    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 ) {
@@ -582 +567 @@
         $notice->is_active = 1;
         $notice->save(); // send it.
+        
+        do_action( 'bp_messages_notice_sent', $subject, $message );
     }