Changeset 6589

Timestamp:

12/10/2012 09:55:56 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Revert r6587:

• Introduce bp_get_email_subject() function, to handle formatting of email subjects.
• For all components with notifications, including deprecated files.
• Fixes #4401, better this time.

Location:

trunk

Files:

• bp-activity/bp-activity-notifications.php (modified) (3 diffs)
• bp-core/bp-core-filters.php (modified) (2 diffs)
• bp-core/bp-core-template.php (modified) (1 diff)
• bp-core/deprecated/1.5.php (modified) (1 diff)
• bp-friends/bp-friends-notifications.php (modified) (2 diffs)
• bp-groups/bp-groups-notifications.php (modified) (6 diffs)
• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)

trunk/bp-activity/bp-activity-notifications.php

@@ -71 +71 @@
                 $ud       = bp_core_get_core_userdata( $receiver_user_id );
                 $to       = $ud->user_email;
-                $sitename = bp_get_option( 'blogname', 'WordPress' );
-                $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
+                $subject  = bp_get_email_subject( array( 'text' => sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name ) ) );
 
                 if ( bp_is_active( 'groups' ) && bp_is_group() ) {
@@ -158 +157 @@
 
                 // Set up and send the message
-                $ud       = bp_core_get_core_userdata( $original_activity->user_id );
-                $to       = $ud->user_email;
-                $sitename = bp_get_option( 'blogname', 'WordPress' );
-                $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
-
-$message = sprintf( __(
+                $ud      = bp_core_get_core_userdata( $original_activity->user_id );
+                $to      = $ud->user_email;
+                $subject = bp_get_email_subject( array( 'text' => sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name ) ) );
+                $message = sprintf( __(
 '%1$s replied to one of your updates:
 
@@ -203 +200 @@
                 $ud       = bp_core_get_core_userdata( $parent_comment->user_id );
                 $to       = $ud->user_email;
-                $sitename = bp_get_option( 'blogname', 'WordPress' );
-                $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
+                $subject = bp_get_email_subject( array( 'text' => sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name ) ) );
 
                 $poster_name = stripslashes( $poster_name );

trunk/bp-core/bp-core-filters.php

@@ -256 +256 @@
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
         $message         = sprintf( __( "Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%1\$s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%2\$s", 'buddypress' ), $activate_url, esc_url( "http://{$domain}{$path}" ) );
-        $subject         = '[' . $from_name . '] ' . sprintf(__( 'Activate %s', 'buddypress' ), esc_url( 'http://' . $domain . $path ) );
+        $subject         = bp_get_email_subject( array( 'text' => sprintf( __( 'Activate %s', 'buddypress' ), 'http://' . $domain . $path ) ) );
 
         // Send the message
@@ -284 +284 @@
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
         $message         = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
-        $subject         = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
+        $subject         = bp_get_email_subject( array( 'text' => __( 'Activate Your Account', 'buddypress' ) ) );
 
         // Send the message

trunk/bp-core/bp-core-template.php

@@ -540 +540 @@
 
 /**
+ * Retrieve a client friendly version of the root blog name, plus take care of
+ * the typical formatting bits and bobs.
+ *
+ * The blogname option is escaped with esc_html on the way into the database in
+ * sanitize_option, we want to reverse this for the plain text arena of emails.
+ *
+ * @link http://buddypress.trac.wordpress.org/ticket/4401
+ * @since BuddyPress (1.7)
+ * @return string
+ */
+function bp_get_email_subject( $args = array() ) {
+
+        $r = wp_parse_args( $args, array(
+                'before'  => '[',
+                'after'   => ']',
+                'default' => __( 'Community', 'buddypress' ),
+                'text'    => ''
+        ) );
+
+        $subject = $r['before'] . wp_specialchars_decode( bp_get_option( 'blogname', $default ), ENT_QUOTES ) . $r['after'] . ' ' . $r['text'];
+
+        return apply_filters( 'bp_get_email_subject', $subject, $r );
+}
+
+/**
  * Allow templates to pass parameters directly into the template loops via AJAX
  *

trunk/bp-core/deprecated/1.5.php

@@ -350 +350 @@
                         $ud = bp_core_get_core_userdata( $receiver_user_id );
                         $to = $ud->user_email;
-                        $sitename = bp_get_option( 'blogname', 'WordPress' );
-                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name );
+                        $subject = bp_get_email_subject( array( 'text' => sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name ) ) );
 
 $message = sprintf( __(

trunk/bp-friends/bp-friends-notifications.php

@@ -29 +29 @@
         // Set up and send the message
         $to       = $ud->user_email;
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
-        $subject  = '[' . $sitename . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
-
-        $message = sprintf( __(
+        $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name ) ) );
+        $message  = sprintf( __(
 '%1$s wants to add you as a friend.
 
@@ -68 +66 @@
         // Set up and send the message
         $to       = $ud->user_email;
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
-        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
-
-        $message = sprintf( __(
+        $subject  = bp_get_email_subject( array( 'text' => sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name ) ) );
+        $message  = sprintf( __(
 '%1$s accepted your friend request.
 

trunk/bp-groups/bp-groups-notifications.php

@@ -17 +17 @@
 
         $group    = groups_get_group( array( 'group_id' => $group_id ) );
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
-        $subject  = '[' . $sitename . '] ' . __( 'Group Details Updated', 'buddypress' );
-
+        $subject  = bp_get_email_subject( array( 'text' => __( 'Group Details Updated', 'buddypress' ) ) );
         $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
+
         foreach ( (array) $user_ids as $user_id ) {
                 if ( 'no' == bp_get_user_meta( $user_id, 'notification_groups_group_updated', true ) ) continue;
@@ -74 +73 @@
         // Set up and send the message
         $to       = $ud->user_email;
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
-        $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
+        $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name ) ) );
 
 $message = sprintf( __(
@@ -123 +121 @@
         // Set up and send the message
         $to       = $ud->user_email;
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
 
         if ( $accepted ) {
-                $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
+                $subject = bp_get_email_subject( array( 'text' => sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name ) ) );
                 $message = sprintf( __(
 'Your membership request for the group "%1$s" has been accepted.
@@ -136 +133 @@
 
         } else {
-                $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
+                $subject = bp_get_email_subject( array( 'text' => sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name ) ) );
                 $message = sprintf( __(
 'Your membership request for the group "%1$s" has been rejected.
@@ -182 +179 @@
         // Set up and send the message
         $to       = $ud->user_email;
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
-        $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
-
-        $message = sprintf( __(
+        $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name ) ) );
+        $message  = sprintf( __(
 'You have been promoted to %1$s for the group: "%2$s".
 
@@ -232 +227 @@
                 // Set up and send the message
                 $to       = $invited_ud->user_email;
-                $sitename = bp_get_option( 'blogname', 'WordPress' );
-                $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
+                $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name ) ) );
 
                 $message = sprintf( __(

trunk/bp-members/bp-members-functions.php

@@ -1340 +1340 @@
         $activate_url = esc_url( $activate_url );
 
-        $from_name = bp_get_option( 'blogname', 'WordPress' );
-
         $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
-        $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
+        $subject = bp_get_email_subject( array( 'text' => __( 'Activate Your Account', 'buddypress' ) ) );
 
         // Send the message

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

@@ -48 +48 @@
                         // Set up and send the message
                         $email_to      = $ud->user_email;
-                        $sitename      = bp_get_option( 'blogname', 'WordPress' );
-                        $email_subject = '[' . $sitename . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
+                        $email_subject = bp_get_email_subject( array( 'text' => sprintf( __( 'New message from %s', 'buddypress' ), $sender_name ) ) );
 
                         $email_content = sprintf( __(