Ticket #5148: 5148.02.patch

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' )

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'] ) )

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 {
 
         /**

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' ) );
@@ -177 +177 @@
                 $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
+                // Notifications table. Included here for legacy purposes. Use
+                // bp-notifications instead.
                 $bp->core->table_name_notifications = $bp->table_prefix . 'bp_notifications';
 
                 /**

bp-core/bp-core-template.php

@@ -1435 +1435 @@
 }
 
 /**
+ * Check whether the current page is part of the Notifications component.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @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.
@@ -1749 +1764 @@
 }
 
 /**
+ * Is this a user's notifications page?
+ *
+ * Eg http://example.com/members/joe/notifications/ (or a subpage thereof).
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @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).

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' );

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 ) {

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 );
 

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 );
 

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 notifications.
+ * Use bp-notifications instead.
  *
  * @package BuddyPress
  * @subpackage MembersNotifications
@@ -26 +27 @@
  */
 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();
-
-        $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;
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
+                return false;
+        }
 
-        return false;
+        return bp_notifications_add_notification( $item_id, $user_id, $component_name, $component_action, $secondary_item_id = 0, $date_notified = false );
 }
 
 /**
@@ -54 +43 @@
  * @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 ) )
+
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
                 return false;
+        }
 
-        return BP_Core_Notification::delete( $id );
+        return bp_notifications_delete_notification( $id );
 }
 
 /**
@@ -68 +60 @@
  * @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 +79 @@
  * @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 +103 @@
  * @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 +125 @@
  * @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 +146 @@
  * @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 +167 @@
  * @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 +187 @@
  * @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 ) )
+
+        // Bail if notifications is not active
+        if ( ! bp_is_active( 'notifications' ) ) {
                 return false;
+        }
 
-        return true;
+        return bp_notifications_check_notification_access( $user_id, $notification_id );
 }

new file p-notifications/bp-notifications-adminbar.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Notifications Admin Bar functions.
+ *
+ * Admin Bar functions for the Notifications component.
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsToolbar
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Build the "Notifications" dropdown.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+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 );

new file p-notifications/bp-notifications-buddybar.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Notifications Navigational Functions.
+ *
+ * Sets up navigation elements, including BuddyBar functionality, for the
+ * Notifications component.
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsBuddyBar
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Create the Notifications menu for the BuddyBar.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+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
+        endif;
+
+        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 );

new file p-notifications/bp-notifications-classes.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Notifications Classes
+ *
+ * Classes used for the Notifications component.
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsClasses
+ *
+ * @since BuddyPress (1.9.0)
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * BuddyPress Notification items.
+ *
+ * Use this class to create, access, edit, or delete BuddyPress Notifications.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+class BP_Notifications_Notification {
+
+        /**
+         * The notification ID.
+         *
+         * @var int
+         */
+        public $id;
+
+        /**
+         * The ID of the item associated with the notification.
+         *
+         * @var int
+         */
+        public $item_id;
+
+        /**
+         * The ID of the secondary item associated with the notification.
+         *
+         * @var int
+         */
+        public $secondary_item_id = null;
+
+        /**
+         * The ID of the user the notification is associated with.
+         *
+         * @var int
+         */
+        public $user_id;
+
+        /**
+         * The name of the component that the notification is for.
+         *
+         * @var string
+         */
+        public $component_name;
+
+        /**
+         * The component action 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 bool
+         */
+        public $is_new;
+
+        /** Public Methods ****************************************************/
+
+        /**
+         * Constructor method.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param int $id Optional. Provide an ID to access an existing
+         *        notification item.
+         */
+        public function __construct( $id = 0 ) {
+                if ( ! empty( $id ) ) {
+                        $this->id = $id;
+                        $this->populate();
+                }
+        }
+
+        /**
+         * Update or insert notification details into the database.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @global wpdb $wpdb WordPress database object.
+         *
+         * @return bool True on success, false on 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, array( 'ID' => $this->id ), $data_format, 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   = $wpdb->insert_id;
+                }
+
+                // Return the result
+                return $retval;
+        }
+
+        /**
+         * Fetch data for an existing notification from the database.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @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;
+                }
+        }
+
+        /** Protected Static Methods ******************************************/
+
+        /**
+         * Create a notification entry.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param array $data {
+         *     Array of notification data, passed to {@link wpdb::insert()}.
+         *     @type int $user_id ID of the associated user.
+         *     @type int $item_id ID of the associated item.
+         *     @type int $secondary_item_id ID of the secondary associated item.
+         *     @type string $component_name Name of the associated component.
+         *     @type string $component_action Name of the associated component
+         *           action.
+         *     @type string $date_notified Timestamp of the notification.
+         *     @type bool $is_new True if the notification is unread, otherwise
+         *           false.
+         * }
+         * @param array $data_format See {@link wpdb::insert()}.
+         * @return int|false The number of rows inserted, or false on error.
+         */
+        protected static function _insert( $data = array(), $data_format = array() ) {
+                global $wpdb;
+                return $wpdb->insert( buddypress()->notifications->table_name, $data, $data_format );
+        }
+
+        /**
+         * Update notifications.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see wpdb::update() for further description of paramater formats.
+         *
+         * @param array $data Array of notification data to update, passed to
+         *        {@link wpdb::update()}. Accepts any property of a
+         *        BP_Notification_Notification object.
+         * @param array $where The WHERE params as passed to wpdb::update().
+         *        Typically consists of array( 'ID' => $id ) to specify the ID
+         *        of the item being updated. See {@link wpdb::update()}.
+         * @param array $data_format See {@link wpdb::insert()}.
+         * @param array $where_format See {@link wpdb::insert()}.
+         * @return int|false The number of rows updated, or false on error.
+         */
+        protected static function _update( $data = array(), $where = array(), $data_format = array(), $where_format = array() ) {
+                global $wpdb;
+                return $wpdb->update( buddypress()->notifications->table_name, $data, $where, $data_format, $where_format );
+        }
+
+        /**
+         * Delete notifications.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see wpdb::update() for further description of paramater formats.
+         *
+         * @param array $where Array of WHERE clauses to filter by, passed to
+         *        {@link wpdb::delete()}. Accepts any property of a
+         *        BP_Notification_Notification object.
+         * @param array $where_format See {@link wpdb::insert()}.
+         * @return int|false The number of rows updated, or false on error.
+         */
+        protected static function _delete( $where = array(), $where_format = array() ) {
+                global $wpdb;
+                return $wpdb->delete( buddypress()->notifications->table_name, $where, $where_format );
+        }
+
+        /**
+         * Assemble the WHERE clause of a get() SQL statement.
+         *
+         * Used by BP_Notifications_Notification::get() to create its WHERE
+         * clause.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param array $args See {@link BP_Notifications_Notification::get()}
+         *        for more details.
+         * @return string WHERE clause.
+         */
+        protected static function get_where_sql( $args = array() ) {
+                global $wpdb;
+
+                $where_conditions = array();
+
+                // id
+                if ( ! empty( $args['id'] ) ) {
+                        $id_in = implode( ',', wp_parse_id_list( $args['id'] ) );
+                        $where_conditions['id'] = "id IN ({$id_in})";
+                }
+
+                // user_id
+                if ( ! empty( $args['user_id'] ) ) {
+                        $user_id_in = implode( ',', wp_parse_id_list( $args['user_id'] ) );
+                        $where_conditions['user_id'] = "user_id IN ({$user_id_in})";
+                }
+
+                // item_id
+                if ( ! empty( $args['item_id'] ) ) {
+                        $item_id_in = implode( ',', wp_parse_id_list( $args['item_id'] ) );
+                        $where_conditions['item_id'] = "item_id IN ({$item_id_in})";
+                }
+
+                // secondary_item_id
+                if ( ! empty( $args['secondary_item_id'] ) ) {
+                        $secondary_item_id_in = implode( ',', wp_parse_id_list( $args['secondary_item_id'] ) );
+                        $where_conditions['secondary_item_id'] = "secondary_item_id IN ({$secondary_item_id_in})";
+                }
+
+                // component_name
+                if ( ! empty( $args['component_name'] ) ) {
+                        if ( ! is_array( $args['component_name'] ) ) {
+                                $component_names = explode( ',', $args['component_name'] );
+                        } else {
+                                $component_names = $args['component_name'];
+                        }
+
+                        $cn_clean = array();
+                        foreach ( $component_names as $cn ) {
+                                $cn_clean[] = $wpdb->prepare( '%s', $cn );
+                        }
+
+                        $cn_in = implode( ',', $cn_clean );
+                        $where_conditions['component_name'] = "component_name IN ({$cn_in})";
+                }
+
+                // component_action
+                if ( ! empty( $args['component_action'] ) ) {
+                        if ( ! is_array( $args['component_action'] ) ) {
+                                $component_actions = explode( ',', $args['component_action'] );
+                        } else {
+                                $component_actions = $args['component_action'];
+                        }
+
+                        $ca_clean = array();
+                        foreach ( $component_actions as $ca ) {
+                                $ca_clean[] = $wpdb->prepare( '%s', $ca );
+                        }
+
+                        $ca_in = implode( ',', $ca_clean );
+                        $where_conditions['component_action'] = "component_action IN ({$ca_in})";
+                }
+
+                // is_new
+                if ( ! empty( $args['is_new'] ) ) {
+                        $where_conditions['is_new'] = "is_new = 1";
+                }
+
+                // search_terms
+                if ( ! empty( $args['search_terms'] ) ) {
+                        $search_terms = like_escape( esc_sql( $args['search_terms'] ) );
+                        $where_conditions['search_terms'] = "( component_name LIKE '%%$search_terms%%' OR component_action LIKE '%%$search_terms%%' )";
+                }
+
+                if ( ! empty( $where_conditions ) ) {
+                        $where = 'WHERE ' . implode( ' AND ', $where_conditions );
+                } else {
+                        $where = '';
+                }
+
+                return $where;
+        }
+
+        /**
+         * Assemble query clauses, based on arrguments, to pass to $wpdb methods.
+         *
+         * The insert(), update(), and delete() methods of {@link wpdb} expect
+         * arguments of the following forms:
+         *
+         * - associative arrays whose key/value pairs are column => value, to
+         *   be used in WHERE, SET, or VALUES clauses
+         * - arrays of "formats", which tell $wpdb->prepare() which type of
+         *   value to expect when sanitizing (eg, array( '%s', '%d' ))
+         *
+         * This utility method can be used to assemble both kinds of params,
+         * out of a single set of associative array arguments, such as:
+         *
+         *     $args = array(
+         *         'user_id' => 4,
+         *         'component_name' => 'groups',
+         *     );
+         *
+         * This will be converted to:
+         *
+         *     array(
+         *         'data' => array(
+         *             'user_id' => 4,
+         *             'component_name' => 'groups',
+         *         ),
+         *         'format' => array(
+         *             '%d',
+         *             '%s',
+         *         ),
+         *     )
+         *
+         * which can easily be passed as arguments to the $wpdb methods.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param $args Associative array of filter arguments.
+         *        See {@BP_Notifications_Notification::get()} for a breakdown.
+         * @return array Associative array of 'data' and 'format' args.
+         */
+        protected static function get_query_clauses( $args = array() ) {
+                $where_clauses = array(
+                        'data'   => array(),
+                        'format' => array(),
+                );
+
+                // id
+                if ( ! empty( $args['id'] ) ) {
+                        $where_clauses['data']['id'] = absint( $args['id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // user_id
+                if ( ! empty( $args['user_id'] ) ) {
+                        $where_clauses['data']['user_id'] = absint( $args['user_id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // item_id
+                if ( ! empty( $args['item_id'] ) ) {
+                        $where_clauses['data']['item_id'] = absint( $args['item_id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // secondary_item_id
+                if ( ! empty( $args['secondary_item_id'] ) ) {
+                        $where_clauses['data']['secondary_item_id'] = absint( $args['secondary_item_id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // component_name
+                if ( ! empty( $args['component_name'] ) ) {
+                        $where_clauses['data']['component_name'] = $args['component_name'];
+                        $where_clauses['format'][] = '%s';
+                }
+
+                // component_action
+                if ( ! empty( $args['component_action'] ) ) {
+                        $where_clauses['data']['component_action'] = $args['component_action'];
+                        $where_clauses['format'][] = '%s';
+                }
+
+                // is_new
+                if ( isset( $args['is_new'] ) ) {
+                        $where_clauses['data']['is_new'] = ! empty( $args['is_new'] ) ? 1 : 0;
+                        $where_clauses['format'][] = '%d';
+                }
+
+                return $where_clauses;
+        }
+
+        /** Public Static Methods *********************************************/
+
+        /**
+         * Check that a specific notification is for a specific user.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param int $user_id ID of the user being checked.
+         * @param int $notification_id ID of the notification being checked.
+         * @return bool True if the notification belongs to the user, otherwise
+         *         false.
+         */
+        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 ) );
+        }
+
+        /**
+         * Get notifications, based on provided filter parameters.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param array $args {
+         *     Associative array of arguments. All arguments but $page and
+         *     $per_page can be treated as filter values for get_where_sql()
+         *     and get_query_clauses(). All items are optional.
+         *     @type int|array $id ID of notification being updated. Can be an
+         *           array of IDs.
+         *     @type int|array $user_id ID of user being queried. Can be an
+         *           array of user IDs.
+         *     @type int|array $item_id ID of associated item. Can be an array
+         *           of multiple item IDs.
+         *     @type int|array $secondary_item_id ID of secondary associated
+         *           item. Can be an array of multiple IDs.
+         *     @type string|array $component_name Name of the component to
+         *           filter by. Can be an array of component names.
+         *     @type string|array $component_action Name of the action to
+         *           filter by. Can be an array of actions.
+         *     @type bool $is_new Whether to limit the query to is_new (unread)
+         *           notifications. Default: true.
+         *     @type string $search_terms Term to match against component_name
+         *           or component_action fields.
+         *     @type int $page Number of the current page of results. Default:
+         *           false (no pagination - all items).
+         *     @type int $per_page Number of items to show per page. Default:
+         *           false (no pagination - all items).
+         * }
+         * @return array Located notifications.
+         */
+        public static function get( $args = array() ) {
+                global $wpdb;
+
+                $r = wp_parse_args( $args, array(
+                        'id'                => false,
+                        'user_id'           => false,
+                        'item_id'           => false,
+                        'secondary_item_id' => false,
+                        'component_name'    => false,
+                        'component_action'  => false,
+                        'is_new'            => true,
+                        'search_terms'      => '',
+                        'page'              => false,
+                        'per_page'          => false,
+                ) );
+
+                $bp = buddypress();
+
+                $select_sql = "SELECT *";
+                $from_sql   = "FROM {$bp->notifications->table_name}";
+
+                $where_args = array(
+                        'id'                => $r['id'],
+                        'user_id'           => $r['user_id'],
+                        'item_id'           => $r['item_id'],
+                        'secondary_item_id' => $r['secondary_item_id'],
+                        'component_name'    => $r['component_name'],
+                        'component_action'  => $r['component_action'],
+                        'is_new'            => $r['is_new'],
+                        'search_terms'      => $r['search_terms'],
+                );
+
+                $where_sql = self::get_where_sql( $where_args );
+
+                $pag_sql = '';
+                if ( ! empty( $r['page'] ) && ! empty( $r['per_page'] ) ) {
+                        $page     = absint( $r['page'] );
+                        $per_page = absint( $r['per_page'] );
+                        $offset   = $per_page * ( $page - 1 );
+                        $pag_sql = $wpdb->prepare( "LIMIT %d, %d", $offset, $per_page );
+                }
+
+                $sql = "{$select_sql} {$from_sql} {$where_sql} {$pag_sql}";
+
+                return $wpdb->get_results( $sql );
+        }
+
+        /**
+         * Get a count of total notifications matching a set of arguments.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see BP_Notifications_Notification::get() for a description of
+         *      arguments.
+         *
+         * @param array $args See {@link BP_Notifications_Notification::get()}.
+         * @return int Count of located items.
+         */
+        public static function get_total_count( $args ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                $select_sql = "SELECT COUNT(*)";
+                $from_sql   = "FROM {$bp->notifications->table_name}";
+                $where_sql  = self::get_where_sql( $args );
+
+                $sql = "{$select_sql} {$from_sql} {$where_sql}";
+
+                return $wpdb->get_var( $sql );
+        }
+
+        /**
+         * Update notifications.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see BP_Notifications_Notification::get() for a description of
+         *      accepted update/where arguments.
+         *
+         * @param array $update_args Associative array of fields to update,
+         *        and the values to update them to. Of the format
+         *            array( 'user_id' => 4, 'component_name' => 'groups', )
+         * @param array $where_args Associative array of columns/values, to
+         *        determine which rows should be updated. Of the format
+         *            array( 'item_id' => 7, 'component_action' => 'members', )
+         * @return int|bool Number of rows updated on success, false on failure.
+         */
+        public static function update( $update_args = array(), $where_args = array() ) {
+                $update = self::get_query_clauses( $update_args );
+                $where  = self::get_query_clauses( $where_args );
+
+                return self::_update( $update['data'], $where['data'], $update['format'], $where['format'] );
+        }
+
+        /**
+         * Delete notifications.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see BP_Notifications_Notification::get() for a description of
+         *      accepted update/where arguments.
+         *
+         * @param array $args Associative array of columns/values, to determine
+         *        which rows should be deleted.  Of the format
+         *            array( 'item_id' => 7, 'component_action' => 'members', )
+         * @return int|bool Number of rows deleted on success, false on failure.
+         */
+        public static function delete( $args = array() ) {
+                $where = self::get_query_clauses( $args );
+
+                return self::_delete( $where['data'], $where['format'] );
+        }
+
+
+        /** Convenience methods **********************************************/
+
+        /**
+         * Delete a single notification by ID.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see BP_Notifications_Notification::delete() for explanation of
+         *      return value.
+         *
+         * @param int $id ID of the notification item to be deleted.
+         * @return bool True on success, false on failure.
+         */
+        public static function delete_by_id( $id ) {
+                return self::delete( array(
+                        'id' => $id,
+                ) );
+        }
+
+        /**
+         * Fetch all the notifications in the database for a specific user.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param int $user_id ID of the user whose notifications are being
+         *        fetched.
+         * @param string $status Optional. Status of notifications to fetch.
+         *        'is_new' to get only unread items, 'all' to get all.
+         * @return array Associative array of notification items.
+         */
+        public static function get_all_for_user( $user_id, $status = 'is_new' ) {
+                $args = array(
+                        'user_id' => $user_id,
+                        'is_new'  => 'is_new' === $status,
+                );
+                return self::get( $args );
+        }
+
+        /**
+         * Fetch all the unread notifications in the database for a specific user.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param int $user_id ID of the user whose notifications are being
+         *        fetched.
+         * @return array Associative array of unread notification items.
+         */
+        public static function get_unread_for_user( $user_id = 0 ) {
+                $args = array(
+                        'user_id' => $user_id,
+                        'is_new'  => true,
+                );
+                return self::get( $args );
+        }
+
+        /**
+         * Fetch all the read notifications in the database for a specific user.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param int $user_id ID of the user whose notifications are being
+         *        fetched.
+         * @return array Associative array of unread notification items.
+         */
+        public static function get_read_for_user( $user_id = 0 ) {
+                $args = array(
+                        'user_id' => $user_id,
+                        'is_new'  => false,
+                );
+                return self::get( $args );
+        }
+
+        /**
+         * Get unread notifications for a user, in a pagination-friendly format.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param array $args {
+         *     Array of arguments.
+         *     @type int $user_id ID of the user for whom the notifications are
+         *           being fetched. Default: logged-in user ID.
+         *     @type bool $is_new Whether to limit the query to unread
+         *           notifications. Default: true.
+         *     @type int $page Number of the page to return. Default: 1.
+         *     @type int $per_page Number of results to display per page.
+         *           Default: 10.
+         *     @type string $search_terms Optional. A term to search against in
+         *           the 'component_name' and 'component_action' columns.
+         * }
+         * @return array {
+         *     @type array $notifications Array of notification results.
+         *     @type int $total Count of all located notifications matching
+         *           the query params.
+         * }
+         */
+        public static function get_current_notifications_for_user( $args = array() ) {
+                $r = wp_parse_args( $args, array(
+                        'user_id'      => bp_loggedin_user_id(),
+                        'is_new'       => true,
+                        'page'         => 1,
+                        'per_page'     => 10,
+                        'search_terms' => '',
+                ) );
+
+                $notifications = self::get( $r );
+
+                // Bail if no notifications
+                if ( empty( $notifications ) ) {
+                        return false;
+                }
+
+                $total_count = self::get_total_count( $r );
+
+                return array( 'notifications' => &$notifications, 'total' => $total_count );
+        }
+
+        /** Mark Read *************************************************************/
+
+        /**
+         * Mark all user notifications as read.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param int $user_id The ID of the user who the notifications
+         *        are for.
+         * @param int $is_new Mark as read (1) or unread (0).
+         */
+        public static function mark_all_for_user( $user_id, $is_new = 0, $item_id = 0, $component_name = '', $component_action = '', $secondary_item_id = 0 ) {
+
+                // Values to be updated
+                $update_args = array(
+                        'is_new' => $is_new,
+                );
+
+                // WHERE clauses
+                $where_args = array(
+                        'user_id' => $user_id,
+                );
+
+                if ( $component_name ) {
+                        $where_args['component_name'] = $component_name;
+                }
+
+                if ( $component_action ) {
+                        $where_args['component_action'] = $component_action;
+                }
+
+                if ( $secondary_item_id ) {
+                        $where_args['secondary_item_id'] = $secondary_item_id;
+                }
+
+                return self::update( $update_args, $where_args );
+        }
+
+        /**
+         * Mark all notifications from a user as read.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param int $user_id The ID of the user who the notifications are from.
+         * @param int $is_new Mark as read (1) or unread (0).
+         */
+        public static function mark_all_from_user( $user_id, $is_new = 0, $component_name = '', $component_action = '', $secondary_item_id = 0 ) {
+
+                // Values to be updated
+                $update_args = array(
+                        'is_new' => $is_new,
+                );
+
+                // WHERE clauses
+                $where_args = array(
+                        'item_id' => $user_id,
+                );
+
+                if ( $component_name ) {
+                        $where_args['component_name'] = $component_name;
+                }
+
+                if ( $component_action ) {
+                        $where_args['component_action'] = $component_action;
+                }
+
+                if ( $secondary_item_id ) {
+                        $where_args['secondary_item_id'] = $secondary_item_id;
+                }
+
+                return self::update( $update_args, $where_args );
+        }
+
+        /**
+         * 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.0)
+         *
+         * @param int $item_id The ID of the item associated with the
+         *        notifications.
+         * @param string $component_name The component that the notifications
+         *        are associated with.
+         * @param string $component_action The action that the notifications
+         *        are associated with.
+         * @param string $secondary_item_id Optional. ID of the secondary
+         *        associated item.
+         */
+        public static function mark_all_by_type( $item_id, $is_new = 0, $component_name = '', $component_action = '', $secondary_item_id = 0 ) {
+
+                // Values to be updated
+                $update_args = array(
+                        'is_new' => $is_new,
+                );
+
+                // WHERE clauses
+                $where_args = array(
+                        'item_id' => $item_id,
+                );
+
+                if ( $component_name ) {
+                        $where_args['component_name'] = $component_name;
+                }
+
+                if ( $component_action ) {
+                        $where_args['component_action'] = $component_action;
+                }
+
+                if ( $secondary_item_id ) {
+                        $where_args['secondary_item_id'] = $secondary_item_id;
+                }
+
+                return self::update( $update_args, $where_args );
+        }
+}

new file p-notifications/bp-notifications-functions.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Member Notifications Functions.
+ *
+ * Functions and filters used in the Notifications component.
+ *
+ * @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.0)
+ *
+ * @param array $args {
+ *     Array of arguments describing the notification. All are optional.
+ *     @type int $user_id ID of the user to associate the notificiton with.
+ *     @type int $item_id ID of the item to associate the notification with.
+ *     @type int $secondary_item_id ID of the secondary item to associate the
+ *           notification with.
+ *     @type string $component_name Name of the component to associate the
+ *           notification with.
+ *     @type string $component_action Name of the action to associate the
+ *           notification with.
+ *     @type string $date_notified Timestamp for the notification.
+ * }
+ * @return int|bool ID of the newly created notification on success, false
+ *         on failure.
+ */
+function bp_notifications_add_notification( $args = array() ) {
+
+        $r = wp_parse_args( $args, array(
+                'user_id'           => 0,
+                'item_id'           => 0,
+                'secondary_item_id' => 0,
+                'component_name'    => '',
+                'component_action'  => '',
+                'date_notified'     => bp_core_current_time(),
+        ) );
+
+        // Setup the new notification
+        $notification                    = new BP_Notifications_Notification;
+        $notification->user_id           = $r['user_id'];
+        $notification->item_id           = $r['item_id'];
+        $notification->secondary_item_id = $r['secondary_item_id'];
+        $notification->component_name    = $r['component_name'];
+        $notification->component_action  = $r['component_action'];
+        $notification->date_notified     = $r['date_notified'];
+        $notification->is_new            = 1;
+
+        // Save the new notification
+        return $notification->save();
+}
+
+/**
+ * Get a specific notification by its ID.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @param int $id ID of the notification.
+ * @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.0)
+ *
+ * @param int $id ID of the notification to delete.
+ * @return bool True on success, false on failure.
+ */
+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.0)
+ *
+ * @param int $user_id ID of the user whose notification are being fetched.
+ * @param string $format Format of the returned values. 'simple' returns HTML,
+ *        while 'object' returns a structured object for parsing.
+ * @return mixed Object or array on success, false on failure.
+ */
+function bp_notifications_get_notifications_for_user( $user_id, $format = 'simple' ) {
+
+        // Setup local variables
+        $bp                    = buddypress();
+        $notifications         = BP_Notifications_Notification::get( array(
+                'user_id' => $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.0)
+ *
+ * @param int $user_id ID of the user whose notifications are being deleted.
+ * @param string $component_name Name of the associated component.
+ * @param string $component_action Name of the associated action.
+ * @return bool True on success, false on failure.
+ */
+function bp_notifications_delete_notifications_by_type( $user_id, $component_name, $component_action ) {
+        return BP_Notifications_Notification::delete( array(
+                'user_id'          => $user_id,
+                'component_name'   => $component_name,
+                'component_action' => $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.0)
+ *
+ * @param int $user_id ID of the user whose notifications are being deleted.
+ * @param int $item_id ID of the associated item.
+ * @param string $component_name Name of the associated component.
+ * @param string $component_action Name of the associated action.
+ * @param int $secondary_item_id ID of the secondary associated item.
+ * @return bool True on success, false on failure.
+ */
+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( array(
+                'user_id'           => $user_id,
+                'item_id'           => $item_id,
+                'secondary_item_id' => $secondary_item_id,
+                'component_name'    => $component_name,
+                'component_action'  => $component_action,
+        ) );
+}
+
+/**
+ * Delete all notifications by type.
+ *
+ * Used when clearing out notifications for an entire component.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @param int $user_id ID of the user whose notifications are being deleted.
+ * @param string $component_name Name of the associated component.
+ * @param string $component_action Optional. Name of the associated action.
+ * @param int $secondary_item_id Optional. ID of the secondary associated item.
+ * @return bool True on success, false on failure.
+ */
+function bp_notifications_delete_all_notifications_by_type( $item_id, $component_name, $component_action = false, $secondary_item_id = false ) {
+        return BP_Notifications_Notification::delete( array(
+                'item_id'           => $item_id,
+                'secondary_item_id' => $secondary_item_id,
+                'component_name'    => $component_name,
+                'component_action'  => $component_action,
+        ) );
+}
+
+/**
+ * Delete all notifications from a user.
+ *
+ * Used when clearing out all notifications for a user, when deleted or spammed.
+ *
+ * @todo This function assumes that items with the user_id in the item_id slot
+ *       are associated with that user. However, this will only be true with
+ *       certain components (such as Friends). Use with caution!
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @param int $user_id ID of the user whose associated items are beind deleted.
+ * @param string $component_name Name of the associated component.
+ * @param string $component_action Name of the associated action.
+ * @return bool True on success, false on failure.
+ */
+function bp_notifications_delete_notifications_from_user( $user_id, $component_name, $component_action ) {
+        return BP_Notifications_Notification::delete( array(
+                'item_id'           => $user_id,
+                'component_name'    => $component_name,
+                'component_action'  => $component_action,
+        ) );
+}
+
+/**
+ * Check if a user has access to a specific notification.
+ *
+ * Used before deleting a notification for a user.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @param int $user_id ID of the user being checked.
+ * @param int $notification_id ID of the notification being checked.
+ * @return bool True if the notification belongs to the user, otherwise false.
+ */
+function bp_notifications_check_notification_access( $user_id, $notification_id ) {
+        return (bool) BP_Notifications_Notification::check_access( $user_id, $notification_id );
+}
+
+/**
+ * Get a count of unread notification items for a user.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @param int $user_id ID of the user whose unread notifications are being
+ *        counted.
+ * @return int Unread notification count.
+ */
+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( array(
+                'user_id' => $user_id,
+        ) );
+
+        $count = ! empty( $notifications ) ? count( $notifications ) : 0;
+
+        return apply_filters( 'bp_notifications_get_total_notification_count', $count );
+}

new file p-notifications/bp-notifications-loader.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Member Notifications Loader.
+ *
+ * Initializes the Notifications component.
+ *
+ * @package BuddyPress
+ * @subpackage NotificationsLoader
+ * @since BuddyPress (1.9.0)
+ */
+
+// 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.0)
+         */
+        function __construct() {
+                parent::start(
+                        'notifications',
+                        __( 'Notifications', 'buddypress' ),
+                        BP_PLUGIN_DIR,
+                        array(
+                                'adminbar_myaccount_order' => 100
+                        )
+                );
+        }
+
+        /**
+         * Include notifications component files.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see BP_Component::includes() for a description of arguments.
+         *
+         * @param array $includes See BP_Component::includes() for a description.
+         */
+        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.9.0)
+         *
+         * @see BP_Component::setup_globals() for a description of arguments.
+         *
+         * @param array $args See BP_Component::setup_globals() for a description.
+         */
+        public function setup_globals( $args = array() ) {
+                // 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_core_get_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 );
+        }
+
+        /**
+         * Set up component navigation.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see BP_Component::setup_nav() for a description of arguments.
+         *
+         * @param array $main_nav Optional. See BP_Component::setup_nav() for
+         *        description.
+         * @param array $sub_nav Optional. See BP_Component::setup_nav() for
+         *        description.
+         */
+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+
+                // 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 component entries in the WordPress Admin Bar.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
+         *      parameter array.
+         *
+         * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
+         *        description.
+         */
+        public function setup_admin_bar( $wp_admin_nav = array() ) {
+
+                // Menus for logged in user
+                if ( is_user_logged_in() ) {
+
+                        // Setup the logged in user variables
+                        $notifications_link = trailingslashit( bp_loggedin_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' => buddypress()->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 );
+        }
+
+        /**
+         * Set up the title for pages and <title>.
+         *
+         * @since BuddyPress (1.9.0)
+         */
+        function setup_title() {
+                $bp = buddypress();
+
+                // Adjust title
+                if ( bp_is_notifications_component() ) {
+                        if ( bp_is_my_profile() ) {
+                                $bp->bp_options_title = __( 'Notifications', '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();
+        }
+}
+
+/**
+ * Bootstrap the Notifications component.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_setup_notifications() {
+        buddypress()->notifications = new BP_Notifications_Component();
+}
+add_action( 'bp_setup_components', 'bp_setup_notifications', 6 );

new file p-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;
+
+/**
+ * Catch and route the 'unread' notifications screen.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_notifications_screen_unread() {
+        do_action( 'bp_notifications_screen_unread' );
+
+        bp_core_load_template( apply_filters( 'bp_notifications_template_unread', 'members/single/home' ) );
+}
+
+/**
+ * Catch and route the 'read' notifications screen.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_notifications_screen_read() {
+        do_action( 'bp_notifications_screen_read' );
+
+        bp_core_load_template( apply_filters( 'bp_notifications_template_read', 'members/single/home' ) );
+}
+
+/**
+ * Catch and route the 'settings' notifications screen.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_notifications_screen_settings() {
+
+}

new file p-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.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_notifications_slug() {
+        echo bp_get_notifications_slug();
+}
+        /**
+         * Return the notifications component slug.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return string Slug of the Notifications component.
+         */
+        function bp_get_notifications_slug() {
+                return apply_filters( 'bp_get_notifications_slug', buddypress()->notifications->slug );
+        }
+
+/** Main Loop *****************************************************************/
+
+/**
+ * The main notifications template loop class.
+ *
+ * Responsible for loading a group of notifications into a loop for display.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+class BP_Notifications_Template {
+        /**
+         * The loop iterator.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var int
+         */
+        var $current_notification = -1;
+
+        /**
+         * The number of notifications returned by the paged query.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var int
+         */
+        var $current_notification_count;
+
+        /**
+         * Total number of notifications matching the query.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var int
+         */
+        var $total_notification_count;
+
+        /**
+         * Array of notifications located by the query.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var array
+         */
+        var $notifications;
+
+        /**
+         * The notification object currently being iterated on.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var object
+         */
+        var $notification;
+
+        /**
+         * A flag for whether the loop is currently being iterated.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var bool
+         */
+        var $in_the_loop;
+
+        /**
+         * The ID of the user to whom the displayed notifications belong.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var int
+         */
+        var $user_id;
+
+        /**
+         * The page number being requested.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var int
+         */
+        var $pag_page;
+
+        /**
+         * The number of items to display per page of results.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var int
+         */
+        var $pag_num;
+
+        /**
+         * An HTML string containing pagination links.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var string
+         */
+        var $pag_links;
+
+        /**
+         * A string to match against.
+         *
+         * @since BuddyPress (1.9.0)
+         * @access public
+         * @var string
+         */
+        var $search_terms;
+
+        /**
+         * Constructor method.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @param array $args {
+         *     @type int $user_id ID of the user to whom the displayed
+         *           notifications belong.
+         *     @type bool $is_new Whether to limit the query to unread
+         *           notifications. Default: true.
+         *     @type int $page Number of the page of results to return.
+         *           Will be overridden by URL parameter. Default: 1.
+         *     @type int $per_page Number of results to return per page.
+         *           Will be overridden by URL parameter. Default: 25.
+         *     @type int $max Optional. Max results to display.
+         *     @type string $search_terms Optional. Term to match against
+         *           component_name and component_action.
+         *     @type string $page_arg URL argument to use for pagination.
+         *           Default: 'npage'.
+         * }
+         */
+        public function __construct( $args = array() ) {
+
+                $r = wp_parse_args( $args, array(
+                        'user_id'      => 0,
+                        'is_new'       => true,
+                        'page'         => 1,
+                        'per_page'     => 25,
+                        'max'          => null,
+                        'search_terms' => '',
+                        'page_arg'     => 'npage',
+                ) );
+
+                // Setup variables
+                $this->pag_page     = isset( $_GET[ $r['page_arg'] ] ) ? intval( $_GET[ $r['page_arg'] ] ) : $r['page'];
+                $this->pag_num      = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $r['per_page'];
+                $this->user_id      = $r['user_id'];
+                $this->is_new       = $r['is_new'];
+                $this->search_terms = $r['search_terms'];
+                $this->page_arg     = $r['page_arg'];
+
+                // Get the notifications
+                $notifications      = BP_Notifications_Notification::get_current_notifications_for_user( array(
+                        'user_id'      => $this->user_id,
+                        'is_new'       => $this->is_new,
+                        'page'         => $this->pag_page,
+                        'per_page'     => $this->pag_num,
+                        'search_terms' => $this->search_terms
+                ) );
+
+                // Setup the notifications to loop through
+                $this->notifications            = $notifications['notifications'];
+                $this->total_notification_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( $this->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
+                        ) );
+                }
+        }
+
+        /**
+         * Whether there are notifications available in the loop.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see bp_has_notifications()
+         *
+         * @return bool True if there are items in the loop, otherwise false.
+         */
+        public function has_notifications() {
+                if ( $this->notification_count ) {
+                        return true;
+                }
+
+                return false;
+        }
+
+        /**
+         * Set up the next notification and iterate index.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return object The next notification to iterate over.
+         */
+        public function next_notification() {
+
+                $this->current_notification++;
+
+                $this->notification = $this->notifications[ $this->current_notification ];
+
+                return $this->notification;
+        }
+
+        /**
+         * Rewind the blogs and reset blog index.
+         *
+         * @since BuddyPress (1.9.0)
+         */
+        public function rewind_notifications() {
+
+                $this->current_notification = -1;
+
+                if ( $this->notification_count > 0 ) {
+                        $this->notification = $this->notifications[0];
+                }
+        }
+
+        /**
+         * Whether there are notifications left in the loop to iterate over.
+         *
+         * This method is used by {@link bp_notifications()} as part of the
+         * while loop that controls iteration inside the notifications loop, eg:
+         *     while ( bp_notifications() ) { ...
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see bp_notifications()
+         *
+         * @return bool True if there are more notifications to show,
+         *         otherwise false.
+         */
+        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;
+        }
+
+        /**
+         * Set up the current notification inside the loop.
+         *
+         * Used by {@link bp_the_notification()} to set up the current
+         * notification data while looping, so that template tags used during
+         * that iteration make reference to the current notification.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @see bp_the_notification()
+         */
+        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' );
+                }
+        }
+}
+
+/**
+ * Initialize the notifications loop.
+ *
+ * Based on the $args passed, bp_has_notifications() populates
+ * buddypress()->notifications->query_loop global, enabling the use of BP
+ * templates and template functions to display a list of notifications.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @param array $args {
+ *     Arguments for limiting the contents of the notifications loop. Can be
+ *     passed as an associative array, or as a URL query string.
+ *     @type int $user_id ID of the user to whom notifications belong. Default:
+ *           ID of the logged-in user.
+ *     @type bool $is_new Whether to limit query to unread notifications.
+ *           Default: when viewing the 'unread' tab, defaults to true; when
+ *           viewing the 'read' tab, defaults to false.
+ *     @type int $page The page of notifications being fetched. Default: 1.
+ *     @type int $per_page Number of items to display on a page. Default: 25.
+ *     @type int $max Optional. Max items to display. Default: false.
+ *     @type string $search_terms Optional. Term to match against
+ *           component_name and component_action.
+ *     @type string $page_arg URL argument to use for pagination.
+ *           Default: 'npage'.
+ * }
+ */
+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,
+                'page'         => 1,
+                '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 );
+
+        // Setup the global query loop
+        buddypress()->notifications->query_loop = $query_loop;
+
+        return apply_filters( 'bp_has_notificationss', $query_loop->has_notifications(), $query_loop );
+}
+
+/**
+ * Get the notifications returned by the template loop.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @return array List of notifications.
+ */
+function bp_the_notifications() {
+        return buddypress()->notifications->query_loop->notifications();
+}
+
+/**
+ * Get the current notification object in the loop.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @return object The current notification within the loop.
+ */
+function bp_the_notification() {
+        return buddypress()->notifications->query_loop->the_notification();
+}
+
+/**
+ * Output the ID of the notification currently being iterated on.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_id() {
+        echo bp_get_the_notification_id();
+}
+        /**
+         * Return the ID of the notification currently being iterated on.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return int ID of the current notification.
+         */
+        function bp_get_the_notification_id() {
+                return apply_filters( 'bp_get_the_notification_id', buddypress()->notifications->query_loop->notification->id );
+        }
+
+/**
+ * Output the associated item ID of the notification currently being iterated on.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_item_id() {
+        echo bp_get_the_notification_item_id();
+}
+        /**
+         * Return the associated item ID of the notification currently being iterated on.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return int ID of the item associated with the current notification.
+         */
+        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 ) );
+        }
+
+/**
+ * Output the secondary associated item ID of the notification currently being iterated on.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_secondary_item_id() {
+        echo bp_get_the_notification_secondary_item_id();
+}
+        /**
+         * Return the secondary associated item ID of the notification currently being iterated on.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return int ID of the secondary item associated with the current notification.
+         */
+        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 ) );
+        }
+
+/**
+ * Output the name of the component associated with the notification currently being iterated on.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_component_name() {
+        echo bp_get_the_notification_component_name();
+}
+        /**
+         * Return the name of the component associated with the notification currently being iterated on.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return int Name of the component associated with the current notification.
+         */
+        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 ) );
+        }
+
+/**
+ * Output the name of the action associated with the notification currently being iterated on.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_component_action() {
+        echo bp_get_the_notification_component_action();
+}
+        /**
+         * Return the name of the action associated with the notification currently being iterated on.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return int Name of the action associated with the current notification.
+         */
+        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 ) );
+        }
+
+/**
+ * Output the timestamp of the current notification.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_date_notified() {
+        echo bp_get_the_notification_date_notified();
+}
+        /**
+         * Return the timestamp of the current notification.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return string Timestamp of the current notification.
+         */
+        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 ) );
+        }
+
+/**
+ * Output the pagination for the current notification loop.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_notifications_pagination_links() {
+        echo bp_get_notifications_pagination_links();
+}
+        /**
+         * Return the pagination for the current notification loop.
+         *
+         * @since BuddyPress (1.9.0)
+         *
+         * @return string HTML for the pagination.
+         */
+        function bp_get_notifications_pagination_links() {
+                return apply_filters( 'bp_get_notifications_pagination_links', buddypress()->notifications->query_loop->pag_links );
+        }

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 p-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 p-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php

