Ticket #5193: 5193.patch

src/bp-messages/bp-messages-classes.php

@@ -285 +285 @@
         public static function get_current_threads_for_user( $user_id, $box = 'inbox', $type = 'all', $limit = null, $page = null, $search_terms = '' ) {
                 global $wpdb, $bp;
 
-                $user_id_sql = $pag_sql = $type_sql = $search_sql = '';
+                $user_id_sql  = $pag_sql = $type_sql = $search_sql = $total_threads = '';
+                $thread_ids   = array();
+                $box              = apply_filters( 'messages_thread_current_threads_box', $box );
+                $type             = apply_filters( 'messages_thread_current_threads_type', $type );
+                $search_terms = apply_filters( 'messages_thread_current_threads_search_terms', $search_terms );
 
                 if ( $limit && $page ) {
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
@@ -297 +301 @@
                         $type_sql = " AND r.unread_count = 0 ";
                 }
 
+                $type_sql = apply_filters( 'messages_thread_current_threads_type_sql', $type_sql );
+
                 if ( ! empty( $search_terms ) ) {
                         $search_terms_like = '%' . bp_esc_like( $search_terms ) . '%';
                         $search_sql        = $wpdb->prepare( "AND ( subject LIKE %s OR message LIKE %s )", $search_terms_like, $search_terms_like );
                 }
 
+                $search_sql = apply_filters( 'messages_thread_current_threads_search_sql', $search_sql );
+
                 if ( 'sentbox' == $box ) {
-                        $user_id_sql = $wpdb->prepare( 'm.sender_id = %d', $user_id );
-                        $thread_ids  = $wpdb->get_results( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND {$user_id_sql} AND r.is_deleted = 0 {$search_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}" );
+                        $user_id_sql   = $wpdb->prepare( 'm.sender_id = %d', $user_id );
+                        $thread_ids    = $wpdb->get_results( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND {$user_id_sql} AND r.is_deleted = 0 {$search_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}" );
                         $total_threads = $wpdb->get_var( "SELECT COUNT( DISTINCT m.thread_id ) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND {$user_id_sql} AND r.is_deleted = 0 {$search_sql} " );
-                } else {
-                        $user_id_sql = $wpdb->prepare( 'r.user_id = %d', $user_id );
-                        $thread_ids = $wpdb->get_results( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND {$user_id_sql} AND r.sender_only = 0 {$type_sql} {$search_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}" );
+                } elseif ( 'inbox' == $box ) {
+                        $user_id_sql   = $wpdb->prepare( 'r.user_id = %d', $user_id );
+                        $thread_ids    = $wpdb->get_results( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND {$user_id_sql} AND r.sender_only = 0 {$type_sql} {$search_sql} GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}" );
                         $total_threads = $wpdb->get_var( "SELECT COUNT( DISTINCT m.thread_id ) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND r.is_deleted = 0 AND {$user_id_sql} AND r.sender_only = 0 {$type_sql} {$search_sql}" );
                 }
 
+                $thread_ids    = apply_filters( 'messages_thread_current_threads_thread_ids',    $thread_ids );
+                $total_threads = apply_filters( 'messages_thread_current_threads_total_threads', $total_threads );
+
                 if ( empty( $thread_ids ) ) {
                         return false;
                 }
@@ -347 +358 @@
          * @since BuddyPress (1.0.0)
          *
          * @param int $thread_id The message thread ID.
+         * @return mixed False of failure, interger on success updating
          */
         public static function mark_as_read( $thread_id ) {
                 global $wpdb, $bp;
 
-                $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
-                $wpdb->query($sql);
+                $user_id = bp_loggedin_user_id();
+
+                $sql    = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", $user_id, $thread_id );
+                $result = $wpdb->query($sql);
+
+                do_action( 'messages_thread_marked_as_read', $user_id, $thread_id );
+
+                wp_cache_delete( $user_id, 'bp_messages_unread_count' );
 
-                wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
+                return $result;
         }
 
         /**
@@ -363 +381 @@
          * @since BuddyPress (1.0.0)
          *
          * @param int $thread_id The message thread ID.
+         * @return mixed False of failure, interger on success updating
          */
         public static function mark_as_unread( $thread_id ) {
                 global $wpdb, $bp;
 
-                $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
-                $wpdb->query($sql);
+                $user_id = bp_loggedin_user_id();
 
-                wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
+                $sql    = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", $user_id, $thread_id );
+                $result = $wpdb->query($sql);
+
+                do_action( 'messages_thread_marked_as_unread', $user_id, $thread_id );
+
+                wp_cache_delete( $user_id, 'bp_messages_unread_count' );
+
+                return $result;
         }
 
         /**
@@ -388 +413 @@
         public static function get_total_threads_for_user( $user_id, $box = 'inbox', $type = 'all' ) {
                 global $wpdb, $bp;
 
-                $exclude_sender = '';
-                if ( $box != 'sentbox' )
-                        $exclude_sender = ' AND sender_only != 1';
+                $exclude_sender_sql = $type_sql = '';
+
+                if ( $box != 'sentbox' ) {
+                        $exclude_sender_sql = ' AND sender_only != 1';
+                }
+
+                $exclude_sender_sql = apply_filters( 'messages_thread_total_threads_for_user_exclude_sender_sql', $exclude_sender_sql, $user_id );
 
-                if ( $type == 'unread' )
+                if ( $type == 'unread' ) {
                         $type_sql = " AND unread_count != 0 ";
-                else if ( $type == 'read' )
+                } else if ( $type == 'read' ) {
                         $type_sql = " AND unread_count = 0 ";
+                }
+
+                $type_sql = apply_filters( 'messages_thread_total_threads_for_user_type_sql', $type_sql, $user_id );
 
-                return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0{$exclude_sender} {$type_sql}", $user_id ) );
+                return apply_filters( 'messages_thread_total_threads_for_user', (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0{$exclude_sender_sql} {$type_sql}", $user_id ) ), $user_id, $box, $type );
         }
 
         /**
@@ -487 +519 @@
                 if ( empty( $user_id ) )
                         $user_id = bp_loggedin_user_id();
 
-                return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND is_deleted = 0 AND user_id = %d", $thread_id, $user_id ) );
+                return apply_filters( 'messages_thread_check_access', $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND is_deleted = 0 AND user_id = %d", $thread_id, $user_id ) ), $thread_id, $user_id );
         }
 
         /**
@@ -508 +540 @@
 
                 $bp = buddypress();
 
-                return $wpdb->get_var( $wpdb->prepare( "SELECT thread_id FROM {$bp->messages->table_name_messages} WHERE thread_id = %d LIMIT 1", $thread_id ) );
+                return apply_filters( 'messages_thread_is_valid', $wpdb->get_var( $wpdb->prepare( "SELECT thread_id FROM {$bp->messages->table_name_messages} WHERE thread_id = %d LIMIT 1", $thread_id ) ), $thread_id );
         }
 
         /**
@@ -525 +557 @@
          * @return string
          */
         public static function get_recipient_links( $recipients ) {
-                if ( count( $recipients ) >= 5 )
-                        return sprintf( __( '%s Recipients', 'buddypress' ), number_format_i18n( count( $recipients ) ) );
+                if ( count( $recipients ) >= 5 ) {
+                        return sprintf(__('%s Recipients', 'buddypress'), number_format_i18n(count($recipients)));
+                }
 
                 $recipient_links = array();
 
@@ -540 +573 @@
                         $recipient_links[] = $recipient_link;
                 }
 
+                $recipient_links = apply_filters( 'messages_thread_recipient_links', $recipient_links );
+
                 return implode( ', ', (array) $recipient_links );
         }
 
@@ -660 +695 @@
 
                 if ( $message = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_messages} WHERE id = %d", $id ) ) ) {
                         $this->id        = $message->id;
-                        $this->thread_id = $message->thread_id;
-                        $this->sender_id = $message->sender_id;
-                        $this->subject   = $message->subject;
-                        $this->message   = $message->message;
-                        $this->date_sent = $message->date_sent;
+                        $this->thread_id = apply_filters( 'messages_message_populate_thread_id', $message->thread_id );
+                        $this->sender_id = apply_filters( 'messages_message_populate_sender_id', $message->sender_id );
+                        $this->subject   = apply_filters( 'messages_message_populate_subject',   $message->subject   );
+                        $this->message   = apply_filters( 'messages_message_populate_message',   $message->message   );
+                        $this->date_sent = apply_filters( 'messages_message_populate_date_sent', $message->date_sent );
                 }
         }
 
@@ -686 +721 @@
                 do_action_ref_array( 'messages_message_before_save', array( &$this ) );
 
                 // Make sure we have at least one recipient before sending.
-                if ( empty( $this->recipients ) )
+                if ( empty( $this->recipients ) ) {
                         return false;
+                }
 
                 $new_thread = false;
 
@@ -698 +734 @@
                 }
 
                 // First insert the message into the messages table
