Ticket #5148: 5148.patch

plugins/buddypress/bp-core/admin/bp-core-components.php

@@ -58 +58 @@
                 'xprofile' => array(
                         'title'       => __( 'Extended Profiles', 'buddypress' ),
                         'description' => __( 'Customize your community with fully editable profile fields that allow your users to describe themselves.', 'buddypress' )
+                ),
+                'settings' => array(
+                        'title'       => __( 'Account Settings', 'buddypress' ),
+                        'description' => __( 'Allow your users to modify their account and notification settings directly from within their profiles.', 'buddypress' )
+                ),
+                'notifications' => array(
+                        'title'       => __( 'Notifications', 'buddypress' ),
+                        'description' => __( 'Notify members of relevant activity with a toolbar bubble and/or via email, and allow them to customize their notification settings.', 'buddypress' )
                 )
         );
 
         $optional_components = bp_core_admin_get_components( 'optional' );
         $required_components = bp_core_admin_get_components( 'required' );
-        $retired_components = bp_core_admin_get_components( 'retired' );
+        $retired_components  = bp_core_admin_get_components( 'retired'  );
 
         // Don't show Forums component in optional components if it's disabled
         if ( ! bp_is_active( 'forums' ) ) {
@@ -371 +379 @@
                         'title'       => __( 'Activity Streams', 'buddypress' ),
                         'description' => __( 'Global, personal, and group activity streams with threaded commenting, direct posting, favoriting and @mentions, all with full RSS feed and email notification support.', 'buddypress' )
                 ),
