Ticket #5162: auto-submitted.patch
File auto-submitted.patch, 10.4 KB (added by , 11 years ago) |
---|
-
bp-core/bp-core-filters.php
253 253 $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 254 254 255 255 $from_name = bp_get_option( 'blogname', 'WordPress' ); 256 $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n" ;256 $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n" . "Auto-Submitted: auto-generated\n"; 257 257 $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}" ) ); 258 258 $subject = bp_get_email_subject( array( 'text' => sprintf( __( 'Activate %s', 'buddypress' ), 'http://' . $domain . $path ) ) ); 259 259 … … 281 281 $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 282 282 283 283 $from_name = bp_get_option( 'blogname', 'WordPress' ); 284 $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n" ;284 $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n" . "Auto-Submitted: auto-generated\n"; 285 285 $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 ); 286 286 $subject = bp_get_email_subject( array( 'text' => __( 'Activate Your Account', 'buddypress' ) ) ); 287 287 -
bp-core/deprecated/1.5.php
367 367 $to = apply_filters( 'groups_at_message_notification_to', $to ); 368 368 $subject = apply_filters( 'groups_at_message_notification_subject', $subject, $group, $poster_name ); 369 369 $message = apply_filters( 'groups_at_message_notification_message', $message, $group, $poster_name, $content, $message_link, $settings_link ); 370 $message_headers = "Auto-Submitted: auto-generated\n"; 370 371 371 wp_mail( $to, $subject, $message );372 wp_mail( $to, $subject, $message, $message_headers ); 372 373 } 373 374 } 374 375 -
bp-friends/bp-friends-notifications.php
48 48 $to = apply_filters( 'friends_notification_new_request_to', $to ); 49 49 $subject = apply_filters( 'friends_notification_new_request_subject', $subject, $initiator_name ); 50 50 $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link, $settings_link ); 51 $message_headers = "Auto-Submitted: auto-generated\n"; 51 52 52 wp_mail( $to, $subject, $message );53 wp_mail( $to, $subject, $message, $message_headers ); 53 54 54 55 do_action( 'bp_friends_sent_request_email', $friend_id, $subject, $message, $friendship_id, $initiator_id ); 55 56 } … … 86 87 $to = apply_filters( 'friends_notification_accepted_request_to', $to ); 87 88 $subject = apply_filters( 'friends_notification_accepted_request_subject', $subject, $friend_name ); 88 89 $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link, $settings_link ); 90 $message_headers = "Auto-Submitted: auto-generated\n"; 89 91 90 wp_mail( $to, $subject, $message );92 wp_mail( $to, $subject, $message, $message_headers ); 91 93 92 94 do_action( 'bp_friends_sent_accepted_email', $initiator_id, $subject, $message, $friendship_id, $friend_id ); 93 95 } -
bp-members/bp-members-functions.php
1446 1446 $to = apply_filters( 'bp_core_signup_send_validation_email_to', $user_email, $user_id ); 1447 1447 $subject = apply_filters( 'bp_core_signup_send_validation_email_subject', $subject, $user_id ); 1448 1448 $message = apply_filters( 'bp_core_signup_send_validation_email_message', $message, $user_id, $activate_url ); 1449 $message_headers = "Auto-Submitted: auto-generated\n"; 1449 1450 1450 wp_mail( $to, $subject, $message );1451 wp_mail( $to, $subject, $message, $message_headers ); 1451 1452 1452 1453 do_action( 'bp_core_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key ); 1453 1454 } -
bp-activity/bp-activity-notifications.php
104 104 $to = apply_filters( 'bp_activity_at_message_notification_to', $to ); 105 105 $subject = apply_filters( 'bp_activity_at_message_notification_subject', $subject, $poster_name ); 106 106 $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link, $settings_link ); 107 $message_headers = "Auto-Submitted: auto-generated\n"; 107 108 108 wp_mail( $to, $subject, $message );109 wp_mail( $to, $subject, $message, $message_headers ); 109 110 } 110 111 111 112 do_action( 'bp_activity_sent_mention_email', $activity, $subject, $message, $content ); … … 182 183 $to = apply_filters( 'bp_activity_new_comment_notification_to', $to ); 183 184 $subject = apply_filters( 'bp_activity_new_comment_notification_subject', $subject, $poster_name ); 184 185 $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link, $settings_link ); 186 $message_headers = "Auto-Submitted: auto-generated\n"; 185 187 186 wp_mail( $to, $subject, $message );188 wp_mail( $to, $subject, $message, $message_headers ); 187 189 188 190 do_action( 'bp_activity_sent_reply_to_update_email', $original_activity->user_id, $subject, $message, $comment_id, $commenter_id, $params ); 189 191 } -
bp-messages/bp-messages-notifications.php
70 70 $email_to = apply_filters( 'messages_notification_new_message_to', $email_to ); 71 71 $email_subject = apply_filters( 'messages_notification_new_message_subject', $email_subject, $sender_name ); 72 72 $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link, $settings_link ); 73 $email_headers = "Auto-Submitted: auto-generated\n"; 73 74 74 wp_mail( $email_to, $email_subject, $email_content );75 wp_mail( $email_to, $email_subject, $email_content, $email_headers ); 75 76 } 76 77 } 77 78 -
bp-groups/bp-groups-notifications.php
45 45 $to = apply_filters( 'groups_notification_group_updated_to', $to ); 46 46 $subject = apply_filters_ref_array( 'groups_notification_group_updated_subject', array( $subject, &$group ) ); 47 47 $message = apply_filters_ref_array( 'groups_notification_group_updated_message', array( $message, &$group, $group_link, $settings_link ) ); 48 $message_headers = "Auto-Submitted: auto-generated\n"; 48 49 49 wp_mail( $to, $subject, $message );50 wp_mail( $to, $subject, $message, $message_headers ); 50 51 51 52 unset( $message, $to ); 52 53 } … … 96 97 $to = apply_filters( 'groups_notification_new_membership_request_to', $to ); 97 98 $subject = apply_filters_ref_array( 'groups_notification_new_membership_request_subject', array( $subject, &$group ) ); 98 99 $message = apply_filters_ref_array( 'groups_notification_new_membership_request_message', array( $message, &$group, $requesting_user_name, $profile_link, $group_requests, $settings_link ) ); 100 $message_headers = "Auto-Submitted: auto-generated\n"; 99 101 100 wp_mail( $to, $subject, $message );102 wp_mail( $to, $subject, $message, $message_headers ); 101 103 102 104 do_action( 'bp_groups_sent_membership_request_email', $admin_id, $subject, $message, $requesting_user_id, $group_id, $membership_id ); 103 105 } … … 154 156 $to = apply_filters( 'groups_notification_membership_request_completed_to', $to ); 155 157 $subject = apply_filters_ref_array( 'groups_notification_membership_request_completed_subject', array( $subject, &$group ) ); 156 158 $message = apply_filters_ref_array( 'groups_notification_membership_request_completed_message', array( $message, &$group, $group_link, $settings_link ) ); 159 $message_headers = "Auto-Submitted: auto-generated\n"; 157 160 158 wp_mail( $to, $subject, $message );161 wp_mail( $to, $subject, $message, $message_headers ); 159 162 160 163 do_action( 'bp_groups_sent_membership_approved_email', $requesting_user_id, $subject, $message, $group_id ); 161 164 } … … 202 205 $to = apply_filters( 'groups_notification_promoted_member_to', $to ); 203 206 $subject = apply_filters_ref_array( 'groups_notification_promoted_member_subject', array( $subject, &$group ) ); 204 207 $message = apply_filters_ref_array( 'groups_notification_promoted_member_message', array( $message, &$group, $promoted_to, $group_link, $settings_link ) ); 208 $message_headers = "Auto-Submitted: auto-generated\n"; 205 209 206 wp_mail( $to, $subject, $message );210 wp_mail( $to, $subject, $message, $message_headers ); 207 211 208 212 do_action( 'bp_groups_sent_promoted_email', $user_id, $subject, $message, $group_id ); 209 213 } … … 258 262 $to = apply_filters( 'groups_notification_group_invites_to', $to ); 259 263 $subject = apply_filters_ref_array( 'groups_notification_group_invites_subject', array( $subject, &$group ) ); 260 264 $message = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link, $settings_link ) ); 265 $message_headers = "Auto-Submitted: auto-generated\n"; 261 266 262 wp_mail( $to, $subject, $message );267 wp_mail( $to, $subject, $message, $message_headers ); 263 268 264 269 do_action( 'bp_groups_sent_invited_email', $invited_user_id, $subject, $message, $group ); 265 270 }