-                if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( thread_id, sender_id, subject, message, date_sent ) VALUES ( %d, %d, %s, %s, %s )", $this->thread_id, $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) )
+                if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( thread_id, sender_id, subject, message, date_sent ) VALUES ( %d, %d, %s, %s, %s )", $this->thread_id, $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) ) {
                         return false;
+                }
 
                 $this->id = $wpdb->insert_id;
 
@@ -734 +771 @@
          */
         public 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 ) );
+                return apply_filters( 'messages_message_get_recipients', $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $this->thread_id ) ), $this->thread_id );
         }
 
         /** Static Functions **************************************************/
@@ -746 +783 @@
          * @return array
          */
         public static function get_recipient_ids( $recipient_usernames ) {
-                if ( !$recipient_usernames )
+                if ( !$recipient_usernames ) {
                         return false;
+                }
+
+                $recipient_ids = array();
 
                 if ( is_array( $recipient_usernames ) ) {
                         for ( $i = 0, $count = count( $recipient_usernames ); $i < $count; ++$i ) {
@@ -757 +797 @@
                         }
                 }
 
-                return $recipient_ids;
+                return apply_filters( 'messages_message_get_recipient_ids', $recipient_ids, $recipient_usernames );
         }
 
         /**
@@ -768 +808 @@
          */
         public static function get_last_sent_for_user( $thread_id ) {
                 global $wpdb, $bp;
-                return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND thread_id = %d ORDER BY date_sent DESC LIMIT 1", bp_loggedin_user_id(), $thread_id ) );
+                return apply_filters( 'messages_message_last_sent_for_user', $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND thread_id = %d ORDER BY date_sent DESC LIMIT 1", bp_loggedin_user_id(), $thread_id ) ), $thread_id );
         }
 
         /**
@@ -781 +821 @@
          */
         public static function is_user_sender( $user_id, $message_id ) {
                 global $wpdb, $bp;
-                return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND id = %d", $user_id, $message_id ) );
+                return apply_filters( 'messages_message_is_user_sender', $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND id = %d", $user_id, $message_id ) ), $user_id, $message_id );
         }
 
         /**
@@ -792 +832 @@
          */
         public static function get_message_sender( $message_id ) {
                 global $wpdb, $bp;
-                return $wpdb->get_var( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_id ) );
+                return apply_filters( 'messages_message_get_message_sender', $wpdb->get_var( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_id ) ), $message_id );
         }
 }
 