+                'notifications' => array(
+                        'title'       => __( 'Notifications', 'buddypress' ),
+                        'description' => __( 'Notify members of relevant activity with a toolbar bubble and/or via email, and allow them to customize their notification settings.', 'buddypress' )
+                ),
                 'groups'   => array(
                         'title'       => __( 'User Groups', 'buddypress' ),
                         'description' => __( 'Groups allow your users to organize themselves into specific public, private or hidden sections with separate activity streams and member listings.', 'buddypress' )

plugins/buddypress/bp-core/admin/bp-core-schema.php

@@ -23 +23 @@
         if ( empty( $active_components ) )
                 $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
 
-        // Core DB Tables
-        bp_core_install_notifications();
+        // Notifications
+        if ( !empty( $active_components['notifications'] ) )
+                bp_core_install_notifications();
 
         // Activity Streams
         if ( !empty( $active_components['activity'] ) )

plugins/buddypress/bp-core/bp-core-classes.php

@@ -1291 +1291 @@
 
 
 /**
- * BP_Core_Notification class can be used by any component.
- * It will handle the fetching, saving and deleting of a user notification.
+ * BP_Core_Notification is deprecated.
+ * 
+ * Use BP_Notifications_Notification instead.
  *
  * @package BuddyPress Core
+ * @deprecated since BuddyPress (1.9)
  */
-
 class BP_Core_Notification {
 
         /**

plugins/buddypress/bp-core/bp-core-loader.php

@@ -54 +54 @@
                 /** Components ********************************************************/
 
                 // Set the included and optional components.
-                $bp->optional_components = apply_filters( 'bp_optional_components', array( 'activity', 'blogs', 'forums', 'friends', 'groups', 'messages', 'settings', 'xprofile' ) );
+                $bp->optional_components = apply_filters( 'bp_optional_components', array( 'activity', 'blogs', 'forums', 'friends', 'groups', 'messages', 'notifications', 'settings', 'xprofile' ) );
 
                 // Set the required components
                 $bp->required_components = apply_filters( 'bp_required_components', array( 'members' ) );
@@ -176 +176 @@
                 $bp->grav_default->user  = apply_filters( 'bp_user_gravatar_default',  $bp->site_options['avatar_default'] );
                 $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', $bp->grav_default->user );
                 $bp->grav_default->blog  = apply_filters( 'bp_blog_gravatar_default',  $bp->grav_default->user );
-
-                // Notifications Table
-                $bp->core->table_name_notifications = $bp->table_prefix . 'bp_notifications';
 
                 /**
                  * Used to determine if user has admin rights on current content. If the

plugins/buddypress/bp-core/bp-core-template.php

@@ -1436 +1436 @@
 }
 
 /**
+ * Check whether the current page is part of the Notifications component.
+ *
+ * @return bool True if the current page is part of the Notifications component.
+ */
+function bp_is_notifications_component() {
+        if ( bp_is_current_component( 'notifications' ) )
+                return true;
+
+        return false;
+}
+
+/**
  * Check whether the current page is part of the Settings component.
  *
  * @return bool True if the current page is part of the Settings component.
@@ -1750 +1762 @@
 }
 
 /**
+ * Is this a user's notifications page?
+ *
+ * Eg http://example.com/members/joe/notification/ (or a subpage thereof).
+ *
+ * @return bool True if the current page is a user's Notifications page.
+ */
+function bp_is_user_notifications() {
+        if ( bp_is_user() && bp_is_notifications_component() )
+                return true;
+
+        return false;
+}
+
+/**
  * Is this a user's settings page?
  *
  * Eg http://example.com/members/joe/settings/ (or a subpage thereof).

plugins/buddypress/bp-core/bp-core-update.php

@@ -187 +187 @@
         $raw_db_version = (int) bp_get_db_version_raw();
 
         $default_components = apply_filters( 'bp_new_install_default_components', array(
-                'activity' => 1,
-                'members'  => 1,
-                'settings' => 1,
-                'xprofile' => 1,
+                'activity'      => 1,
+                'members'       => 1,
+                'settings'      => 1,
+                'xprofile'      => 1,
+                'notifications' => 1
         ) );
 
         require_once( BP_PLUGIN_DIR . '/bp-core/admin/bp-core-schema.php' );

plugins/buddypress/bp-friends/bp-friends-classes.php

@@ -363 +363 @@
                 // Delete all friendships related to $user_id
                 $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE friend_user_id = %d OR initiator_user_id = %d", $user_id, $user_id ) );
 
-                // Delete friend request notifications for members who have a notification from this user.
-                $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE component_name = 'friends' AND ( component_action = 'friendship_request' OR component_action = 'friendship_accepted' ) AND item_id = %d", $user_id ) );
+                // Delete friend request notifications for members who have a
+                // notification from this user.
+                if ( bp_is_active( 'notifications' ) ) {
+                        $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->notifications->table_name} WHERE component_name = 'friends' AND ( component_action = 'friendship_request' OR component_action = 'friendship_accepted' ) AND item_id = %d", $user_id ) );
+                }
 
                 // Loop through friend_ids and update their counts
                 foreach ( (array) $friend_ids as $friend_id ) {

plugins/buddypress/bp-members/bp-members-adminbar.php

@@ -139 +139 @@
  * @since BuddyPress (1.5)
  */
 function bp_members_admin_bar_notifications_menu() {
-        global $wp_admin_bar;
 
-        if ( !is_user_logged_in() )
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
                 return false;
-
-        $notifications = bp_core_get_notifications_for_user( bp_loggedin_user_id(), 'object' );
-        $count         = !empty( $notifications ) ? count( $notifications ) : 0;
-        $alert_class   = (int) $count > 0 ? 'pending-count alert' : 'count no-alert';
-        $menu_title    = '<span id="ab-pending-notifications" class="' . $alert_class . '">' . $count . '</span>';
-
-        // Add the top-level Notifications button
-        $wp_admin_bar->add_menu( array(
-                'parent'    => 'top-secondary',
-                'id'        => 'bp-notifications',
-                'title'     => $menu_title,
-                'href'      => bp_loggedin_user_domain(),
-        ) );
-
-        if ( !empty( $notifications ) ) {
-                foreach ( (array) $notifications as $notification ) {
-                        $wp_admin_bar->add_menu( array(
-                                'parent' => 'bp-notifications',
-                                'id'     => 'notification-' . $notification->id,
-                                'title'  => $notification->content,
-                                'href'   => $notification->href
-                        ) );
-                }
-        } else {
-                $wp_admin_bar->add_menu( array(
-                        'parent' => 'bp-notifications',
-                        'id'     => 'no-notifications',
-                        'title'  => __( 'No new notifications', 'buddypress' ),
-                        'href'   => bp_loggedin_user_domain()
-                ) );
         }
 
-        return;
+        bp_notifications_toolbar_menu();
 }
 add_action( 'admin_bar_menu', 'bp_members_admin_bar_notifications_menu', 90 );
 

plugins/buddypress/bp-members/bp-members-buddybar.php

@@ -17 +17 @@
  */
 function bp_adminbar_notifications_menu() {
 
-        if ( !is_user_logged_in() )
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
                 return false;
-
-        echo '<li id="bp-adminbar-notifications-menu"><a href="' . bp_loggedin_user_domain() . '">';
-        _e( 'Notifications', 'buddypress' );
-
-        if ( $notifications = bp_core_get_notifications_for_user( bp_loggedin_user_id() ) ) { ?>
-                <span><?php echo count( $notifications ) ?></span>
-        <?php
         }
 
-        echo '</a>';
-        echo '<ul>';
-
-        if ( $notifications ) {
-                $counter = 0;
-                for ( $i = 0, $count = count( $notifications ); $i < $count; ++$i ) {
-                        $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : ''; ?>
-
-                        <li<?php echo $alt ?>><?php echo $notifications[$i] ?></li>
-
-                        <?php $counter++;
-                }
-        } else { ?>
-
-                <li><a href="<?php echo bp_loggedin_user_domain() ?>"><?php _e( 'No new notifications.', 'buddypress' ); ?></a></li>
-
-        <?php
-        }
-
-        echo '</ul>';
-        echo '</li>';
+        bp_notifications_buddybar_menu();
 }
 add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
 

plugins/buddypress/bp-members/bp-members-notifications.php

@@ -3 +3 @@
 /**
  * BuddyPress Member Notifications
  *
- * Functions and filters used for member notification
+ * Backwards compatibility functions and filters used for member notification
  *
  * @package BuddyPress
  * @subpackage MembersNotifications
@@ -26 +26 @@
  */
 function bp_core_add_notification( $item_id, $user_id, $component_name, $component_action, $secondary_item_id = 0, $date_notified = false ) {
 
-        if ( empty( $date_notified ) )
-                $date_notified = bp_core_current_time();
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
 
-        $notification                   = new BP_Core_Notification;
-        $notification->item_id          = $item_id;
-        $notification->user_id          = $user_id;
-        $notification->component_name   = $component_name;
-        $notification->component_action = $component_action;
-        $notification->date_notified    = $date_notified;
-        $notification->is_new           = 1;
-
-        if ( !empty( $secondary_item_id ) )
-                $notification->secondary_item_id = $secondary_item_id;
-
-        if ( $notification->save() )
-                return true;
-
-        return false;
+        return bp_notifications_add_notification( $item_id, $user_id, $component_name, $component_action, $secondary_item_id = 0, $date_notified = false );
 }
 
 /**
@@ -54 +42 @@
  * @return boolean True on success, false on fail
  */
 function bp_core_delete_notification( $id ) {
-        if ( !bp_core_check_notification_access( bp_loggedin_user_id(), $id ) )
-                return false;
 
-        return BP_Core_Notification::delete( $id );
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
+
+        return bp_notifications_delete_notification( $id );
 }
 
 /**
@@ -68 +59 @@
  * @return BP_Core_Notification
  */
 function bp_core_get_notification( $id ) {
-        return new BP_Core_Notification( $id );
+
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
+
+        return bp_notifications_get_notification( $id );
 }
 
 /**
@@ -81 +78 @@
  * @return boolean Object or array on success, false on fail
  */
 function bp_core_get_notifications_for_user( $user_id, $format = 'simple' ) {
-        global $bp;
 
-        $notifications         = BP_Core_Notification::get_all_for_user( $user_id );
-        $grouped_notifications = array(); // Notification groups
-        $renderable            = array(); // Renderable notifications
-
-        // Group notifications by component and component_action and provide totals
-        for ( $i = 0, $count = count( $notifications ); $i < $count; ++$i ) {
-                $notification = $notifications[$i];
-                $grouped_notifications[$notification->component_name][$notification->component_action][] = $notification;
-        }
-
-        // Bail if no notification groups
-        if ( empty( $grouped_notifications ) )
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
                 return false;
-
-        // Calculate a renderable output for each notification type
-        foreach ( $grouped_notifications as $component_name => $action_arrays ) {
-
-                // Skip if group is empty
-                if ( empty( $action_arrays ) )
-                        continue;
-
-                // Skip inactive components
-                if ( !bp_is_active( $component_name ) )
-                        continue;
-
-                // Loop through each actionable item and try to map it to a component
-                foreach ( (array) $action_arrays as $component_action_name => $component_action_items ) {
-
-                        // Get the number of actionable items
-                        $action_item_count = count( $component_action_items );
-
-                        // Skip if the count is less than 1
-                        if ( $action_item_count < 1 )
-                                continue;
-
-                        // Callback function exists
-                        if ( isset( $bp->{$component_name}->notification_callback ) && is_callable( $bp->{$component_name}->notification_callback ) ) {
-
-                                // Function should return an object
-                                if ( 'object' == $format ) {
-
-                                        // Retrieve the content of the notification using the callback
-                                        $content = call_user_func(
-                                                $bp->{$component_name}->notification_callback,
-                                                $component_action_name,
-                                                $component_action_items[0]->item_id,
-                                                $component_action_items[0]->secondary_item_id,
-                                                $action_item_count,
-                                                'array'
-                                        );
-
-                                        // Create the object to be returned
-                                        $notification_object = new stdClass;
-
-                                        // Minimal backpat with non-compatible notification
-                                        // callback functions
-                                        if ( is_string( $content ) ) {
-                                                $notification_object->content = $content;
-                                                $notification_object->href    = bp_loggedin_user_domain();
-                                        } else {
-                                                $notification_object->content = $content['text'];
-                                                $notification_object->href    = $content['link'];
-                                        }
-
-                                        $notification_object->id = $component_action_items[0]->id;
-                                        $renderable[]            = $notification_object;
-
-                                // Return an array of content strings
-                                } else {
-                                        $content      = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );
-                                        $renderable[] = $content;
-                                }
-
-                        // @deprecated format_notification_function - 1.5
-                        } elseif ( isset( $bp->{$component_name}->format_notification_function ) && function_exists( $bp->{$component_name}->format_notification_function ) ) {
-                                $renderable[] = call_user_func( $bp->{$component_name}->format_notification_function, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );
-                        }
-                }
         }
 
-        // If renderable is empty array, set to false
-        if ( empty( $renderable ) )
-                $renderable = false;
+        $renderable = bp_notifications_get_notifications_for_user( $user_id, $format );
 
-        // Filter and return
         return apply_filters( 'bp_core_get_notifications_for_user', $renderable, $user_id, $format );
 }
 
@@ -184 +102 @@
  * @return boolean True on success, false on fail
  */
 function bp_core_delete_notifications_by_type( $user_id, $component_name, $component_action ) {
-        return BP_Core_Notification::delete_for_user_by_type( $user_id, $component_name, $component_action );
+
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
+
+        return bp_notifications_delete_notifications_by_type( $user_id, $component_name, $component_action );
 }
 
 /**
@@ -200 +124 @@
  * @return boolean True on success, false on fail
  */
 function bp_core_delete_notifications_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id = false ) {
-        return BP_Core_Notification::delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id );
+
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
+
+        return bp_notifications_delete_notifications_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id );
 }
 
 /**
@@ -215 +145 @@
  * @return boolean True on success, false on fail
  */
 function bp_core_delete_all_notifications_by_type( $item_id, $component_name, $component_action = false, $secondary_item_id = false ) {
-        return BP_Core_Notification::delete_all_by_type( $item_id, $component_name, $component_action, $secondary_item_id );
+
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
+
+        bp_notifications_delete_all_notifications_by_type( $item_id, $component_name, $component_action, $secondary_item_id );
 }
 
 /**
@@ -230 +166 @@
  * @return boolean True on success, false on fail
  */
 function bp_core_delete_notifications_from_user( $user_id, $component_name, $component_action ) {
-        return BP_Core_Notification::delete_from_user_by_type( $user_id, $component_name, $component_action );
+
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
+
+        return bp_notifications_delete_notifications_from_user( $user_id, $component_name, $component_action );
 }
 
 /**
@@ -244 +186 @@
  * @return boolean True on success, false on fail
  */
 function bp_core_check_notification_access( $user_id, $notification_id ) {
-        if ( !BP_Core_Notification::check_access( $user_id, $notification_id ) )
-                return false;
 
-        return true;
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
+
+        return bp_notifications_check_notification_access( $user_id, $notification_id );
 }

