<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2719] trunk: Fixes #1949</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2719</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-15 10:30:56 +0000 (Mon, 15 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1949</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitynotificationsphp">trunk/bp-activity/bp-activity-notifications.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsnotificationsphp">trunk/bp-friends/bp-friends-notifications.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesnotificationsphp">trunk/bp-messages/bp-messages-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitynotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-notifications.php (2718 => 2719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-notifications.php 2010-02-15 07:43:15 UTC (rev 2718)
+++ trunk/bp-activity/bp-activity-notifications.php 2010-02-15 10:30:56 UTC (rev 2719)
</span><span class="lines">@@ -22,10 +22,13 @@
</span><span class="cx"> $message_link = bp_activity_get_permalink( $activity_id );
</span><span class="cx"> $settings_link = bp_core_get_user_domain( $receiver_user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</span><span class="cx">
</span><ins>+ $poster_name = stripslashes( $poster_name );
+ $content = bp_activity_filter_kses( stripslashes($content) );
+
</ins><span class="cx"> // Set up and send the message
</span><span class="cx"> $ud = bp_core_get_core_userdata( $receiver_user_id );
</span><span class="cx"> $to = $ud->user_email;
</span><del>- $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), stripslashes($poster_name) );
</del><ins>+ $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
</ins><span class="cx">
</span><span class="cx"> $message = sprintf( __(
</span><span class="cx"> '%s mentioned you in an update:
</span><span class="lines">@@ -35,14 +38,14 @@
</span><span class="cx"> To view and respond to the message, log in and visit: %s
</span><span class="cx">
</span><span class="cx"> ---------------------
</span><del>-', 'buddypress' ), $poster_name, bp_activity_filter_kses( stripslashes($content) ), $message_link );
</del><ins>+', 'buddypress' ), $poster_name, $content, $message_link );
</ins><span class="cx">
</span><span class="cx"> $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'bp_activity_at_message_notification_to', $to );
</span><del>- $subject = apply_filters( 'bp_activity_at_message_notification_subject', $subject );
- $message = apply_filters( 'bp_activity_at_message_notification_message', $message );
</del><ins>+ $subject = apply_filters( 'bp_activity_at_message_notification_subject', $subject, $poster_name );
+ $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -62,10 +65,13 @@
</span><span class="cx"> $thread_link = bp_activity_get_permalink( $activity_id );
</span><span class="cx"> $settings_link = bp_core_get_user_domain( $original_activity->user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</span><span class="cx">
</span><ins>+ $poster_name = stripslashes( $poster_name );
+ $content = bp_activity_filter_kses( stripslashes($content) );
+
</ins><span class="cx"> // Set up and send the message
</span><span class="cx"> $ud = bp_core_get_core_userdata( $original_activity->user_id );
</span><span class="cx"> $to = $ud->user_email;
</span><del>- $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), stripslashes_deep( $poster_name ) );
</del><ins>+ $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
</ins><span class="cx">
</span><span class="cx"> $message = sprintf( __(
</span><span class="cx"> '%s replied to one of your updates:
</span><span class="lines">@@ -75,14 +81,14 @@
</span><span class="cx"> To view your original update and all comments, log in and visit: %s
</span><span class="cx">
</span><span class="cx"> ---------------------
</span><del>-', 'buddypress' ), $poster_name, bp_activity_filter_kses( stripslashes( $content ) ), $thread_link );
</del><ins>+', 'buddypress' ), $poster_name, $content, $thread_link );
</ins><span class="cx">
</span><span class="cx"> $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'bp_activity_new_comment_notification_to', $to );
</span><del>- $subject = apply_filters( 'bp_activity_new_comment_notification_subject', $subject );
- $message = apply_filters( 'bp_activity_new_comment_notification_message', $message );
</del><ins>+ $subject = apply_filters( 'bp_activity_new_comment_notification_subject', $subject, $poster_name );
+ $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -104,8 +110,11 @@
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $ud = bp_core_get_core_userdata( $parent_comment->user_id );
</span><span class="cx"> $to = $ud->user_email;
</span><del>- $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), stripslashes_deep( $poster_name ) );
</del><ins>+ $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
</ins><span class="cx">
</span><ins>+ $poster_name = stripslashes( $poster_name );
+ $content = bp_activity_filter_kses( stripslashes( $content ) );
+
</ins><span class="cx"> $message = sprintf( __(
</span><span class="cx"> '%s replied to one of your comments:
</span><span class="cx">
</span><span class="lines">@@ -114,14 +123,14 @@
</span><span class="cx"> To view the original activity, your comment and all replies, log in and visit: %s
</span><span class="cx">
</span><span class="cx"> ---------------------
</span><del>-', 'buddypress' ), $poster_name, bp_activity_filter_kses( stripslashes( $content ) ), $thread_link );
</del><ins>+', 'buddypress' ), $poster_name, $content, $thread_link );
</ins><span class="cx">
</span><span class="cx"> $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'bp_activity_new_comment_notification_comment_author_to', $to );
</span><del>- $subject = apply_filters( 'bp_activity_new_comment_notification_comment_author_subject', $subject );
- $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message );
</del><ins>+ $subject = apply_filters( 'bp_activity_new_comment_notification_comment_author_subject', $subject, $poster_name );
+ $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message, $poster_name, $content );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2718 => 2719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-02-15 07:43:15 UTC (rev 2718)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-02-15 10:30:56 UTC (rev 2719)
</span><span class="lines">@@ -938,7 +938,7 @@
</span><span class="cx"> else
</span><span class="cx"> $content = $activities_template->activity->action . $activities_template->activity->content;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( utf8_encode( str_replace( '%s', '', $content ) ) ) );
</del><ins>+ return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-notifications.php (2718 => 2719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-notifications.php 2010-02-15 07:43:15 UTC (rev 2718)
+++ trunk/bp-friends/bp-friends-notifications.php 2010-02-15 10:30:56 UTC (rev 2719)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'friends_notification_new_request_to', $to );
</span><del>- $subject = apply_filters( 'friends_notification_new_request_subject', $subject );
- $message = apply_filters( 'friends_notification_new_request_message', $message );
</del><ins>+ $subject = apply_filters( 'friends_notification_new_request_subject', $subject, $initiator_name );
+ $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -71,8 +71,8 @@
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'friends_notification_accepted_request_to', $to );
</span><del>- $subject = apply_filters( 'friends_notification_accepted_request_subject', $subject );
- $message = apply_filters( 'friends_notification_accepted_request_message', $message );
</del><ins>+ $subject = apply_filters( 'friends_notification_accepted_request_subject', $subject, $friend_name );
+ $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (2718 => 2719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2010-02-15 07:43:15 UTC (rev 2718)
+++ trunk/bp-groups/bp-groups-notifications.php 2010-02-15 10:30:56 UTC (rev 2719)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_group_updated_to', $to );
</span><del>- $subject = apply_filters( 'groups_notification_group_updated_subject', $subject );
- $message = apply_filters( 'groups_notification_group_updated_message', $message );
</del><ins>+ $subject = apply_filters( 'groups_notification_group_updated_subject', $subject, &$group );
+ $message = apply_filters( 'groups_notification_group_updated_message', $message, &$group, $group_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_new_membership_request_to', $to );
</span><del>- $subject = apply_filters( 'groups_notification_new_membership_request_subject', $subject );
- $message = apply_filters( 'groups_notification_new_membership_request_message', $message );
</del><ins>+ $subject = apply_filters( 'groups_notification_new_membership_request_subject', $subject, &$group );
+ $message = apply_filters( 'groups_notification_new_membership_request_message', $message, &$group, $requesting_user_name, $profile_link, $group_requests );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -131,8 +131,8 @@
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_membership_request_completed_to', $to );
</span><del>- $subject = apply_filters( 'groups_notification_membership_request_completed_subject', $subject );
- $message = apply_filters( 'groups_notification_membership_request_completed_message', $message );
</del><ins>+ $subject = apply_filters( 'groups_notification_membership_request_completed_subject', $subject, &$group );
+ $message = apply_filters( 'groups_notification_membership_request_completed_message', $message, &$group, $group_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_promoted_member_to', $to );
</span><del>- $subject = apply_filters( 'groups_notification_promoted_member_subject', $subject );
- $message = apply_filters( 'groups_notification_promoted_member_message', $message );
</del><ins>+ $subject = apply_filters( 'groups_notification_promoted_member_subject', $subject, &$group );
+ $message = apply_filters( 'groups_notification_promoted_member_message', $message, &$group, $promoted_to, $group_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -229,8 +229,8 @@
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_group_invites_to', $to );
</span><del>- $subject = apply_filters( 'groups_notification_group_invites_subject', $subject );
- $message = apply_filters( 'groups_notification_group_invites_message', $message );
</del><ins>+ $subject = apply_filters( 'groups_notification_group_invites_subject', $subject, &$group );
+ $message = apply_filters( 'groups_notification_group_invites_message', $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -264,10 +264,13 @@
</span><span class="cx"> $message_link = bp_activity_get_permalink( $activity_id );
</span><span class="cx"> $settings_link = bp_core_get_user_domain( $receiver_user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</span><span class="cx">
</span><ins>+ $poster_name = stripslashes( $poster_name );
+ $content = bp_groups_filter_kses( stripslashes( $content ) );
+
</ins><span class="cx"> // Set up and send the message
</span><span class="cx"> $ud = bp_core_get_core_userdata( $receiver_user_id );
</span><span class="cx"> $to = $ud->user_email;
</span><del>- $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), stripslashes( $poster_name ), $group->name );
</del><ins>+ $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
</ins><span class="cx">
</span><span class="cx"> $message = sprintf( __(
</span><span class="cx"> '%s mentioned you in the group "%s":
</span><span class="lines">@@ -277,14 +280,14 @@
</span><span class="cx"> To view and respond to the message, log in and visit: %s
</span><span class="cx">
</span><span class="cx"> ---------------------
</span><del>-', 'buddypress' ), $poster_name, $group->name, bp_groups_filter_kses( stripslashes( $content ) ), $message_link );
</del><ins>+', 'buddypress' ), $poster_name, $group->name, $content, $message_link );
</ins><span class="cx">
</span><span class="cx"> $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_at_message_notification_to', $to );
</span><del>- $subject = apply_filters( 'groups_at_message_notification_subject', $subject );
- $message = apply_filters( 'groups_at_message_notification_message', $message );
</del><ins>+ $subject = apply_filters( 'groups_at_message_notification_subject', $subject, &$group, $poster_name );
+ $message = apply_filters( 'groups_at_message_notification_message', $message, &$group, $poster_name, $content, $message_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-notifications.php (2718 => 2719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-notifications.php 2010-02-15 07:43:15 UTC (rev 2718)
+++ trunk/bp-messages/bp-messages-notifications.php 2010-02-15 10:30:56 UTC (rev 2719)
</span><span class="lines">@@ -13,9 +13,13 @@
</span><span class="cx"> $message_link = bp_core_get_user_domain( $recipient->user_id ) . BP_MESSAGES_SLUG .'/';
</span><span class="cx"> $settings_link = bp_core_get_user_domain( $recipient->user_id ) . BP_SETTINGS_SLUG . '/notifications/';
</span><span class="cx">
</span><ins>+ $sender_name = stripslashes( $sender_name );
+ $subject = stripslashes( wp_filter_kses( $subject ) );
+ $content = stripslashes( wp_filter_kses( $content ) );
+
</ins><span class="cx"> // Set up and send the message
</span><span class="cx"> $email_to = $ud->user_email;
</span><del>- $email_subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), stripslashes( $sender_name ) );
</del><ins>+ $email_subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
</ins><span class="cx">
</span><span class="cx"> $email_content = sprintf( __(
</span><span class="cx"> '%s sent you a new message:
</span><span class="lines">@@ -27,14 +31,14 @@
</span><span class="cx"> To view and read your messages please log in and visit: %s
</span><span class="cx">
</span><span class="cx"> ---------------------
</span><del>-', 'buddypress' ), $sender_name, stripslashes( wp_filter_kses( $subject ) ), stripslashes( wp_filter_kses( $content ) ), $message_link );
</del><ins>+', 'buddypress' ), $sender_name, $subject, $content, $message_link );
</ins><span class="cx">
</span><span class="cx"> $content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $email_to = apply_filters( 'messages_notification_new_message_to', $email_to );
</span><del>- $email_subject = apply_filters( 'messages_notification_new_message_subject', $email_subject );
- $email_content = apply_filters( 'messages_notification_new_message_message', $email_content );
</del><ins>+ $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 );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $email_to, $email_subject, $email_content );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>