@@ -865 +905 @@
                 $notice = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} WHERE id = %d", $this->id ) );
 
                 if ( $notice ) {
-                        $this->subject   = $notice->subject;
-                        $this->message   = $notice->message;
-                        $this->date_sent = $notice->date_sent;
-                        $this->is_active = $notice->is_active;
+                        $this->subject   = apply_filters( 'messages_notice_populate_subject',   $notice->subject   );
+                        $this->message   = apply_filters( 'messages_notice_populate_message',   $notice->message   );
+                        $this->date_sent = apply_filters( 'messages_notice_populate_date_sent', $notice->date_sent );
+                        $this->is_active = apply_filters( 'messages_notice_populate_is_active', $notice->is_active );
                 }
         }
 
@@ -919 +959 @@
          * @return bool
          */
         public function activate() {
-                $this->is_active = 1;
+                $this->is_active = apply_filters( 'messages_notice_activate', 1 );
                 return (bool) $this->save();
         }
 
@@ -931 +971 @@
          * @return bool
          */
         public function deactivate() {
-                $this->is_active = 0;
+                $this->is_active = apply_filters( 'messages_notice_deactivate', 0 );
                 return (bool) $this->save();
         }
 
@@ -953 +993 @@
                         return false;
                 }
 
+                do_action( 'messages_notice_after_delete' );
+
                 return true;
         }
 
@@ -980 +1022 @@
                         'pag_page' => 1   // Page number
                 ) );
 