new file plugins/buddypress/bp-notifications/bp-notifications-adminbar.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Notifications Toolbar
+ *
+ * Toolbar functions for the notifications component
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsToolbar
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Build the "Notifications" dropdown
+ *
+ * @package BuddyPress
+ * @since BuddyPress (1.5)
+ */
+function bp_notifications_toolbar_menu() {
+        global $wp_admin_bar;
+
+        if ( !is_user_logged_in() )
+                return false;
+
+        $notifications = bp_core_get_notifications_for_user( bp_loggedin_user_id(), 'object' );
+        $count         = !empty( $notifications ) ? count( $notifications ) : 0;
+        $alert_class   = (int) $count > 0 ? 'pending-count alert' : 'count no-alert';
+        $menu_title    = '<span id="ab-pending-notifications" class="' . $alert_class . '">' . $count . '</span>';
+
+        // Add the top-level Notifications button
+        $wp_admin_bar->add_menu( array(
+                'parent'    => 'top-secondary',
+                'id'        => 'bp-notifications',
+                'title'     => $menu_title,
+                'href'      => bp_loggedin_user_domain(),
+        ) );
+
+        if ( !empty( $notifications ) ) {
+                foreach ( (array) $notifications as $notification ) {
+                        $wp_admin_bar->add_menu( array(
+                                'parent' => 'bp-notifications',
+                                'id'     => 'notification-' . $notification->id,
+                                'title'  => $notification->content,
+                                'href'   => $notification->href
+                        ) );
+                }
+        } else {
+                $wp_admin_bar->add_menu( array(
+                        'parent' => 'bp-notifications',
+                        'id'     => 'no-notifications',
+                        'title'  => __( 'No new notifications', 'buddypress' ),
+                        'href'   => bp_loggedin_user_domain()
+                ) );
+        }
+
+        return;
+}
+add_action( 'admin_bar_menu', 'bp_members_admin_bar_notifications_menu', 90 );
+ No newline at end of file

new file plugins/buddypress/bp-notifications/bp-notifications-buddybar.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Notifications BuddyBar
+ *
+ * Handles the notifications functions related to the BuddyBar
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsBuddyBar
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Notifications Menu
+ */
+function bp_notifications_buddybar_menu() {
+
+        if ( !is_user_logged_in() )
+                return false;
+
+        echo '<li id="bp-adminbar-notifications-menu"><a href="' . bp_loggedin_user_domain() . '">';
+        _e( 'Notifications', 'buddypress' );
+
+        if ( $notifications = bp_core_get_notifications_for_user( bp_loggedin_user_id() ) ) { ?>
+                <span><?php echo count( $notifications ) ?></span>
+        <?php
+        }
+
+        echo '</a>';
+        echo '<ul>';
+
+        if ( $notifications ) {
+                $counter = 0;
+                for ( $i = 0, $count = count( $notifications ); $i < $count; ++$i ) {
+                        $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : ''; ?>
+
+                        <li<?php echo $alt ?>><?php echo $notifications[$i] ?></li>
+
+                        <?php $counter++;
+                }
+        } else { ?>
+
+                <li><a href="<?php echo bp_loggedin_user_domain() ?>"><?php _e( 'No new notifications.', 'buddypress' ); ?></a></li>
+
+        <?php
+        }
+
+        echo '</ul>';
+        echo '</li>';
+}
+add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
+ No newline at end of file

new file plugins/buddypress/bp-notifications/bp-notifications-classes.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Notifications Classes
+ *
+ * Classes used for notifications
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsClasses
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * BP_Core_Notification class can be used by any component.
+ *
+ * It will handle the fetching, saving and deleting of a member notification.
+ *
+ * @package BuddyPress Notifications
+ */
+class BP_Notifications_Notification {
+
+        /**
+         * The notification id
+         *
+         * @var integer
+         */
+        public $id;
+
+        /**
+         * The ID to which the notification relates to within the component.
+         *
+         * @var integer
+         */
+        public $item_id;
+
+        /**
+         * The secondary ID to which the notification relates to within the component.
+         *
+         * @var integer
+         */
+        public $secondary_item_id = null;
+
+        /**
+         * The user ID for who the notification is for.
+         *
+         * @var integer
+         */
+        public $user_id;
+
+        /**
+         * The name of the component that the notification is for.
+         *
+         * @var string
+         */
+        public $component_name;
+
+        /**
+         * The action within the component which the notification is related to.
+         *
+         * @var string
+         */
+        public $component_action;
+
+        /**
+         * The date the notification was created.
+         *
+         * @var string
+         */
+        public $date_notified;
+
+        /**
+         * Is the notification new or has it already been read.
+         *
+         * @var boolean
+         */
+        public $is_new;
+
+        /** Public Methods ********************************************************/
+
+        /**
+         * Constructor
+         *
+         * @param integer $id
+         */
+        public function __construct( $id = 0 ) {
+                if ( !empty( $id ) ) {
+                        $this->id = $id;
+                        $this->populate();
+                }
+        }
+
+        /**
+         * Update or insert notification details into the database.
+         *
+         * @global wpdb $wpdb WordPress database object
+         * @return bool Success or failure
+         */
+        public function save() {
+
+                // Return value
+                $retval = false;
+
+                // Default data and format
+                $data = array(
+                        'user_id'           => $this->user_id,
+                        'item_id'           => $this->item_id,
+                        'secondary_item_id' => $this->secondary_item_id,
+                        'component_name'    => $this->component_name,
+                        'component_action'  => $this->component_action,
+                        'date_notified'     => $this->date_notified,
+                        'is_new'            => $this->is_new,
+                );
+                $data_format = array( '%d', '%d', '%d', '%s', '%s', '%s', '%d' );
+
+                // Update
+                if ( !empty( $this->id ) ) {
+                        $result = self::update( $data, $data_format, array( 'ID' => $this->id ), array( '%d' ) );
+
+                // Insert
+                } else {
+                        $result = self::insert( $data, $data_format );
+                }
+
+                // Set the notification ID if successful
+                if ( ! empty( $result ) && ! is_wp_error( $result ) ) {
+                        global $wpdb;
+
+                        $this->id = $wpdb->insert_id;
+                        $retval   = true;
+                }
+
+                // Return the result
+                return (bool) $retval;
+        }
+
+        /**
+         * Fetches the notification data from the database.
+         *
+         * @global BuddyPress $bp The one true BuddyPress instance
+         * @global wpdb $wpdb WordPress database object
+         */
+        public function populate() {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                // Look for a notification
+                $notification = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->notifications->table_name} WHERE id = %d", $this->id ) );
+
+                // Setup the notification data
+                if ( !empty( $notification ) && ! is_wp_error( $notification ) ) {
+                        $this->item_id           = $notification->item_id;
+                        $this->secondary_item_id = $notification->secondary_item_id;
+                        $this->user_id           = $notification->user_id;
+                        $this->component_name    = $notification->component_name;
+                        $this->component_action  = $notification->component_action;
+                        $this->date_notified     = $notification->date_notified;
+                        $this->is_new            = $notification->is_new;
+                }
+        }
+
+        /** Private Static Methods ************************************************/
+
+        /**
+         * Update a notification entry, usually intended for marking read/unread.
+         *
+         * @since BuddyPress (1.9)
+         */
+        private static function insert( $data = array(), $data_format = array() ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                return $wpdb->insert( $bp->notifications->table_name, $data, $data_format );
+        }
+
+        /**
+         * Update a notification entry, usually intended for marking read/unread.
+         *
+         * @since BuddyPress (1.9)
+         */
+        private static function update( $data = array(), $where = array(), $data_format = array(), $where_format = array() ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                return $wpdb->update( $bp->notifications->table_name, $data, $where, $data_format, $where_format );
+        }
+
+        /**
+         * Delete a notification entry.
+         *
+         * @since BuddyPress (1.9)
+         */
+        private static function delete( $where = array(), $where_format = array() ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                return $wpdb->delete( $bp->notifications->table_name, $where, $where_format );
+        }
+
+        /** Public Static Methods *************************************************/
+
+        /**
+         * Check that a specific notification is for a specific user.
+         *
+         * @since BuddyPress (1.9)
+         * @param int $user_id
+         * @param int $notification_id
+         * @return bool
+         */
+        public static function check_access( $user_id, $notification_id ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->core->table_name_notifications} WHERE id = %d AND user_id = %d", $notification_id, $user_id ) );
+        }
+
+        /**
+         * Fetches all the notifications in the database for a specific user.
+         *
+         * @global BuddyPress $bp The one true BuddyPress instance
+         * @global wpdb $wpdb WordPress database object
+         * @param integer $user_id User ID
+         * @param string $status 'is_new' or 'all'
+         * @return array Associative array
+         * @static
+         */
+        public static function get_all_for_user( $user_id, $status = 'is_new' ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                $is_new = ( 'is_new' == $status ) ? ' AND is_new = 1 ' : '';
+
+                return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->notifications->table_name} WHERE user_id = %d {$is_new}", $user_id ) );
+        }
+
+        /**
+         * Fetches all the notifications in the database for a specific user.
+         *
+         * @since BuddyPress (1.9)
+         *
+         * @global wpdb $wpdb WordPress database object
+         * @param integer $user_id User ID
+         * @param string $status 'is_new' or 'all'
+         * @return array Associative array
+         * @static
+         */
+        public static function get_unread_for_user( $user_id = 0 ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->notifications->table_name} WHERE user_id = %d AND is_new = 1", $user_id ) );
+        }
+
+        /**
+         * Fetches all the notifications in the database for a specific user.
+         *
+         * @since BuddyPress (1.9)
+         *
+         * @global wpdb $wpdb WordPress database object
+         * @param integer $user_id User ID
+         * @param string $status 'is_new' or 'all'
+         * @return array Associative array
+         * @static
+         */
+        public static function get_read_for_user( $user_id = 0 ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->notifications->table_name} WHERE user_id = %d AND is_new = 0", $user_id ) );
+        }
+
+        public static function get_current_notifications_for_user( $user_id, $is_new = 1, $limit = null, $page = null, $search_terms = '' ) {
+                global $wpdb;
+
+                $bp      = buddypress();
+                $pag_sql = $is_new_sql = $search_sql = '';
+                
+                // Pagination
+                if ( !empty( $limit ) && !empty( $page ) ) {
+                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+                }
+
+                // Unread or read?
+                if ( !empty( $is_new ) ) {
+                        $is_new_sql = " AND is_new = {$is_new} ";
+                }
+
+                // Search?
+                if ( !empty( $search_terms ) ) {
+                        $search_terms = like_escape( esc_sql( $search_terms ) );
+                        $search_sql   = "AND ( component_name LIKE '%%$search_terms%%' OR component_action LIKE '%%$search_terms%%' )";
+                }
+
+                $notifications_query       = "SELECT * FROM {$bp->notifications->table_name} WHERE user_id = %d {$is_new_sql} {$search_sql} ORDER BY date_notified DESC {$pag_sql}";
+                $notifications_count_query = "SELECT COUNT( DISTINCT id ) FROM {$bp->notifications->table_name} WHERE user_id = %d {$is_new_sql} {$search_sql}";
+
+                // Get the notifications and count
+                $notifications       = $wpdb->get_results( $wpdb->prepare( $notifications_query,       $user_id ) );
+                $total_notifications = $wpdb->get_var(     $wpdb->prepare( $notifications_count_query, $user_id ) );
+
+                // Bail if no notifications
+                if ( empty( $notifications ) ) {
+                        return false;
+                }
+
+                return array( 'notifications' => &$notifications, 'total' => (int) $total_notifications );
+        }
+
+        /** Mark Read *************************************************************/
+
+        /**
+         * Mark all user notifications as read.
+         *
+         * @since BuddyPress (1.9)
+         *
+         * @param integer $user_id The ID of the user who the notifications are for.
+         * @param integer $is_new Mark as read (1) or unread (0).
+         * @static
+         */
+        public static function mark_all_for_user( $user_id, $is_new = 0, $item_id = 0, $component_name = '', $component_action = '', $secondary_item_id = 0 ) {
+
+                // Update is_new
+                $data         = array( 'is_new' => $is_new );
+                $data_format  = array( '%d' );
+
+                // Where clause
+                $where        = array( 'user_id' => $user_id );
+                $where_format = array( '%d' );
+
+                // Check the item ID
+                if ( !empty( $item_id ) ) {
+                        $where['item_id'] = $item_id;
+                        $where_format[]   = '%d';
+                }
+
+                // Check the component name
+                if ( !empty( $component_name ) ) {
+                        $where['component_name'] = $component_name;
+                        $where_format[]          = '%s';
+                }
+
+                // Check the component action
+                if ( !empty( $component_action ) ) {
+                        $where['component_action'] = $component_action;
+                        $where_format[]            = '%s';
+                }
+
+                // Possibly check the secondary item ID
+                if ( !empty( $secondary_item_id ) ) {
+                        $where['secondary_item_id'] = $secondary_item_id;
+                        $where_format[]            = '%d';
+                }
+
+                return self::update( $data, $where, $data_format, $where_format );
+        }
+
+        /**
+         * Mark all notifications from a user as read.
+         *
+         * @since BuddyPress (1.9)
+         *
+         * @param integer $user_id The ID of the user who the notifications are for.
+         * @param integer $is_new Mark as read (1) or unread (0).
+         * @static
+         */
+        public static function mark_all_from_user( $user_id, $is_new = 0, $component_name = '', $component_action = '', $secondary_item_id = 0 ) {
+
+                // Update is_new
+                $data         = array( 'is_new' => $is_new );
+                $data_format  = array( '%d' );
+
+                // Where clause
+                $where        = array( 'item_id' => $user_id );
+                $where_format = array( '%d' );
+
+                // Check the component name
+                if ( !empty( $component_name ) ) {
+                        $where['component_name'] = $component_name;
+                        $where_format[]          = '%s';
+                }
+
+                // Check the component action
+                if ( !empty( $component_action ) ) {
+                        $where['component_action'] = $component_action;
+                        $where_format[]            = '%s';
+                }
+
+                // Possibly check the secondary item ID
+                if ( !empty( $secondary_item_id ) ) {
+                        $where['secondary_item_id'] = $secondary_item_id;
+                        $where_format[]            = '%d';
+                }
+
+                return self::update( $data, $where, $data_format, $where_format );
+        }
+
+        /**
+         * Mark all notifications for all users as read by item id, and optional
+         * secondary item id, and component name and action.
+         *
+         * @since BuddyPress (1.9)
+         *
+         * @global wpdb $wpdb WordPress database object
+         * @param string $item_id The item id that they notifications are to be for.
+         * @param string $component_name The component that the notifications are to be from.
+         * @param string $component_action The action that the notificationsa are to be from.
+         * @param string $secondary_item_id Optional secondary item id that the notifications are to have.
+         * @static
+         */
+        public static function mark_all_by_type( $item_id, $is_new = 0, $component_name = '', $component_action = '', $secondary_item_id = 0 ) {
+
+                // Update is_new
+                $data        = array( 'is_new' => $is_new );
+                $data_format = array( '%d' );
+
+                // Check the item ID
+                if ( !empty( $item_id ) ) {
+                        $where['item_id'] = $item_id;
+                        $where_format[]   = '%d';
+                }
+
+                // Check the component name
+                if ( !empty( $component_name ) ) {
+                        $where['component_name'] = $component_name;
+                        $where_format[]          = '%s';
+                }
+
+                // Check the component action
+                if ( !empty( $component_action ) ) {
+                        $where['component_action'] = $component_action;
+                        $where_format[]            = '%s';
+                }
+
+                // Check the secondary item ID
+                if ( !empty( $secondary_item_id ) ) {
+                        $where['secondary_item_id'] = $secondary_item_id;
+                        $where_format[]             = '%d';
+                }
+
+                return self::update( $data, $where, $data_format, $where_format );
+        }
+
+        /** Delete ****************************************************************/
+
+        /**
+         * Delete all the notifications for a user based on the component name and action.
+         *
+         * @param integer $user_id
+         * @param string $component_name
+         * @param string $component_action
+         * @static
+         */
+        public static function delete_for_user_by_type( $user_id, $component_name = '', $component_action = '' ) {
+
+                // Use user ID
+                $where        = array( 'user_id' => $user_id );
+                $where_format = array( '%d' );
+
+                // Check the component name
+                if ( !empty( $component_name ) ) {
+                        $where['component_name'] = $component_name;
+                        $where_format[]          = '%s';
+                }
+
+                // Check the component action
+                if ( !empty( $component_action ) ) {
+                        $where['component_action'] = $component_action;
+                        $where_format[]            = '%s';
+                }
+
+                return self::delete( $where, $where_format );
+        }
+
+        /**
+         * Delete all the notifications that have a specific item id, component name and action.
+         *
+         * @param integer $user_id The ID of the user who the notifications are for.
+         * @param integer $item_id The item ID of the notifications we wish to delete.
+         * @param string $component_name The name of the component that the notifications we wish to delete.
+         * @param string $component_action The action of the component that the notifications we wish to delete.
+         * @param integer $secondary_item_id The secondary item id of the notifications that we wish to use to delete.
+         * @static
+         */
+        public static function delete_for_user_by_item_id( $user_id, $item_id = 0, $component_name = '', $component_action = '', $secondary_item_id = 0 ) {
+
+                // Use user ID
+                $where        = array( 'user_id' => $user_id );
+                $where_format = array( '%d' );
+
+                // Check the item ID
+                if ( !empty( $item_id ) ) {
+                        $where['item_id'] = $item_id;
+                        $where_format[]   = '%d';
+                }
+
+                // Check the component name
+                if ( !empty( $component_name ) ) {
+                        $where['component_name'] = $component_name;
+                        $where_format[]          = '%s';
+                }
+
+                // Check the component action
+                if ( !empty( $component_action ) ) {
+                        $where['component_action'] = $component_action;
+                        $where_format[]            = '%s';
+                }
+
+                // Check the secondary item ID
+                if ( !empty( $secondary_item_id ) ) {
+                        $where['secondary_item_id'] = $secondary_item_id;
+                        $where_format[]             = '%d';
+                }
+
+                return self::delete( $where, $where_format );
+        }
+
+        /**
+         * Deletes all the notifications sent by a specific user, by component and action.
+         *
+         * @param integer $user_id The ID of the user whose sent notifications we wish to delete.
+         * @param string $component_name The name of the component the notification was sent from.
+         * @param string $component_action The action of the component the notification was sent from.
+         * @static
+         */
+        public static function delete_from_user_by_type( $user_id, $component_name = '', $component_action = '' ) {
+
+                // Use item ID
+                $where        = array( 'item_id' => $user_id );
+                $where_format = array( '%d' );
+
+                // Check the component name
+                if ( !empty( $component_name ) ) {
+                        $where['component_name'] = $component_name;
+                        $where_format[]          = '%s';
+                }
+
+                // Check the component action
+                if ( !empty( $component_action ) ) {
+                        $where['component_action'] = $component_action;
+                        $where_format[]            = '%s';
+                }
+
+                return self::delete( $where, $where_format );
+        }
+
+        /**
+         * Deletes all the notifications for all users by item id, and optional secondary item id, and component name and action.
+         *
+         * @param string $item_id The item id that they notifications are to be for.
+         * @param string $component_name The component that the notifications are to be from.
+         * @param string $component_action The action that the notificationsa are to be from.
+         * @param string $secondary_item_id Optional secondary item id that the notifications are to have.
+         * @static
+         */
+        public static function delete_all_by_type( $item_id, $component_name = '', $component_action = '', $secondary_item_id = 0 ) {
+
+                // Use item ID
+                $where        = array( 'item_id' => $item_id );
+                $where_format = array( '%d' );
+
+                // Check the component name
+                if ( !empty( $component_name ) ) {
+                        $where['component_name'] = $component_name;
+                        $where_format[]          = '%s';
+                }
+
+                // Check the component action
+                if ( !empty( $component_action ) ) {
+                        $where['component_action'] = $component_action;
+                        $where_format[]            = '%s';
+                }
+
+                // Check the secondary item ID
+                if ( !empty( $secondary_item_id ) ) {
+                        $where['secondary_item_id'] = $secondary_item_id;
+                        $where_format[]             = '%d';
+                }
+
+                return self::delete( $where, $where_format );
+        }
+}

new file plugins/buddypress/bp-notifications/bp-notifications-functions.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Member Notifications
+ *
+ * Functions and filters used for member notification
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsFunctions
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Add a notification for a specific user, from a specific component
+ *
+ * @since BuddyPress (1.9)
+ * @param string $item_id
+ * @param int $user_id
+ * @param string $component_name
+ * @param string $component_action
+ * @param string $secondary_item_id
+ * @param string $date_notified
+ * @return boolean True on success, false on fail
+ */
+function bp_notifications_add_notification( $item_id, $user_id, $component_name, $component_action, $secondary_item_id = 0, $date_notified = false ) {
+
+        if ( empty( $date_notified ) ) {
+                $date_notified = bp_core_current_time();
+        }
+
+        // Setup the new notification
+        $notification                    = new BP_Notifications_Notification;
+        $notification->item_id           = $item_id;
+        $notification->user_id           = $user_id;
+        $notification->component_name    = $component_name;
+        $notification->component_action  = $component_action;
+        $notification->date_notified     = $date_notified;
+        $notification->is_new            = 1;
+        $notification->secondary_item_id = $secondary_item_id;
+
+        // Save the new notification
+        return (bool) $notification->save();
+}
+
+/**
+ * Get a specific notification by its ID
+ *
+ * @since BuddyPress (1.9)
+ * @param int $id
+ * @return BP_Notifications_Notification
+ */
+function bp_notifications_get_notification( $id ) {
+        return new BP_Notifications_Notification( $id );
+}
+
+/**
+ * Delete a specific notification by its ID
+ *
+ * @since BuddyPress (1.9)
+ * @param int $id
+ * @return boolean True on success, false on fail
+ */
+function bp_notifications_delete_notification( $id ) {
+        if ( ! bp_notifications_check_notification_access( bp_loggedin_user_id(), $id ) ) {
+                return false;
+        }
+
+        return BP_Notifications_Notification::delete( $id );
+}
+
+/**
+ * Get notifications for a specific user
+ *
+ * @since BuddyPress (1.9)
+ * @param int $user_id
+ * @param string $format
+ * @return boolean Object or array on success, false on fail
+ */
+function bp_notifications_get_notifications_for_user( $user_id, $format = 'simple' ) {
+
+        // Setup local variables
+        $bp                    = buddypress();
+        $notifications         = BP_Notifications_Notification::get_all_for_user( $user_id );
+        $grouped_notifications = array(); // Notification groups
+        $renderable            = array(); // Renderable notifications
+
+        // Group notifications by component and component_action and provide totals
+        for ( $i = 0, $count = count( $notifications ); $i < $count; ++$i ) {
+                $notification = $notifications[$i];
+                $grouped_notifications[$notification->component_name][$notification->component_action][] = $notification;
+        }
+
+        // Bail if no notification groups
+        if ( empty( $grouped_notifications ) ) {
+                return false;
+        }
+
+        // Calculate a renderable output for each notification type
+        foreach ( $grouped_notifications as $component_name => $action_arrays ) {
+
+                // Skip if group is empty
+                if ( empty( $action_arrays ) ) {
+                        continue;
+                }
+
+                // Skip inactive components
+                if ( !bp_is_active( $component_name ) ) {
+                        continue;
+                }
+
+                // Loop through each actionable item and try to map it to a component
+                foreach ( (array) $action_arrays as $component_action_name => $component_action_items ) {
+
+                        // Get the number of actionable items
+                        $action_item_count = count( $component_action_items );
+
+                        // Skip if the count is less than 1
+                        if ( $action_item_count < 1 ) {
+                                continue;
+                        }
+
+                        // Callback function exists
+                        if ( isset( $bp->{$component_name}->notification_callback ) && is_callable( $bp->{$component_name}->notification_callback ) ) {
+
+                                // Function should return an object
+                                if ( 'object' == $format ) {
+
+                                        // Retrieve the content of the notification using the callback
+                                        $content = call_user_func(
+                                                $bp->{$component_name}->notification_callback,
+                                                $component_action_name,
+                                                $component_action_items[0]->item_id,
+                                                $component_action_items[0]->secondary_item_id,
+                                                $action_item_count,
+                                                'array'
+                                        );
+
+                                        // Create the object to be returned
+                                        $notification_object = new stdClass;
+
+                                        // Minimal backpat with non-compatible notification
+                                        // callback functions
+                                        if ( is_string( $content ) ) {
+                                                $notification_object->content = $content;
+                                                $notification_object->href    = bp_loggedin_user_domain();
+                                        } else {
+                                                $notification_object->content = $content['text'];
+                                                $notification_object->href    = $content['link'];
+                                        }
+
+                                        $notification_object->id = $component_action_items[0]->id;
+                                        $renderable[]            = $notification_object;
+
+                                // Return an array of content strings
+                                } else {
+                                        $content      = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );
+                                        $renderable[] = $content;
+                                }
+
+                        // @deprecated format_notification_function - 1.5
+                        } elseif ( isset( $bp->{$component_name}->format_notification_function ) && function_exists( $bp->{$component_name}->format_notification_function ) ) {
+                                $renderable[] = call_user_func( $bp->{$component_name}->format_notification_function, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );
+                        }
+                }
+        }
+
+        // If renderable is empty array, set to false
+        if ( empty( $renderable ) ) {
+                $renderable = false;
+        }
+
+        // Filter and return
+        return apply_filters( 'bp_core_get_notifications_for_user', $renderable, $user_id, $format );
+}
+
+/**
+ * Delete notifications for a user by type
+ *
+ * Used when clearing out notifications for a specific component when the user
+ * has visited that component.
+ *
+ * @since BuddyPress (1.9)
+ * @param int $user_id
+ * @param string $component_name
+ * @param string $component_action
+ * @return boolean True on success, false on fail
+ */
+function bp_notifications_delete_notifications_by_type( $user_id, $component_name, $component_action ) {
+        return BP_Notifications_Notification::delete_for_user_by_type( $user_id, $component_name, $component_action );
+}
+
+/**
+ * Delete notifications for an item ID
+ *
+ * Used when clearing out notifications for a specific component when the user
+ * has visited that component.
+ *
+ * @since BuddyPress (1.9)
+ * @param int $user_id
+ * @param string $component_name
+ * @param string $component_action
+ * @return boolean True on success, false on fail
+ */
+function bp_notifications_delete_notifications_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id = false ) {
+        return BP_Notifications_Notification::delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id );
+}
+
+/**
+ * Delete all notifications for by type
+ *
+ * Used when clearing out notifications for an entire component
+ *
+ * @since BuddyPress (1.9)
+ * @param int $user_id
+ * @param string $component_name
+ * @param string $component_action
+ * @return boolean True on success, false on fail
+ */
+function bp_notifications_delete_all_notifications_by_type( $item_id, $component_name, $component_action = false, $secondary_item_id = false ) {
+        return BP_Notifications_Notification::delete_all_by_type( $item_id, $component_name, $component_action, $secondary_item_id );
+}
+
+/**
+ * Delete all notifications for a user
+ *
+ * Used when clearing out all notifications for a user, whene deleted or spammed
+ *
+ * @since BuddyPress (1.9)
+ * @param int $user_id
+ * @param string $component_name
+ * @param string $component_action
+ * @return boolean True on success, false on fail
+ */
+function bp_notifications_delete_notifications_from_user( $user_id, $component_name, $component_action ) {
+        return BP_Notifications_Notification::delete_from_user_by_type( $user_id, $component_name, $component_action );
+}
+
+/**
+ * Check if a user has access to a specific notification
+ *
+ * Used before deleting a notification for a user
+ *
+ * @since BuddyPress (1.9)
+ * @param int $user_id
+ * @param int $notification_id
+ * @return boolean True on success, false on fail
+ */
+function bp_notifications_check_notification_access( $user_id, $notification_id ) {
+        return (bool) BP_Notifications_Notification::check_access( $user_id, $notification_id );
+}
+
+/**
+ * Get the 
+ *
+ * @since BuddyPress (1.9)
+ * @param int $user_id
+ * @return int
+ */
+function bp_notifications_get_unread_notification_count( $user_id = 0 ) {
+
+        // Default to displayed user if no ID is passed
+        if ( empty( $user_id ) ) {
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
+        }
+
+        // Get the notifications, and count them
+        $notifications = BP_Notifications_Notification::get_unread_for_user( $user_id );
+        $count         = !empty( $notifications ) ? count( $notifications ) : 0;
+
+        return apply_filters( 'bp_notifications_get_total_notification_count', $count );
+}

