Changeset 462

Timestamp:

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

Author:

apeatling

Message:

Added message email notifications.

Location:

trunk

Files:

• bp-friends.php (modified) (1 diff)
• bp-messages.php (modified) (4 diffs)
• bp-messages/bp-messages-classes.php (modified) (5 diffs)
• bp-messages/bp-messages-notifications.php (added)
• bp-xprofile.php (modified) (1 diff)

trunk/bp-friends.php

@@ -118 +118 @@
 function friends_screen_requests() {
     global $bp;
-    
-    // Remove any notifications of new friend requests as we are viewing the
-    // friend request page
-    bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'friends', 'friendship_request' );
-        
+            
     if ( isset($bp['action_variables']) && in_array( 'accept', $bp['action_variables'] ) && is_numeric($bp['action_variables'][1]) ) {
         
         if ( friends_accept_friendship( $bp['action_variables'][1] ) ) {
+            //bp_core_delete_notification( $bp['loggedin_userid'], 'friends', 'friendship_request' );
+            
             $bp['message'] = __('Friendship accepted', 'buddypress');
             $bp['message_type'] = 'success';

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 );
     }
         

trunk/bp-messages/bp-messages-classes.php

@@ -284 +284 @@
     
     var $thread_id;
-    var $recipients;
+    var $recipients = false;
 
     function bp_messages_message( $id = null ) {
@@ -318 +318 @@
 
         // First insert the message into the messages table
-        $sql = $wpdb->prepare( "INSERT INTO " . $bp['messages']['table_name_messages'] . " ( sender_id, subject, message, date_sent, message_order, sender_is_group ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), %d, %d )", $userdata->ID, $this->subject, $this->message, $this->date_sent, $this->message_order, $this->sender_is_group );
-
-        if ( $wpdb->query($sql) === false )
-            return false;
-
+        if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['messages']['table_name_messages'] . " ( sender_id, subject, message, date_sent, message_order, sender_is_group ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), %d, %d )", $userdata->ID, $this->subject, $this->message, $this->date_sent, $this->message_order, $this->sender_is_group ) ) )
+            return false;
+            
         // Next, if thread_id is set, we are adding to an existing thread, if not, start a new one.
         if ( $this->thread_id ) {
@@ -331 +329 @@
             $message_ids = serialize($message_ids);
             
+            // We need this so we can return the new message ID.
+            $message_id = $wpdb->insert_id;
+            
             // Update the sender ids for the thread
             $sender_ids = unserialize($the_ids->sender_ids);
@@ -345 +346 @@
             
             // Find the recipients and update the unread counts for each
-            $recipients = $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d", $this->thread_id ) );
-            
-            for ( $i = 0; $i < count($recipients); $i++ ) {
-                if ( $recipients[$i]->user_id != $userdata->ID )
-                    $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_recipients'] . " SET unread_count = unread_count + 1, sender_only = 0 WHERE thread_id = %d AND user_id = %d", $this->thread_id, $recipients[$i]->user_id ) );
+            if ( !$this->recipients )
+                $this->recipients = $this->get_recipients();
+            
+            for ( $i = 0; $i < count($this->recipients); $i++ ) {
+                if ( $this->recipients[$i]->user_id != $userdata->ID )
+                    $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_recipients'] . " SET unread_count = unread_count + 1, sender_only = 0 WHERE thread_id = %d AND user_id = %d", $this->thread_id, $this->recipients[$i]->user_id ) );
             }
         } else {
@@ -374 +376 @@
             }
         }
-        update_usermeta( $userdata->ID, 'last_activity', date( 'Y-m-d H:i:s' ) ); 
+        
+        $this->id = $message_id;
         
         return true;
+    }
+    
+    function get_recipients() {
+        global $bp, $wpdb;
+        
+        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d", $this->thread_id ) );
     }
     

trunk/bp-xprofile.php

@@ -338 +338 @@
 
 ---------------------
-', 'buddypress' ), $poster_name, $wire_post->content, $wire_link );
+', 'buddypress' ), $poster_name, stripslashes($wire_post->content), $wire_link );
 
             $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );