Changeset 5696 for trunk/bp-messages/bp-messages-notifications.php

Timestamp:

02/10/2012 09:02:53 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Messages component. See #3989.

File:

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

trunk/bp-messages/bp-messages-notifications.php

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Messages Notifications
+ *
+ * @package BuddyPress
+ * @subpackage MessagesNotifications
+ */
+
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
-function messages_notification_new_message( $args ) {
-        global $bp;
+function messages_notification_new_message( $args = array() ) {
 
-        extract($args);
+        // These should be extracted below
+        $recipients    = array();
+        $email_subject = $email_content = '';
 
-        $email_subject = $email_content = $args = '';
-        $sender_name   = bp_core_get_user_displayname( $sender_id );
+        extract( $args );
 
-        foreach( $recipients as $recipient ) {
-                if ( $sender_id == $recipient->user_id || 'no' == bp_get_user_meta( $recipient->user_id, 'notification_messages_new_message', true ) )
-                        continue;
+        $sender_name = bp_core_get_user_displayname( $sender_id );
 
-                // User data and links
-                $ud            = get_userdata( $recipient->user_id );
-                $message_link  = bp_core_get_user_domain( $recipient->user_id ) . bp_get_messages_slug() .'/';
-                $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
-                $settings_link = bp_core_get_user_domain( $recipient->user_id ) . $settings_slug . '/notifications/';
+        // Bail if no recipients
+        if ( ! empty( $recipients ) ) {
 
-                // Sender info
-                $sender_name   = stripslashes( $sender_name );
-                $subject       = stripslashes( wp_filter_kses( $subject ) );
-                $content       = stripslashes( wp_filter_kses( $content ) );
+                foreach( $recipients as $recipient ) {
 
-                // Set up and send the message
-                $email_to      = $ud->user_email;
-                $sitename      = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
-                $email_subject = '[' . $sitename . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
+                        if ( $sender_id == $recipient->user_id || 'no' == bp_get_user_meta( $recipient->user_id, 'notification_messages_new_message', true ) )
+                                continue;
 
-                $email_content = sprintf( __(
+                        // User data and links
+                        $ud            = get_userdata( $recipient->user_id );
+                        $message_link  = bp_core_get_user_domain( $recipient->user_id ) . bp_get_messages_slug() .'/';
+                        $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+                        $settings_link = bp_core_get_user_domain( $recipient->user_id ) . $settings_slug . '/notifications/';
+
+                        // Sender info
+                        $sender_name   = stripslashes( $sender_name );
+                        $subject       = stripslashes( wp_filter_kses( $subject ) );
+                        $content       = stripslashes( wp_filter_kses( $content ) );
+
+                        // Set up and send the message
+                        $email_to      = $ud->user_email;
+                        $sitename      = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+                        $email_subject = '[' . $sitename . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
+
+                        $email_content = sprintf( __(
 '%1$s sent you a new message:
 
@@ -43 +58 @@
 ', 'buddypress' ), $sender_name, $subject, $content, $message_link );
 
-                $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+                        $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
 
-                // Send the message
-                $email_to = apply_filters( 'messages_notification_new_message_to', $email_to );
-                $email_subject = apply_filters( 'messages_notification_new_message_subject', $email_subject, $sender_name );
-                $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link, $settings_link );
+                        // Send the message
+                        $email_to      = apply_filters( 'messages_notification_new_message_to',      $email_to );
+                        $email_subject = apply_filters( 'messages_notification_new_message_subject', $email_subject, $sender_name );
+                        $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link, $settings_link );
 
-                wp_mail( $email_to, $email_subject, $email_content );
+                        wp_mail( $email_to, $email_subject, $email_content );
+                }
         }