new file plugins/buddypress/bp-notifications/bp-notifications-loader.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Member Notifications Loader
+ *
+ * Functions and filters used for member notification
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsLoader
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+class BP_Notifications_Component extends BP_Component {
+
+        /**
+         * Start the notifications component creation process
+         *
+         * @since BuddyPress (1.9)
+         */
+        function __construct() {
+                parent::start(
+                        'notifications',
+                        __( 'Notifications', 'buddypress' ),
+                        BP_PLUGIN_DIR,
+                        array(
+                                'adminbar_myaccount_order' => 100
+                        )
+                );
+        }
+
+        /**
+         * Include files
+         */
+        public function includes( $includes = array() ) {
+                $includes = array(
+                        'classes',
+                        'screens',
+                        'adminbar',
+                        'buddybar',
+                        'template',
+                        'functions',
+                );
+
+                parent::includes( $includes );
+        }
+
+        /**
+         * Setup globals
+         *
+         * The BP_FRIENDS_SLUG constant is deprecated, and only used here for
+         * backwards compatibility.
+         *
+         * @since BuddyPress (1.5)
+         */
+        public function setup_globals( $args = array() ) {
+                $bp = buddypress();
+
+                // Deprecated. Do not use.
+                // Defined conditionally to support unit tests.
+                if ( ! defined( 'BP_NOTIFICATIONS_DB_VERSION' ) ) {
+                        define( 'BP_NOTIFICATIONS_DB_VERSION', '1900' );
+                }
+
+                // Define a slug, if necessary
+                if ( !defined( 'BP_NOTIFICATIONS_SLUG' ) ) {
+                        define( 'BP_NOTIFICATIONS_SLUG', $this->id );
+                }
+
+                // Global tables for the notifications component
+                $global_tables = array(
+                        'table_name' => $bp->table_prefix . 'bp_notifications'
+                );
+
+                // All globals for the notifications component.
+                // Note that global_tables is included in this array.
+                $args = array(
+                        'slug'          => BP_NOTIFICATIONS_SLUG,
+                        'has_directory' => false,
+                        'search_string' => __( 'Search Notifications...', 'buddypress' ),
+                        'global_tables' => $global_tables
+                );
+
+                parent::setup_globals( $args );
+        }
+
+        /**
+         * Setup BuddyBar navigation
+         */
+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+                $bp = buddypress();
+
+                // Add 'Notifications' to the main navigation
+                $count    = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() );
+                $main_nav = array(
+                        'name'                => sprintf( __( 'Notifications <span>%d</span>', 'buddypress' ), number_format_i18n( $count ) ),
+                        'slug'                => $this->slug,
+                        'position'            => 60,
+                        'screen_function'     => 'bp_notifications_screen_unread',
+                        'default_subnav_slug' => 'unread',
+                        'item_css_id'         => $this->id
+                );
+
+                // Determine user to use
+                if ( bp_displayed_user_domain() ) {
+                        $user_domain = bp_displayed_user_domain();
+                } elseif ( bp_loggedin_user_domain() ) {
+                        $user_domain = bp_loggedin_user_domain();
+                } else {
+                        return;
+                }
+
+                $notifications_link = trailingslashit( $user_domain . bp_get_notifications_slug() );
+
+                // Add the subnav items to the notifications nav item
+                $sub_nav[] = array(
+                        'name'            => __( 'Unread', 'buddypress' ),
+                        'slug'            => 'unread',
+                        'parent_url'      => $notifications_link,
+                        'parent_slug'     => bp_get_notifications_slug(),
+                        'screen_function' => 'bp_notifications_screen_unread',
+                        'position'        => 10,
+                        'item_css_id'     => 'notifications-my-notifications'
+                );
+
+                $sub_nav[] = array(
+                        'name'            => __( 'Read',   'buddypress' ),
+                        'slug'            => 'read',
+                        'parent_url'      => $notifications_link,
+                        'parent_slug'     => bp_get_notifications_slug(),
+                        'screen_function' => 'bp_notifications_screen_read',
+                        'position'        => 20,
+                        'user_has_access' => bp_core_can_edit_settings()
+                );
+
+                parent::setup_nav( $main_nav, $sub_nav );
+        }
+
+        /**
+         * Set up the Toolbar
+         */
+        public function setup_admin_bar( $wp_admin_nav = array() ) {
+                $bp = buddypress();
+
+                // Menus for logged in user
+                if ( is_user_logged_in() ) {
+
+                        // Setup the logged in user variables
+                        $user_domain        = bp_loggedin_user_domain();
+                        $notifications_link = trailingslashit( $user_domain . $this->slug );
+
+                        // Pending notification requests
+                        $count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() );
+                        if ( !empty( $count ) ) {
+                                $unread = sprintf( __( 'Notifications <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
+                        } else {
+                                $unread = __( 'Notifications', 'buddypress' );
+                        }
+
+                        // Add the "My Account" sub menus
+                        $wp_admin_nav[] = array(
+                                'parent' => $bp->my_account_menu_id,
+                                'id'     => 'my-account-' . $this->id,
+                                'title'  => $unread,
+                                'href'   => trailingslashit( $notifications_link )
+                        );
+
+                        // Unread
+                        $wp_admin_nav[] = array(
+                                'parent' => 'my-account-' . $this->id,
+                                'id'     => 'my-account-' . $this->id . '-unread',
+                                'title'  => __( 'Unread', 'buddypress' ),
+                                'href'   => trailingslashit( $notifications_link )
+                        );
+
+                        // Read
+                        $wp_admin_nav[] = array(
+                                'parent' => 'my-account-' . $this->id,
+                                'id'     => 'my-account-' . $this->id . '-read',
+                                'title'  => __( 'Read', 'buddypress' ),
+                                'href'   => trailingslashit( $notifications_link . 'read' )
+                        );
+                }
+
+                parent::setup_admin_bar( $wp_admin_nav );
+        }
+
+        /**
+         * Sets up the title for pages and <title>
+         */
+        function setup_title() {
+                $bp = buddypress();
+
+                // Adjust title
+                if ( bp_is_notifications_component() ) {
+                        if ( bp_is_my_profile() ) {
+                                $bp->bp_options_title = __( 'Friendships', 'buddypress' );
+                        } else {
+                                $bp->bp_options_avatar = bp_core_fetch_avatar( array(
+                                        'item_id' => bp_displayed_user_id(),
+                                        'type'    => 'thumb',
+                                        'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
+                                ) );
+                                $bp->bp_options_title = bp_get_displayed_user_fullname();
+                        }
+                }
+
+                parent::setup_title();
+        }
+}
+
+function bp_setup_notifications() {
+        buddypress()->notifications = new BP_Notifications_Component();
+}
+add_action( 'bp_setup_components', 'bp_setup_notifications', 6 );