+                $r = apply_filters( 'messages_notice_get_notices_arg', $r);
+
                 $limit_sql = '';
                 if ( (int) $r['pag_num'] >= 0 ) {
                         $limit_sql = $wpdb->prepare( "LIMIT %d, %d", (int) ( ( $r['pag_page'] - 1 ) * $r['pag_num'] ), (int) $r['pag_num'] );
@@ -1002 +1046 @@
 
                 $notice_count = $wpdb->get_var( "SELECT COUNT(id) FROM " . $bp->messages->table_name_notices );
 
-                return $notice_count;
+                return apply_filters( 'messages_notice_total_count', $notice_count );
         }
 
         /**

src/bp-messages/bp-messages-functions.php

@@ -245 +245 @@
  * Wrapper for {@link BP_Messages_Thread::mark_as_read()}.
  *
  * @param int $thread_id ID of the thread.
+ * @return mixed
  */
 function messages_mark_thread_read( $thread_id ) {
         return BP_Messages_Thread::mark_as_read( $thread_id );
@@ -256 +257 @@
  * Wrapper for {@link BP_Messages_Thread::mark_as_unread()}.
  *
  * @param int $thread_id ID of the thread.
+ * @return mixed
  */
 function messages_mark_thread_unread( $thread_id ) {
         return BP_Messages_Thread::mark_as_unread( $thread_id );

src/bp-messages/bp-messages-template.php

@@ -130 +130 @@
                 $this->pag_page = isset( $_GET[$page_arg] ) ? intval( $_GET[$page_arg] ) : 1;
                 $this->pag_num  = isset( $_GET['num'] )   ? intval( $_GET['num'] )   : $per_page;
 
-                $this->user_id      = $user_id;
-                $this->box          = $box;
-                $this->type         = $type;
-                $this->search_terms = $search_terms;
+                $this->user_id      = apply_filters( 'bp_messages_box_template_user_id',          $user_id );
+                $this->box          = apply_filters( 'bp_messages_box_template_box',              $box );
+                $this->type         = apply_filters( 'bp_messages_box_template_type',             $type );
+                $this->search_terms = apply_filters( 'bp_messages_box_template_search_terms', $search_terms );
 
                 if ( 'notices' == $this->box ) {
                         $this->threads = BP_Messages_Notice::get_notices( array(
                                 'pag_num'  => $this->pag_num,
                                 'pag_page' => $this->pag_page
                         ) );
-                } else {
+                } elseif ( 'sentbox' == $this->box || 'inbox' == $this->box ) {
                         $threads = BP_Messages_Thread::get_current_threads_for_user( $this->user_id, $this->box, $this->type, $this->pag_num, $this->pag_page, $this->search_terms );
 
                         $this->threads            = $threads['threads'];
@@ -172 +172 @@
                         }
                 }
 
+                // These hooks needed for other boxes, which might not be processed above
+                $this->threads                    = apply_filters( 'messages_box_template_threads',                $this->threads );
+                $this->thread_count       = apply_filters( 'messages_box_template_thread_count',           $this->thread_count );
+                $this->total_thread_count = apply_filters( 'messages_box_template_total_thread_count', $this->total_thread_count );
+
                 if ( (int) $this->total_thread_count && (int) $this->pag_num ) {
                         $pag_args = array(
                                 $page_arg => '%#%',
@@ -323 +328 @@
  *
  * @global BP_Messages_Box_Template $messages_template
  *
- * @param array $args {
+ * @param array|string $args {
  *     Array of arguments. All are optional.
  *     @type int $user_id ID of the user whose threads are being loaded.
  *           Default: ID of the logged-in user.
@@ -350 +355 @@
                 $default_box = 'inbox';
         }
 
+        $default_box = apply_filters( 'messages_has_message_threads_default_box', $default_box );
+
         // Parse the arguments
         $r = bp_parse_args( $args, array(
                 'user_id'      => bp_loggedin_user_id(),
@@ -706 +713 @@
  *
  * @since BuddyPress (2.2.0)
  *
- * @param int $thread_id Optional. ID of the thread. Defaults to current thread ID.
+ * @param int|bool $thread_id Optional. ID of the thread. Defaults to current thread ID.
  */
 function bp_message_thread_total_count( $thread_id = false ) {
         echo bp_get_message_thread_total_count( $thread_id );
@@ -716 +723 @@
          *
          * @since BuddyPress (2.2.0)
          *
-         * @param int $thread_id Optional. ID of the thread. Defaults to
+         * @param int|bool $thread_id Optional. ID of the thread. Defaults to
          *        current thread ID.
          * @return int
          */
@@ -740 +747 @@
  *
  * @since Buddypress (2.2.0)
  *
- * @param int $thread_id Optional. ID of the thread. Default: current thread ID.
+ * @param int|bool $thread_id Optional. ID of the thread. Default: current thread ID.
  */
 function bp_message_thread_total_and_unread_count( $thread_id = false ) {
         echo bp_get_message_thread_total_and_unread_count( $thread_id );
@@ -748 +755 @@
         /**
          * Get markup for the current thread's total and unread count.
          *
-         * @param int $thread_id Optional. ID of the thread. Default: current thread ID.
+         * @param int|bool $thread_id Optional. ID of the thread. Default: current thread ID.
          * @return string Markup displaying the total and unread count for the thread.
          */
         function bp_get_message_thread_total_and_unread_count( $thread_id = false ) {
@@ -803 +810 @@
  *
  * @see bp_get_message_thread_avatar() for a description of arguments.
  *
- * @param array $args See {@link bp_get_message_thread_avatar()}.
+ * @param array|string $args See {@link bp_get_message_thread_avatar()}.
  */
 function bp_message_thread_avatar( $args = '' ) {
         echo bp_get_message_thread_avatar( $args );
@@ -814 +821 @@
          * @see bp_core_fetch_avatar() For a description of arguments and
          *      return values.
          *
-         * @param array $args {
+         * @param array|string $args {
          *     Arguments are listed here with an explanation of their defaults.
          *     For more information about the arguments, see
          *     {@link bp_core_fetch_avatar()}.
@@ -825 +832 @@
          *     @type string|bool $id Default: false.
          *     @type string $alt Default: 'Profile picture of [display name]'.
          * }
-         * @return User avatar string.
+         * @return string User avatar string.
          */
         function bp_get_message_thread_avatar( $args = '' ) {
                 global $messages_template;
@@ -892 +899 @@
 function bp_messages_pagination_count() {
         global $messages_template;
 
-        $start_num = intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1;
-        $from_num  = bp_core_number_format( $start_num );
-        $to_num    = bp_core_number_format( ( $start_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $start_num + ( $messages_template->pag_num - 1 ) );
-        $total     = bp_core_number_format( $messages_template->total_thread_count );
+        $start_num = apply_filters( 'bp_messages_pagination_count_start_num', intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1, $messages_template );
+        $from_num  = apply_filters( 'bp_messages_pagination_count_from_number', bp_core_number_format( $start_num ), $start_num );
+        $to_num    = apply_filters( 'bp_messages_pagination_count_to_num', bp_core_number_format( ( $start_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $start_num + ( $messages_template->pag_num - 1 ) ), $start_num, $messages_template );
+        $total     = apply_filters( 'bp_messages_pagination_count_total', bp_core_number_format( $messages_template->total_thread_count ), $messages_template );
 
         echo sprintf( _n( 'Viewing 1 message', 'Viewing %1$s - %2$s of %3$s messages', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) );
 }
@@ -945 +952 @@
          * @return string
          */
         function bp_get_messages_username_value() {
+                $user_name = '';
+
                 if ( isset( $_COOKIE['bp_messages_send_to'] ) ) {
-                        return apply_filters( 'bp_get_messages_username_value', $_COOKIE['bp_messages_send_to'] );
+                        $user_name = apply_filters( 'bp_get_messages_username_value', $_COOKIE['bp_messages_send_to'] );
                 } else if ( isset( $_GET['r'] ) && !isset( $_COOKIE['bp_messages_send_to'] ) ) {
-                        return apply_filters( 'bp_get_messages_username_value', $_GET['r'] );
+                        $user_name = apply_filters( 'bp_get_messages_username_value', $_GET['r'] );
                 }
+
+                return $user_name;
         }
 
 /**
@@ -1001 +1012 @@
  * Output the markup for the message type dropdown.
  */
 function bp_messages_options() {
-?>
+
+        $messages_types = apply_filters( 'bp_messages_options_types', array(
+                ''       => _x( 'Select', 'Message dropdown filter', 'buddypress' ),
+                'read'   => _x( 'Read', 'Message dropdown filter', 'buddypress' ),
+                'unread' => _x( 'Unread', 'Message dropdown filter', 'buddypress' ),
+                'all'    => _x( 'All', 'Message dropdown filter', 'buddypress' )
+        ) );
+        ?>
 
         <label for="message-type-select" class="bp-screen-reader-text">
                 <?php _e( 'Select:', 'buddypress' ) ?>
-         </label>
+        </label>
 
         <select name="message-type-select" id="message-type-select">
-                <option value=""><?php _e( 'Select', 'buddypress' ); ?></option>
-                <option value="read"><?php _ex('Read', 'Message dropdown filter', 'buddypress') ?></option>
-                <option value="unread"><?php _ex('Unread', 'Message dropdown filter', 'buddypress') ?></option>
-                <option value="all"><?php _ex('All', 'Message dropdown filter', 'buddypress') ?></option>
+
+                <?php foreach($messages_types as $value => $label) : ?>
+
+                        <option value="<?php echo $value; ?>"><?php echo $label; ?></option>
+
+                <?php endforeach; ?>
+
         </select> &nbsp;
 
+        <?php do_action( 'bp_messages_options_before_actions' ); ?>
+
         <?php if ( ! bp_is_current_action( 'sentbox' ) && ! bp_is_current_action( 'notices' ) ) : ?>
 
                 <a href="#" id="mark_as_read"><?php _ex('Mark as Read', 'Message management markup', 'buddypress') ?></a> &nbsp;
@@ -1023 +1046 @@
 
         <a href="#" id="delete_<?php echo bp_current_action(); ?>_messages"><?php _e( 'Delete Selected', 'buddypress' ); ?></a> &nbsp;
 
+        <?php do_action( 'bp_messages_options_after_actions' ); ?>
+
 <?php
 }
 
@@ -1243 +1268 @@
         $notice = BP_Messages_Notice::get_active();
 
         if ( empty( $notice ) ) {
-                return false;
+                return;
         }
 
         $closed_notices = bp_get_user_meta( bp_loggedin_user_id(), 'closed_notices', true );
@@ -1475 +1500 @@
                 $this->message_count = count( $this->thread->messages );
 
                 $last_message_index                 = $this->message_count - 1;
-                $this->thread->last_message_id      = $this->thread->messages[ $last_message_index ]->id;
-                $this->thread->last_message_date    = $this->thread->messages[ $last_message_index ]->date_sent;
-                $this->thread->last_sender_id       = $this->thread->messages[ $last_message_index ]->sender_id;
-                $this->thread->last_message_subject = $this->thread->messages[ $last_message_index ]->subject;
-                $this->thread->last_message_content = $this->thread->messages[ $last_message_index ]->message;
+                $this->thread->last_message_id      = apply_filters( 'messages_thread_template_id',        $this->thread->messages[ $last_message_index ]->id );
+                $this->thread->last_message_date    = apply_filters( 'messages_thread_template_date_sent', $this->thread->messages[ $last_message_index ]->date_sent );
+                $this->thread->last_sender_id       = apply_filters( 'messages_thread_template_sender_id', $this->thread->messages[ $last_message_index ]->sender_id );
+                $this->thread->last_message_subject = apply_filters( 'messages_thread_template_subject',   $this->thread->messages[ $last_message_index ]->subject );
+                $this->thread->last_message_content = apply_filters( 'messages_thread_template_message',   $this->thread->messages[ $last_message_index ]->message );
         }
 
         /**
@@ -1566 +1591 @@
 /**
  * Initialize the messages template loop for a specific thread.
  *
- * @param array $args {
+ * @param array|string $args {
  *     Array of arguments. All are optional.
  *     @type int $thread_id ID of the thread whose messages you are displaying.
  *           Default: if viewing a thread, the thread ID will be parsed from
@@ -1589 +1614 @@
 
         $thread_template = new BP_Messages_Thread_Template( $r['thread_id'], $r['order'] );
 
-        return $thread_template->has_messages();
+        return apply_filters( 'bp_thread_has_messages', $thread_template->has_messages(), $thread_template );
 }
 
 /**
@@ -1605 +1630 @@
          */
         function bp_get_thread_messages_order() {
                 global $thread_template;
-                return $thread_template->thread->messages_order;
+                return apply_filters( 'bp_get_thread_messages_order', $thread_template->thread->messages_order );
         }
 
 /**
@@ -1692 +1717 @@
  */
 function bp_get_thread_recipients_count() {
         global $thread_template;
-        return count( $thread_template->thread->recipients );
+        return apply_filters( 'bp_get_thread_recipients_count', count( $thread_template->thread->recipients ) );
 }
 
 /**
@@ -1842 +1867 @@
 /**
  * Output the avatar for the current message sender.
  *
- * @param array $args See {@link bp_get_the_thread_message_sender_avatar_thumb()}
+ * @param array|string $args See {@link bp_get_the_thread_message_sender_avatar_thumb()}
  *        for a description.
  */
 function bp_the_thread_message_sender_avatar( $args = '' ) {
@@ -1851 +1876 @@
         /**
          * Get the avatar for the current message sender.
          *
-         * @param array $args {
+         * @param array|string $args {
          *     Array of arguments. See {@link bp_core_fetch_avatar()} for more
          *     complete details. All arguments are optional.
          *     @type string $type Avatar type. Default: 'thumb'.