Index: bp-activity.php =================================================================== --- bp-activity.php (revision 2323) +++ bp-activity.php (working copy) @@ -395,7 +395,7 @@ * array( * 'user_id' => false, // user_id to filter on * 'object' => false, // object to filter on e.g. groups, profile, status, friends - * 'action' => false, // action to filter on e.g. new_wire_post, new_forum_post, profile_updated + * 'action' => false, // action to filter on e.g. new_activity_post, profile_updated * 'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc. * 'secondary_id' => false, // secondary object ID to filter on e.g. a post_id * ); @@ -432,10 +432,10 @@ 'content' => false, // The content of the activity item 'primary_link' => false, // The primary URL for this item in RSS feeds 'component_name' => false, // The name/ID of the component e.g. groups, profile, mycomponent - 'component_action' => false, // The component action e.g. new_wire_post, profile_updated + 'component_action' => false, // The component action e.g. new_activity_post, profile_updated 'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user. - 'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id, or wire_post_id + 'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id 'secondary_item_id' => false, // Optional: A second ID used to further filter e.g. a comment_id 'recorded_time' => time(), // The time that this activity was recorded 'hide_sitewide' => false // Should this be hidden on the sitewide activity stream? @@ -500,7 +500,7 @@ 'content' => apply_filters( 'bp_activity_new_update_content', $activity_content ), 'primary_link' => apply_filters( 'bp_activity_new_update_primary_link', $primary_link ), 'component_name' => $bp->activity->id, - 'component_action' => 'new_wire_post' + 'component_action' => 'new_activity_post' ) ); /* Add this update to the "latest update" usermeta so it can be fetched anywhere. */ Index: bp-activity/bp-activity-templatetags.php =================================================================== --- bp-activity/bp-activity-templatetags.php (revision 2323) +++ bp-activity/bp-activity-templatetags.php (working copy) @@ -124,7 +124,7 @@ /* Filtering */ 'user_id' => false, // user_id to filter on 'object' => false, // object to filter on e.g. groups, profile, status, friends - 'action' => false, // action to filter on e.g. new_wire_post, new_forum_post, profile_updated + 'action' => false, // action to filter on e.g. new_activity_post, new_forum_post, profile_updated 'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc. 'secondary_id' => false, // secondary object ID to filter on e.g. a post_id @@ -732,7 +732,7 @@ if ( ':' == substr( $title, -1 ) ) $title = substr( $title, 0, -1 ); - if ( 'new_wire_post' == $activities_template->activity->component_action ) { + if ( 'new_activity_post' == $activities_template->activity->component_action ) { $content = explode( '
', $activities_template->activity->content ); $title .= ': ' . strip_tags( bp_create_excerpt( $content[1], 15 )); } Index: bp-core.php =================================================================== --- bp-core.php (revision 2323) +++ bp-core.php (working copy) @@ -341,7 +341,7 @@ * built in WordPress profile information */ if ( !function_exists( 'xprofile_install' ) ) { - /* Fallback wire values if xprofile is disabled */ + /* Fallback values if xprofile is disabled */ $bp->core->profile->slug = 'profile'; $bp->active_components[$bp->core->profile->slug] = $bp->core->profile->slug; Index: bp-core/bp-core-templatetags.php =================================================================== --- bp-core/bp-core-templatetags.php (revision 2323) +++ bp-core/bp-core-templatetags.php (working copy) @@ -1034,22 +1034,6 @@ echo apply_filters( 'bp_logout_link', $logout_link ); } -function bp_profile_wire_can_post() { - global $bp; - - if ( bp_is_home() ) - return true; - - if ( function_exists('friends_install') ) { - if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) ) - return true; - else - return false; - } - - return true; -} - function bp_nav_items() { global $bp; // This is deprecated, you should put these navigation items in your template header.php for easy editing. @@ -1394,15 +1378,6 @@ return false; } -function bp_is_wire_component() { - global $bp; - - if ( BP_WIRE_SLUG == $bp->current_action || in_array( BP_WIRE_SLUG, (array)$bp->action_variables ) ) - return true; - - return false; -} - function bp_is_messages_component() { global $bp; @@ -1502,15 +1477,6 @@ return false; } -function bp_is_profile_wire() { - global $bp; - - if ( BP_XPROFILE_SLUG == $bp->current_component && 'wire' == $bp->current_action ) - return true; - - return false; -} - function bp_is_user_groups() { global $bp; @@ -1557,15 +1523,6 @@ return false; } -function bp_is_group_wire() { - global $bp; - - if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'wire' == $bp->current_action ) - return true; - - return false; -} - function bp_is_group_forum() { global $bp; @@ -1795,9 +1752,6 @@ if ( bp_is_blogs_component() && !bp_is_blog_page() ) $bp_classes[] = 'blogs'; - if ( bp_is_wire_component() && !bp_is_blog_page() ) - $bp_classes[] = 'wire'; - if ( bp_is_messages_component() && !bp_is_blog_page() ) $bp_classes[] = 'messages'; @@ -1864,9 +1818,6 @@ if ( bp_is_group_forum() ) $bp_classes[] = 'group-forum'; - if ( bp_is_group_wire() ) - $bp_classes[] = 'group-wire'; - if ( bp_is_group_admin_page() ) $bp_classes[] = 'group-admin'; @@ -1876,9 +1827,6 @@ if ( bp_is_group_home() ) $bp_classes[] = 'group-home'; - if ( bp_is_profile_wire() ) - $bp_classes[] = 'profile-wire'; - if ( bp_is_change_avatar() ) $bp_classes[] = 'change-avatar'; Index: bp-groups.php =================================================================== --- bp-groups.php (revision 2323) +++ bp-groups.php (working copy) @@ -65,34 +65,11 @@ require_once(ABSPATH . 'wp-admin/upgrade-functions.php'); dbDelta($sql); - if ( function_exists('bp_wire_install') ) - groups_wire_install(); + do_action( 'groups_install' ); update_site_option( 'bp-groups-db-version', BP_GROUPS_DB_VERSION ); } -function groups_wire_install() { - global $wpdb, $bp; - - if ( !empty($wpdb->charset) ) - $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset"; - - $sql[] = "CREATE TABLE {$bp->groups->table_name_wire} ( - id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY, - item_id bigint(20) NOT NULL, - user_id bigint(20) NOT NULL, - parent_id bigint(20) NOT NULL, - content longtext NOT NULL, - date_posted datetime NOT NULL, - KEY item_id (item_id), - KEY user_id (user_id), - KEY parent_id (parent_id) - ) {$charset_collate};"; - - require_once(ABSPATH . 'wp-admin/upgrade-functions.php'); - dbDelta($sql); -} - function groups_setup_globals() { global $bp, $wpdb; @@ -108,9 +85,6 @@ /* Register this in the active components array */ $bp->active_components[$bp->groups->slug] = $bp->groups->id; - if ( function_exists('bp_wire_install') ) - $bp->groups->table_name_wire = $wpdb->base_prefix . 'bp_groups_wire'; - $bp->groups->forbidden_names = apply_filters( 'groups_forbidden_names', array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' ) ); $bp->groups->group_creation_steps = apply_filters( 'groups_create_group_steps', array( @@ -238,9 +212,6 @@ if ( $bp->groups->current_group->enable_forum && function_exists('bp_forums_setup') ) bp_core_new_subnav_item( array( 'name' => __( 'Forum', 'buddypress' ), 'slug' => 'forum', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_forum', 'position' => 40, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-forum' ) ); - if ( $bp->groups->current_group->enable_wire && function_exists('bp_wire_install') ) - bp_core_new_subnav_item( array( 'name' => __( 'Wire', 'buddypress' ), 'slug' => BP_WIRE_SLUG, 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_wire', 'position' => 50, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-wire' ) ); - bp_core_new_subnav_item( array( 'name' => __( 'Members', 'buddypress' ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-members' ) ); if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) { @@ -596,52 +567,6 @@ } } -function groups_screen_group_wire() { - global $bp; - - $wire_action = $bp->action_variables[0]; - - if ( $bp->is_single_item ) { - if ( 'post' == $wire_action && ( is_site_admin() || groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ) { - /* Check the nonce first. */ - if ( !check_admin_referer( 'bp_wire_post' ) ) - return false; - - if ( !groups_new_wire_post( $bp->groups->current_group->id, $_POST['wire-post-textarea'] ) ) - bp_core_add_message( __('Wire message could not be posted.', 'buddypress'), 'error' ); - else - bp_core_add_message( __('Wire message successfully posted.', 'buddypress') ); - - if ( !strpos( wp_get_referer(), $bp->wire->slug ) ) - bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) ); - else - bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . $bp->wire->slug ); - - } else if ( 'delete' == $wire_action && ( is_site_admin() || groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ) { - $wire_message_id = $bp->action_variables[1]; - - /* Check the nonce first. */ - if ( !check_admin_referer( 'bp_wire_delete_link' ) ) - return false; - - if ( !groups_delete_wire_post( $wire_message_id, $bp->groups->table_name_wire ) ) - bp_core_add_message( __('There was an error deleting the wire message.', 'buddypress'), 'error' ); - else - bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') ); - - if ( !strpos( wp_get_referer(), $bp->wire->slug ) ) - bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) ); - else - bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . $bp->wire->slug ); - - } else if ( ( !$wire_action || 'latest' == $bp->action_variables[1] ) ) { - bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/single/wire' ) ); - } else { - bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) ); - } - } -} - function groups_screen_group_members() { global $bp; @@ -1091,16 +1016,8 @@ id, 'notification_groups_group_updated') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" /> id, 'notification_groups_group_updated') ) { ?>checked="checked" /> - - - id, 'notification_groups_wire_post') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_wire_post') ) { ?>checked="checked" /> - id, 'notification_groups_wire_post') ) { ?>checked="checked" /> - - - - id, 'notification_groups_admin_promotion') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" /> id, 'notification_groups_admin_promotion') ) { ?>checked="checked" /> @@ -1389,7 +1306,6 @@ bp_activity_set_action( $bp->groups->id, 'created_group', __( 'Created a group', 'buddypress' ) ); bp_activity_set_action( $bp->groups->id, 'joined_group', __( 'Joined a group', 'buddypress' ) ); - bp_activity_set_action( $bp->groups->id, 'new_wire_post', __( 'New group wire post', 'buddypress' ) ); bp_activity_set_action( $bp->groups->id, 'new_forum_topic', __( 'New group forum topic', 'buddypress' ) ); bp_activity_set_action( $bp->groups->id, 'new_forum_post', __( 'New group forum post', 'buddypress' ) ); @@ -1430,8 +1346,6 @@ function groups_update_last_activity( $group_id ) { groups_update_groupmeta( $group_id, 'last_activity', time() ); } -add_action( 'groups_deleted_wire_post', 'groups_update_last_activity' ); -add_action( 'groups_new_wire_post', 'groups_update_last_activity' ); add_action( 'groups_joined_group', 'groups_update_last_activity' ); add_action( 'groups_leave_group', 'groups_update_last_activity' ); add_action( 'groups_created_group', 'groups_update_last_activity' ); @@ -2013,54 +1927,6 @@ return $activity_id; } -/*** Group Wire [DEPRECATED] ****************************************************************/ - -function groups_new_wire_post( $group_id, $content ) { - global $bp; - - if ( !function_exists( 'bp_wire_new_post' ) ) - return false; - - if ( $wire_post = bp_wire_new_post( $group_id, $content, 'groups' ) ) { - - /* Post an email notification if settings allow */ - require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' ); - groups_notification_new_wire_post( $group_id, $wire_post->id ); - - /* Record this in activity streams */ - $activity_content = sprintf( __( '%s wrote on the wire of the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '' . attribute_escape( $bp->groups->current_group->name ) . '' ); - $activity_content .= '
' . bp_create_excerpt( $content ) . '
'; - - groups_record_activity( array( - 'content' => apply_filters( 'groups_activity_new_wire_post', $activity_content ), - 'primary_link' => apply_filters( 'groups_activity_new_wire_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ), - 'component_action' => 'new_wire_post', - 'item_id' => $bp->groups->current_group->id, - 'secondary_item_id' => $wire_post->item_id - ) ); - - do_action( 'groups_new_wire_post', $group_id, $wire_post->id ); - - return true; - } - - return false; -} - -function groups_delete_wire_post( $wire_post_id, $table_name ) { - if ( bp_wire_delete_post( $wire_post_id, 'groups', $table_name ) ) { - /* Delete the activity stream item */ - if ( function_exists( 'bp_activity_delete_by_item_id' ) ) { - bp_activity_delete_by_item_id( array( 'item_id' => $wire_post_id, 'component_name' => 'groups', 'component_action' => 'new_wire_post' ) ); - } - - do_action( 'groups_deleted_wire_post', $wire_post_id ); - return true; - } - - return false; -} - /*** Group Forums **************************************************************/ function groups_new_group_forum( $group_id = false, $group_name = false, $group_desc = false ) { @@ -2716,8 +2582,6 @@ add_action( 'groups_group_avatar_updated', 'groups_clear_group_object_cache' ); // List actions to clear super cached pages on, if super cache is installed -add_action( 'groups_new_wire_post', 'bp_core_clear_cache' ); -add_action( 'groups_deleted_wire_post', 'bp_core_clear_cache' ); add_action( 'groups_join_group', 'bp_core_clear_cache' ); add_action( 'groups_leave_group', 'bp_core_clear_cache' ); add_action( 'groups_accept_invite', 'bp_core_clear_cache' ); Index: bp-groups/bp-groups-classes.php =================================================================== --- bp-groups/bp-groups-classes.php (revision 2323) +++ bp-groups/bp-groups-classes.php (working copy) @@ -204,10 +204,7 @@ BP_Groups_Member::delete( $user->user_id, $this->id, false ); } - // Delete the wire posts for this group if the wire is installed - if ( function_exists('bp_wire_install') ) { - BP_Wire_Post::delete_all_for_item( $this->id, $bp->groups->table_name_wire ); - } + do_action( 'bp_groups_delete_group', $this ); // Finally remove the group entry from the DB if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name} WHERE id = %d", $this->id ) ) ) Index: bp-groups/bp-groups-notifications.php =================================================================== --- bp-groups/bp-groups-notifications.php (revision 2323) +++ bp-groups/bp-groups-notifications.php (working copy) @@ -1,54 +1,5 @@ groups->table_name_wire, $wire_post_id ); - $group = new BP_Groups_Group( $group_id, false, true ); - - $poster_name = bp_core_get_user_displayname( $wire_post->user_id ); - $poster_profile_link = bp_core_get_user_domain( $wire_post->user_id ); - - $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New wire post on group: %s', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ) ); - - foreach ( $group->user_dataset as $user ) { - if ( 'no' == get_usermeta( $user->user_id, 'notification_groups_wire_post' ) ) continue; - - $ud = get_userdata( $user->user_id ); - - // Set up and send the message - $to = $ud->user_email; - - $wire_link = site_url( $bp->groups->slug . '/' . $group->slug . '/wire/' ); - $group_link = site_url( $bp->groups->slug . '/' . $group->slug . '/' ); - $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/'; - - $message = sprintf( __( -'%s posted on the wire of the group "%s": - -"%s" - -To view the group wire: %s - -To view the group home: %s - -To view %s\'s profile page: %s - ---------------------- -', 'buddypress' ), $poster_name, stripslashes( attribute_escape( $group->name ) ), stripslashes($wire_post->content), $wire_link, $group_link, $poster_name, $poster_profile_link ); - - $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link ); - - // Send it - wp_mail( $to, $subject, $message ); - - unset( $message, $to ); - } -} - function groups_notification_group_updated( $group_id ) { global $bp; Index: bp-groups/bp-groups-templatetags.php =================================================================== --- bp-groups/bp-groups-templatetags.php (revision 2323) +++ bp-groups/bp-groups-templatetags.php (working copy) @@ -710,28 +710,6 @@ return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d members', 'buddypress' ), number_format( (int) $groups_template->group->total_member_count ) ) ); } -function bp_group_show_wire_setting( $group = false ) { - global $groups_template; - - if ( !$group ) - $group =& $groups_template->group; - - if ( $group->enable_wire ) - echo ' checked="checked"'; -} - -function bp_group_is_wire_enabled( $group = false ) { - global $groups_template; - - if ( !$group ) - $group =& $groups_template->group; - - if ( $group->enable_wire ) - return true; - - return false; -} - function bp_group_forum_permalink( $deprecated = false ) { echo bp_get_group_forum_permalink(); } @@ -1614,14 +1592,6 @@ return apply_filters( 'bp_get_new_group_news', $bp->groups->current_group->news ); } -function bp_new_group_enable_wire() { - echo bp_get_new_group_enable_wire(); -} - function bp_get_new_group_enable_wire() { - global $bp; - return (int) apply_filters( 'bp_get_new_group_enable_wire', $bp->groups->current_group->enable_wire ); - } - function bp_new_group_enable_forum() { echo bp_get_new_group_enable_forum(); } Index: bp-xprofile.php =================================================================== --- bp-xprofile.php (revision 2323) +++ bp-xprofile.php (working copy) @@ -9,7 +9,6 @@ require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-classes.php' ); require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-filters.php' ); require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-templatetags.php' ); -require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-notifications.php' ); require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-cssjs.php' ); /* Assign the base group and fullname field names to constants to use in SQL statements */ @@ -89,34 +88,11 @@ require_once( ABSPATH . 'wp-admin/upgrade-functions.php' ); dbDelta($sql); - if ( function_exists('bp_wire_install') ) - xprofile_wire_install(); + do_action( 'xprofile_install' ); update_site_option( 'bp-xprofile-db-version', BP_XPROFILE_DB_VERSION ); } -function xprofile_wire_install() { - global $bp, $wpdb; - - if ( !empty($wpdb->charset) ) - $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset"; - - $sql[] = "CREATE TABLE {$bp->profile->table_name_wire} ( - id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY, - item_id bigint(20) NOT NULL, - user_id bigint(20) NOT NULL, - parent_id bigint(20) NOT NULL, - content longtext NOT NULL, - date_posted datetime NOT NULL, - KEY item_id (item_id), - KEY user_id (user_id), - KEY parent_id (parent_id) - ) {$charset_collate};"; - - require_once( ABSPATH . 'wp-admin/upgrade-functions.php' ); - dbDelta($sql); -} - /** * xprofile_setup_globals() * @@ -146,9 +122,6 @@ /* Set the support field type ids */ $bp->profile->field_types = apply_filters( 'xprofile_field_types', array( 'textbox', 'textarea', 'radio', 'checkbox', 'selectbox', 'multiselectbox', 'datebox' ) ); - if ( function_exists( 'bp_wire_install' ) ) - $bp->profile->table_name_wire = $wpdb->base_prefix . 'bp_xprofile_wire'; - do_action( 'xprofile_setup_globals' ); } add_action( 'plugins_loaded', 'xprofile_setup_globals', 5 ); @@ -424,42 +397,6 @@ bp_core_load_template( apply_filters( 'xprofile_template_change_avatar', 'members/single/home' ) ); } -/** - * xprofile_screen_notification_settings() - * - * Loads the notification settings for the xprofile component. - * Settings are hooked into the function: bp_core_screen_notification_settings_content() - * in bp-core/bp-core-settings.php - * - * @package BuddyPress Xprofile - * @global $current_user WordPress global variable containing current logged in user information - */ -function xprofile_screen_notification_settings() { - global $current_user; ?> - - - - - - - - - - - - - - - - - -
id, 'notification_profile_wire_post' ) || 'yes' == get_usermeta( $current_user->id, 'notification_profile_wire_post' ) ) { ?>checked="checked" />id, 'notification_profile_wire_post' ) ) { ?>checked="checked" />
- -current_component != $bp->wire->slug ) - return false; - - if ( 'post' != $bp->current_action ) - return false; - - /* Check the nonce */ - if ( !check_admin_referer( 'bp_wire_post' ) ) - return false; - - if ( !$wire_post = bp_wire_new_post( $bp->displayed_user->id, $_POST['wire-post-textarea'], $bp->profile->id ) ) { - bp_core_add_message( __( 'Wire message could not be posted. Please try again.', 'buddypress' ), 'error' ); - } else { - bp_core_add_message( __( 'Wire message successfully posted.', 'buddypress' ) ); - - /* Record the notification for the reciever if it's not on their own wire */ - if ( !bp_is_home() ) - bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, $bp->profile->id, 'new_wire_post' ); - - /* Record this on the poster's activity screen */ - if ( ( $wire_post->item_id == $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id == $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) { - $from_user_link = bp_core_get_userlink($wire_post->user_id); - $content = sprintf( __('%s wrote on their own wire', 'buddypress'), $from_user_link ) . ': %s'; - $primary_link = bp_core_get_userlink( $wire_post->user_id, false, true ); - } else if ( ( $wire_post->item_id != $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id != $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) { - $from_user_link = bp_core_get_userlink($wire_post->user_id); - $to_user_link = bp_core_get_userlink( $wire_post->item_id, false, false, true, true ); - $content = sprintf( __('%s wrote on %s wire', 'buddypress'), $from_user_link, $to_user_link ) . ': %s'; - $primary_link = bp_core_get_userlink( $wire_post->item_id, false, true ); - } - - $content .= '
' . bp_create_excerpt($wire_post->content) . '
'; - - /* Now write the values */ - xprofile_record_activity( array( - 'user_id' => $bp->loggedin_user->id, - 'content' => apply_filters( 'xprofile_activity_new_wire_post', $content, &$wire_post ), - 'primary_link' => apply_filters( 'xprofile_activity_new_wire_post_primary_link', $primary_link ), - 'component_action' => 'new_wire_post', - 'item_id' => $wire_post->id - ) ); - - do_action( 'xprofile_new_wire_post', &$wire_post ); - } - - if ( !strpos( wp_get_referer(), $bp->wire->slug ) ) { - bp_core_redirect( $bp->displayed_user->domain ); - } else { - bp_core_redirect( $bp->displayed_user->domain . $bp->wire->slug ); - } -} -add_action( 'wp', 'xprofile_action_new_wire_post', 3 ); - -/** - * xprofile_action_delete_wire_post() - * - * Deletes a wire post from the users profile wire. - * - * @package BuddyPress XProfile - * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals() - * @uses bp_wire_delete_post() Deletes a wire post for a specific wire using the ID of the item passed and the table name. - * @uses xprofile_delete_activity() Deletes an activity item for the xprofile component and a particular user. - * @uses bp_core_add_message() Adds an error/success message to the session to be displayed on the next page load. - * @uses bp_core_redirect() Safe redirects to a new page using the wp_redirect() function - */ -function xprofile_action_delete_wire_post() { - global $bp; - - if ( $bp->current_component != $bp->wire->slug ) - return false; - - if ( $bp->current_action != 'delete' ) - return false; - - if ( !check_admin_referer( 'bp_wire_delete_link' ) ) - return false; - - $wire_post_id = $bp->action_variables[0]; - - if ( bp_wire_delete_post( $wire_post_id, $bp->profile->slug, $bp->profile->table_name_wire ) ) { - bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') ); - - /* Delete the post from activity streams */ - xprofile_delete_activity( array( 'item_id' => $wire_post_id, 'component_action' => 'new_wire_post' ) ); - - do_action( 'xprofile_delete_wire_post', $wire_post_id ); - } else { - bp_core_add_message( __('Wire post could not be deleted, please try again.', 'buddypress'), 'error' ); - } - - if ( !strpos( wp_get_referer(), $bp->wire->slug ) ) { - bp_core_redirect( $bp->displayed_user->domain ); - } else { - bp_core_redirect( $bp->displayed_user->domain. $bp->wire->slug ); - } -} -add_action( 'wp', 'xprofile_action_delete_wire_post', 3 ); - - /******************************************************************************** * Activity & Notification Functions * @@ -632,7 +456,6 @@ /* Register the activity stream actions for this component */ bp_activity_set_action( $bp->profile->id, 'new_member', __( 'New member registered', 'buddypress' ) ); bp_activity_set_action( $bp->profile->id, 'updated_profile', __( 'Updated Profile', 'buddypress' ) ); - bp_activity_set_action( $bp->profile->id, 'new_wire_post', __( 'New profile wire post', 'buddypress' ) ); do_action( 'xprofile_register_activity_actions' ); } @@ -702,37 +525,7 @@ return apply_filters( 'xprofile_register_activity_action', bp_activity_set_action( $bp->profile->id, $key, $value ), $key, $value ); } -/** - * xprofile_format_notifications() - * - * Format notifications into something that can be read and displayed - * - * @package BuddyPress Xprofile - * @param $item_id The ID of the specific item for which the activity is recorded (could be a wire post id, user id etc) - * @param $action The component action name e.g. 'new_wire_post' or 'updated_profile' - * @param $total_items The total number of identical notification items (used for grouping) - * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals() - * @uses bp_core_global_user_fullname() Returns the display name for the user - * @return The readable notification item - */ -function xprofile_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) { - global $bp; - if ( 'new_wire_post' == $action ) { - if ( (int)$total_items > 1 ) { - return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '' . sprintf( __( 'You have %d new posts on your wire', 'buddypress' ), (int)$total_items ) . '', $total_items ); - } else { - $user_fullname = bp_core_get_user_displayname( $item_id ); - return apply_filters( 'bp_xprofile_single_new_wire_post_notification', '' . sprintf( __( '%s posted on your wire', 'buddypress' ), $user_fullname ) . '', $user_fullname ); - } - } - - do_action( 'xprofile_format_notifications', $action, $item_id, $secondary_item_id, $total_items ); - - return false; -} - - /******************************************************************************** * Business Functions * @@ -1093,9 +886,7 @@ global $bp; bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->profile->id, 'new_at_mention' ); - bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->profile->id, 'new_wire_post' ); } -add_action( 'bp_wire_screen_latest', 'xprofile_remove_screen_notifications' ); add_action( 'bp_activity_screen_my_activity', 'xprofile_remove_screen_notifications' ); add_action( 'bp_activity_screen_single_activity_permalink', 'xprofile_remove_screen_notifications' ); Index: bp-xprofile/bp-xprofile-notifications.php =================================================================== --- bp-xprofile/bp-xprofile-notifications.php (revision 2323) +++ bp-xprofile/bp-xprofile-notifications.php (working copy) @@ -1,59 +0,0 @@ -current_component == $bp->wire->slug && !bp_is_home() ) { - bp_core_add_notification( $poster_id, $user_id, 'xprofile', 'new_wire_post' ); - - if ( !get_usermeta( $user_id, 'notification_profile_wire_post' ) || 'yes' == get_usermeta( $user_id, 'notification_profile_wire_post' ) ) { - $poster_name = bp_core_get_user_displayname( $poster_id ); - $wire_post = new BP_Wire_Post( $bp->profile->table_name_wire, $wire_post_id, true ); - $ud = get_userdata( $user_id ); - - $wire_link = bp_core_get_user_domain( $user_id ) . 'wire'; - $settings_link = bp_core_get_user_domain( $user_id ) . 'settings/notifications'; - - // Set up and send the message - $to = $ud->user_email; - $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s posted on your wire.', 'buddypress' ), stripslashes($poster_name) ); - -$message = sprintf( __( -'%s posted on your wire: - -"%s" - -To view your wire: %s - ---------------------- -', 'buddypress' ), $poster_name, stripslashes($wire_post->content), $wire_link ); - - $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link ); - - // Send it - wp_mail( $to, $subject, $message ); - } - } - -} -add_action( 'bp_wire_post_posted', 'xprofile_record_wire_post_notification', 10, 3 ); - -?> \ No newline at end of file