new file plugins/buddypress/bp-notifications/bp-notifications-screens.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Notifications Screen Functions
+ *
+ * Screen functions are the controllers of BuddyPress. They will execute when their
+ * specific URL is caught. They will first save or manipulate data using business
+ * functions, then pass on the user to a template file.
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsScreens
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+function bp_notifications_screen_unread() {
+        do_action( 'bp_notifications_screen_unread' );
+
+        bp_core_load_template( apply_filters( 'bp_notifications_template_unread', 'members/single/home' ) );
+}
+
+function bp_notifications_screen_read() {
+        do_action( 'bp_notifications_screen_read' );
+
+        bp_core_load_template( apply_filters( 'bp_notifications_template_read', 'members/single/home' ) );
+}
+
+function bp_notifications_screen_settings() {
+
+}

new file plugins/buddypress/bp-notifications/bp-notifications-template.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Notifications Template Functions
+ *
+ * @package BuddyPress
+ * @subpackage TonificationsTemplate
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Output the notifications component slug
+ *
+ * @package BuddyPress
+ * @subpackage Notifications Template
+ * @since BuddyPress (1.9)
+ *
+ * @uses bp_get_notifications_slug()
+ */
+function bp_notifications_slug() {
+        echo bp_get_notifications_slug();
+}
+        /**
+         * Return the notifications component slug
+         *
+         * @package BuddyPress
+         * @subpackage Notifications Template
+         * @since BuddyPress (1.9)
+         */
+        function bp_get_notifications_slug() {
+                return apply_filters( 'bp_get_notifications_slug', buddypress()->notifications->slug );
+        }
+
+/**
+ * Output the notifications component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Notifications Template
+ * @since BuddyPress (1.9)
+ *
+ * @uses bp_get_notifications_root_slug()
+ */
+function bp_notifications_root_slug() {
+        echo bp_get_notifications_root_slug();
+}
+        /**
+         * Return the notifications component root slug
+         *
+         * @package BuddyPress
+         * @subpackage Notifications Template
+         * @since BuddyPress (1.9)
+         */
+        function bp_get_notifications_root_slug() {
+                return apply_filters( 'bp_get_notifications_root_slug', buddypress()->notifications->root_slug );
+        }
+
+/** Main Loop *****************************************************************/
+        
+/**
+ * Message Box Template Class
+ */
+class BP_Notifications_Template {
+        var $current_notification = -1;
+        var $current_notification_count;
+        var $total_notification_count;
+        var $notifications;
+        var $notification;
+
+        var $in_the_loop;
+        var $user_id;
+
+        var $pag_page;
+        var $pag_num;
+        var $pag_links;
+        var $search_terms;
+
+        public function __construct( $user_id, $is_new = 1, $per_page = 25, $max = null, $search_terms = '', $page_arg = 'npage' ) {
+                
+                // Setup variables
+                $this->pag_page     = isset( $_GET[$page_arg] ) ? intval( $_GET[$page_arg] ) : 1;
+                $this->pag_num      = isset( $_GET['num'] )     ? intval( $_GET['num'] )     : $per_page;
+                $this->user_id      = $user_id;
+                $this->is_new       = $is_new;
+                $this->search_terms = $search_terms;
+
+                // Get the notifications
+                $notifications      = BP_Notifications_Notification::get_current_notifications_for_user( $this->user_id, $this->is_new, $max, $this->pag_num, $this->search_terms );
+
+                // Setup the notifications to loop through
+                $this->notifications            = $notifications['notifications'];
+                $this->total_notification_count = count( $notifications['total'] );
+
+                if ( empty( $this->notifications ) ) {
+                        $this->notification_count       = 0;
+                        $this->total_notification_count = 0;
+
+                } else {
+                        if ( !empty( $max ) ) {
+                                if ( $max >= count( $this->notifications ) ) {
+                                        $this->notification_count = count( $this->notifications );
+                                } else {
+                                        $this->notification_count = (int) $max;
+                                }
+                        } else {
+                                $this->notification_count = count( $this->notifications );
+                        }
+                }
+
+                if ( (int) $this->total_notification_count && (int) $this->pag_num ) {
+                        $this->pag_links = paginate_links( array(
+                                'base'      => add_query_arg( $page_arg, '%#%' ),
+                                'format'    => '',
+                                'total'     => ceil( (int) $this->total_notification_count / (int) $this->pag_num ),
+                                'current'   => $this->pag_page,
+                                'prev_text' => _x( '&larr;', 'Notifications pagination previous text', 'buddypress' ),
+                                'next_text' => _x( '&rarr;', 'Notifications pagination next text',     'buddypress' ),
+                                'mid_size'  => 1
+                        ) );
+                }
+        }
+
+        public function has_notifications() {
+                if ( $this->notification_count ) {
+                        return true;
+                }
+
+                return false;
+        }
+
+        public function next_notification() {
+
+                $this->current_notification++;
+
+                $this->notification = $this->notifications[ $this->current_notification ];
+
+                return $this->notification;
+        }
+
+        public function rewind_notifications() {
+
+                $this->current_notification = -1;
+
+                if ( $this->notification_count > 0 ) {
+                        $this->notification = $this->notifications[0];
+                }
+        }
+
+        public function notifications() {
+
+                if ( $this->current_notification + 1 < $this->notification_count ) {
+                        return true;
+
+                } elseif ( $this->current_notification + 1 == $this->notification_count ) {
+                        do_action( 'notifications_loop_end');
+
+                        $this->rewind_notifications();
+                }
+
+                $this->in_the_loop = false;
+                return false;
+        }
+
+        public function the_notification() {
+                $this->in_the_loop  = true;
+                $this->notification = $this->next_notification();
+
+                // loop has just started
+                if ( 0 === $this->current_notification ) {
+                        do_action( 'notifications_loop_start' );
+                }
+        }
+}
+
+
+function bp_has_notifications( $args = '' ) {
+
+        // Get the default is_new argument
+        if ( bp_is_current_action( 'unread' ) ) {
+                $is_new = 1;
+        } elseif ( bp_is_current_action( 'read' ) ) {
+                $is_new = 0;
+        }
+
+        // Parse the args
+        $r = wp_parse_args( $args, array(
+                'user_id'      => bp_loggedin_user_id(),
+                'is_new'       => $is_new,
+                'per_page'     => 25,
+                'max'          => false,
+                'search_terms' => isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '',
+                'page_arg'     => 'npage'
+        ) );
+
+        // Get the notifications
+        $query_loop = new BP_Notifications_Template( $r['user_id'], $r['is_new'], $r['per_page'], $r['max'], $r['search_terms'], $r['page_arg'] );
+
+        // Setup the global query loop
+        buddypress()->notifications->query_loop = $query_loop;
+
+        return apply_filters( 'bp_has_notificationss', $query_loop->has_notifications(), $query_loop );
+}
+
+function bp_the_notifications() {
+        return buddypress()->notifications->query_loop->notifications();
+}
+
+function bp_the_notification() {
+        return buddypress()->notifications->query_loop->the_notification();
+}
+
+function bp_the_notification_id() {
+        echo bp_get_the_notification_id();
+}
+        function bp_get_the_notification_id() {
+                return apply_filters( 'bp_get_the_notification_id', buddypress()->notifications->query_loop->notification->id );
+        }
+
+function bp_the_notification_item_id() {
+        echo bp_get_the_notification_item_id();
+}
+        function bp_get_the_notification_item_id() {
+                return apply_filters( 'bp_get_the_notification_item_id', stripslashes_deep( buddypress()->notifications->query_loop->notification->item_id ) );
+        }
+
+function bp_the_notification_secondary_item_id() {
+        echo bp_get_the_notification_secondary_item_id();
+}
+        function bp_get_the_notification_secondary_item_id() {
+                return apply_filters( 'bp_get_the_notification_secondary_item_id', stripslashes_deep( buddypress()->notifications->query_loop->notification->secondary_item_id ) );
+        }
+
+function bp_the_notification_component_name() {
+        echo bp_get_the_notification_component_name();
+}
+        function bp_get_the_notification_component_name() {
+                return apply_filters( 'bp_get_the_notification_component_name', stripslashes_deep( buddypress()->notifications->query_loop->notification->component_name ) );
+        }
+
+function bp_the_notification_component_action() {
+        echo bp_get_the_notification_component_action();
+}
+        function bp_get_the_notification_component_action() {
+                return apply_filters( 'bp_get_the_notification_component_action', stripslashes_deep( buddypress()->notifications->query_loop->notification->component_action ) );
+        }
+
+function bp_the_notification_date_notified() {
+        echo bp_get_the_notification_date_notified();
+}
+        function bp_get_the_notification_date_notified() {
+                return apply_filters( 'bp_get_the_notification_date_notified', stripslashes_deep( buddypress()->notifications->query_loop->notification->date_notified ) );
+        }