@@ +1 @@
+<div class="notification-pagination">
+        <?php bp_notifications_pagination_links() ?>
+</div>
+
+<?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 p-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 p-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

tests/includes/factory.php

@@ -9 +9 @@
                 $this->group = new BP_UnitTest_Factory_For_Group( $this );
                 $this->xprofile_group = new BP_UnitTest_Factory_For_XProfileGroup( $this );
                 $this->xprofile_field = new BP_UnitTest_Factory_For_XProfileField( $this );
+                $this->notification = new BP_UnitTest_Factory_For_Notification( $this );
         }
 }
 
@@ -146 +147 @@
                 return new BP_XProfile_Field( $field_id );
         }
 }
+
+class BP_UnitTest_Factory_For_Notification extends WP_UnitTest_Factory_For_Thing {
+        public function __construct( $factory = null ) {
+                parent::__construct( $factory );
+        }
+
+        public function create_object( $args ) {
+                return bp_notifications_add_notification( $args );
+        }
+
+        public function update_object( $id, $fields ) {}
+
+        public function get_object_by_id( $id ) {
+                return new BP_Notifications_Notification( $id );
+        }
+}

tests/includes/install.php

@@ -26 +26 @@
 tests_add_filter( 'show_admin_bar', '__return_true' );
 
 function wp_test_bp_install( $value ) {
-        return array( 'activity' => 1, 'blogs' => 1, 'friends' => 1, 'groups' => 1, 'members' => 1, 'messages' => 1, 'settings' => 1, 'xprofile' => 1, );
+        return array( 'activity' => 1, 'blogs' => 1, 'friends' => 1, 'groups' => 1, 'members' => 1, 'messages' => 1, 'notifications' => 1, 'settings' => 1, 'xprofile' => 1, );
 }
 tests_add_filter( 'bp_new_install_default_components', 'wp_test_bp_install' );