Changeset 2463
- Timestamp:
- 01/27/2010 11:24:01 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-notifications.php
r2290 r2463 21 21 22 22 $message_link = bp_activity_get_permalink( $activity_id ); 23 $settings_link = bp_core_get_user_domain( $ user_id ) . 'settings/notifications/';23 $settings_link = bp_core_get_user_domain( $receiver_user_id ) . 'settings/notifications/'; 24 24 25 25 // Set up and send the message 26 $ud = get_userdata( $receiver_user_id );26 $ud = bp_core_get_core_userdata( $receiver_user_id ); 27 27 $to = $ud->user_email; 28 28 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), stripslashes($poster_name) ); … … 63 63 64 64 // Set up and send the message 65 $ud = get_userdata( $original_activity->user_id );65 $ud = bp_core_get_core_userdata( $original_activity->user_id ); 66 66 $to = $ud->user_email; 67 67 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), stripslashes_deep( $poster_name ) ); -
trunk/bp-activity/bp-activity-templatetags.php
r2456 r2463 367 367 global $activities_template; 368 368 369 if ( empty( $activities_template->activity->action ) ) 370 $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded ); 371 else { 372 $content = bp_activity_content_filter( $activities_template->activity->action, $activities_template->activity->date_recorded ); 373 $content .= $activities_template->activity->content; 374 } 375 376 return apply_filters( 'bp_get_activity_content', $content, $activities_template->activity->component, $activities_template->activity->type ); 369 /*** 370 * If you want to filter activity update content, please use 371 * the filter 'bp_get_activity_content_body' 372 * 373 * This function is mainly for backwards comptibility. 374 */ 375 376 $content = bp_get_activity_action() . bp_get_activity_content_body(); 377 return apply_filters( 'bp_get_activity_content', $content ); 377 378 } 378 379 -
trunk/bp-groups.php
r2460 r2463 1365 1365 } else { 1366 1366 $user_fullname = bp_core_get_user_displayname( $requesting_user_id ); 1367 return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . ' /admin/membership-requests/?n=1" title="' . $user_fullname .' requests group membership">' . sprintf( __('%s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );1367 return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . 'admin/membership-requests/?n=1" title="' . $user_fullname .' requests group membership">' . sprintf( __('%s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name ); 1368 1368 } 1369 1369 break; … … 1378 1378 return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name ); 1379 1379 } else { 1380 return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . ' /?n=1">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name );1380 return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name ); 1381 1381 } 1382 1382 break; … … 1391 1391 return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . BP_MEMBERS_SLUG . '/' . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name ); 1392 1392 } else { 1393 return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . ' /?n=1">' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name );1393 return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name ); 1394 1394 } 1395 1395 … … 1405 1405 return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items ); 1406 1406 } else { 1407 return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . ' /?n=1">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name );1407 return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name ); 1408 1408 } 1409 1409 break; … … 1418 1418 return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items ); 1419 1419 } else { 1420 return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . ' /?n=1">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name );1420 return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name ); 1421 1421 } 1422 1422 break; … … 1907 1907 'item_id' => $bp->groups->current_group->id 1908 1908 ) ); 1909 1910 /* Require the notifications code so email notifications can be set on the 'bp_activity_posted_update' action. */ 1911 require_once( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' ); 1909 1912 1910 1913 do_action( 'bp_groups_posted_update', $content, $user_id, $group_id, $activity_id ); -
trunk/bp-groups/bp-groups-notifications.php
r2413 r2463 10 10 if ( 'no' == get_usermeta( $user->user_id, 'notification_groups_group_updated' ) ) continue; 11 11 12 $ud = get_userdata( $user->user_id );12 $ud = bp_core_get_core_userdata( $user->user_id ); 13 13 14 14 // Set up and send the message … … 46 46 $group = new BP_Groups_Group( $group_id, false, false ); 47 47 48 $ud = get_userdata($admin_id);49 $requesting_ud = get_userdata($requesting_user_id);48 $ud = bp_core_get_core_userdata($admin_id); 49 $requesting_ud = bp_core_get_core_userdata($requesting_user_id); 50 50 51 51 $group_requests = bp_get_group_permalink( $group ) . 'admin/membership-requests'; … … 90 90 $group = new BP_Groups_Group( $group_id, false, false ); 91 91 92 $ud = get_userdata($requesting_user_id);92 $ud = bp_core_get_core_userdata($requesting_user_id); 93 93 94 94 $group_link = bp_get_group_permalink( $group ); … … 143 143 144 144 $group = new BP_Groups_Group( $group_id, false, false ); 145 $ud = get_userdata($user_id);145 $ud = bp_core_get_core_userdata($user_id); 146 146 147 147 $group_link = bp_get_group_permalink( $group ); … … 171 171 global $bp; 172 172 173 $inviter_ud = get_userdata( $inviter_user_id );173 $inviter_ud = bp_core_get_core_userdata( $inviter_user_id ); 174 174 $inviter_name = bp_core_get_userlink( $inviter_user_id, true, false, true ); 175 175 $inviter_link = bp_core_get_user_domain( $inviter_user_id ); … … 186 186 return false; 187 187 188 $invited_ud = get_userdata($invited_user_id);188 $invited_ud = bp_core_get_core_userdata($invited_user_id); 189 189 190 190 $settings_link = bp_core_get_user_domain( $invited_user_id ) . 'settings/notifications/'; … … 216 216 } 217 217 218 function groups_at_message_notification( $content, $poster_user_id, $group_id, $activity_id ) { 219 global $bp; 220 221 /* Scan for @username strings in an activity update. Notify each user. */ 222 $pattern = '/[@]+([A-Za-z0-9-_]+)/'; 223 preg_match_all( $pattern, $content, $usernames ); 224 225 /* Make sure there's only one instance of each username */ 226 if ( !$usernames = array_unique( $usernames[1] ) ) 227 return false; 228 229 $group = new BP_Groups_Group( $group_id, false, false ); 230 231 foreach( (array)$usernames as $username ) { 232 if ( !$receiver_user_id = bp_core_get_userid($username) ) 233 continue; 234 235 /* Check the user is a member of the group before sending the update. */ 236 if ( !groups_is_user_member( $receiver_user_id, $group_id ) ) 237 continue; 238 239 // Now email the user with the contents of the message (if they have enabled email notifications) 240 if ( !get_usermeta( $user_id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $user_id, 'notification_activity_new_mention' ) ) { 241 $poster_name = bp_core_get_user_displayname( $poster_user_id ); 242 243 $message_link = bp_activity_get_permalink( $activity_id ); 244 $settings_link = bp_core_get_user_domain( $receiver_user_id ) . 'settings/notifications/'; 245 246 // Set up and send the message 247 $ud = bp_core_get_core_userdata( $receiver_user_id ); 248 $to = $ud->user_email; 249 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), stripslashes( $poster_name ), wp_filter_kses( stripslashes( $group->name ) ) ); 250 251 $message = sprintf( __( 252 '%s mentioned you in the group "%s": 253 254 "%s" 255 256 To view and respond to the message, log in and visit: %s 257 258 --------------------- 259 ', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes( $group->name ) ), wp_filter_kses( stripslashes($content) ), $message_link ); 260 261 $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link ); 262 263 // Send it 264 wp_mail( $to, $subject, $message ); 265 } 266 } 267 } 268 add_action( 'bp_groups_posted_update', 'groups_at_message_notification', 10, 4 ); 269 270 218 271 ?>
Note: See TracChangeset
for help on using the changeset viewer.