plugins/buddypress/bp-templates/bp-legacy/buddypress/members/single/home.php

@@ -45 +45 @@
                 elseif ( bp_is_user_forums() ) :
                         bp_get_template_part( 'members/single/forums'   );
 
+                elseif ( bp_is_user_notifications() ) :
+                        bp_get_template_part( 'members/single/notifications' );
+
                 elseif ( bp_is_user_settings() ) :
                         bp_get_template_part( 'members/single/settings' );
 

new file plugins/buddypress/bp-templates/bp-legacy/buddypress/members/single/notifications.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress - Users Notifications
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+?>
+
+<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
+        <ul>
+                <?php if ( bp_is_my_profile() ) bp_get_options_nav(); ?>
+
+                <li id="members-order-select" class="last filter">
+
+                        <label for="members-friends"><?php _e( 'Order By:', 'buddypress' ); ?></label>
+                        <select id="members-friends">
+                                <option value="newest"><?php _e( 'Newest First', 'buddypress' ); ?></option>
+                                <option value="oldest"><?php _e( 'Oldest First', 'buddypress' ); ?></option>
+                        </select>
+                </li>
+        </ul>
+</div>
+
+<?php
+switch ( bp_current_action() ) :
+
+        // Unread
+        case 'unread' :
+                bp_get_template_part( 'members/single/notifications/unread' );
+                break;
+
+        // Read
+        case 'read' :
+                bp_get_template_part( 'members/single/notifications/read' );
+                break;
+
+        // Any other
+        default :
+                bp_get_template_part( 'members/single/plugins' );
+                break;
+endswitch;

new file plugins/buddypress/bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php

@@ +1 @@
+<?php while ( bp_the_notifications() ) : bp_the_notification(); ?>
+
+        <tr>
+                <td></td>
+                <td><?php bp_the_notification_component_action(); ?></td>
+                <td><?php echo bp_core_get_userlink( bp_get_the_notification_item_id() ); ?></td>
+                <td><?php echo bp_core_time_since( bp_get_the_notification_date_notified() ); ?></td>
+        </tr>
+
+<?php endwhile;

new file plugins/buddypress/bp-templates/bp-legacy/buddypress/members/single/notifications/read.php

@@ +1 @@
+<?php if ( bp_has_notifications() ) : ?>
+
+        <table class="notification-settings">
+                <thead>
+                        <tr>
+                                <th class="icon"></th>
+                                <th class="title"><?php _e( 'Notification', 'buddypress' ) ?></th>
+                                <th class="title"><?php _e( 'Member',       'buddypress' ) ?></th>
+                                <th class="date"><?php _e( 'Date Received', 'buddypress' ) ?></th>
+                        </tr>
+                </thead>
+
+                <tbody>
+                        <?php bp_get_template_part( 'members/single/notifications/notifications-loop' ); ?>
+                </tbody>
+        </table>
+
+<?php else : ?>
+
+        <div id="message" class="info">
+                <p><?php _e( 'You have no notifications.', 'buddypress' ); ?></p>
+        </div>
+
+<?php endif;
+ No newline at end of file

new file plugins/buddypress/bp-templates/bp-legacy/buddypress/members/single/notifications/unread.php

@@ +1 @@
+<?php if ( bp_has_notifications() ) : ?>
+
+        <table class="notification-settings">
+                <thead>
+                        <tr>
+                                <th class="icon"></th>
+                                <th class="title"><?php _e( 'Notification', 'buddypress' ) ?></th>
+                                <th class="title"><?php _e( 'Member',        'buddypress' ) ?></th>
+                                <th class="date"><?php _e( 'Date Received', 'buddypress' ) ?></th>
+                        </tr>
+                </thead>
+
+                <tbody>
+                        <?php bp_get_template_part( 'members/single/notifications/notifications-loop' ); ?>
+                </tbody>
+        </table>
+
+<?php else : ?>
+
+        <div id="message" class="info">
+                <p><?php _e( 'You have no new notifications.', 'buddypress' ); ?></p>
+        </div>
+
+<?php endif;
+ No newline at end of file