Ticket #5637: 5367.04.patch

src/bp-activity/bp-activity-functions.php

@@ -275 +275 @@
  * @param string $type The action type.
  * @param string $description The action description.
  * @param callable $format_callback Callback for formatting the action string.
+ * @param string $label String to describe this action in the activity stream
+ *        filter dropdown.
+ * @param array $context Activity stream contexts where the filter should appear.
+ *        'activity', 'member', 'member_groups', 'group'
  * @return bool False if any param is empty, otherwise true.
  */
-function bp_activity_set_action( $component_id, $type, $description, $format_callback = false ) {
+function bp_activity_set_action( $component_id, $type, $description, $format_callback = false, $label = false, $context = array() ) {
         $bp = buddypress();
 
         // Return false if any of the above values are not set
@@ -303 +307 @@
                 'key'             => $type,
                 'value'           => $description,
                 'format_callback' => $format_callback,
-        ), $component_id, $type, $description, $format_callback );
+                'label'           => $label,
+                'context'         => $context,
+        ), $component_id, $type, $description, $format_callback, $label, $context );
 
         return true;
 }
@@ -835 +841 @@
                 $bp->activity->id,
                 'activity_update',
                 __( 'Posted a status update', 'buddypress' ),
-                'bp_activity_format_activity_action_activity_update'
+                'bp_activity_format_activity_action_activity_update',
+                __( 'Updates', 'buddypress' ),
+                array( 'activity', 'group', 'member', 'member_groups' )
         );
 
         bp_activity_set_action(
                 $bp->activity->id,
                 'activity_comment',
                 __( 'Replied to a status update', 'buddypress' ),
-                'bp_activity_format_activity_action_activity_comment'
+                'bp_activity_format_activity_action_activity_comment',
+                __( 'Activity Comments', 'buddypress' )
         );
 
         do_action( 'bp_activity_register_activity_actions' );

src/bp-activity/bp-activity-template.php

@@ -3371 +3371 @@
 <?php
 }
 add_action( 'bp_head', 'bp_activity_sitewide_feed' );
+
+/**
+ * Display available filters depending on the scope.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param string $context The current context. 'activity', 'member',
+ *        'member_groups', 'group'
+ * @uses bp_get_activity_show_filters()
+ */
+function bp_activity_show_filters( $context = '' ) {
+        echo bp_get_activity_show_filters( $context );
+}
+        /**
+         * Get available filters depending on the scope.
+         *
+         * @since BuddyPress (2.1.0)
+         *
+         * @param string $context The current context. 'activity', 'member',
+         *        'member_groups', 'group'
+         * @uses bp_get_activity_show_filters()
+         */
+        function bp_get_activity_show_filters( $context = '' ) {
+                // Set default context based on current page
+                if ( empty( $context ) ) {
+                        if ( bp_is_user() ) {
+                                switch ( bp_current_action() ) {
+                                        case bp_get_groups_slug() :
+                                                $context = 'member_groups';
+                                                break;
+
+                                        default :
+                                                $context = 'member';
+                                                break;
+                                }
+                        } else if ( bp_is_active( 'groups' ) && bp_is_group() ) {
+                                $context = 'group';
+                        } else {
+                                $context = 'activity';
+                        }
+                }
+
+                $filters = array();
+
+                // Walk through the registered actions, and prepare an the select box options.
+                foreach ( buddypress()->activity->actions as $actions ) {
+                        foreach ( $actions as $action ) {
+                                if ( ! in_array( $context, (array) $action['context'] ) ) {
+                                        continue;
+                                }
+
+                                // Friends activity collapses two filters into one
+                                if ( in_array( $action['key'], array( 'friendship_accepted', 'friendship_created' ) ) ) {
+                                        $action['key'] = 'friendship_accepted,friendship_created';
+                                }
+
+                                $filters[ $action['key'] ] = $action['label'];
+                        }
+                }
+
+                // Build the options output
+                $output = '';
+
+                if ( ! empty( $filters ) ) {
+                        // Allow plugins/themes to modify (mostly restrict) the list of options
+                        $filters = apply_filters( 'bp_get_activity_modify_filters', $filters, $context );
+
+                        foreach ( $filters as $value => $filter ) {
+                                $output .= '<option value="' . esc_attr( $value ) . '">' . esc_html( $filter ) . '</option>' . "\n";
+                        }
+                }
+
+                return apply_filters( 'bp_get_activity_show_filters', $output, $filters, $context );
+        }

src/bp-blogs/bp-blogs-activity.php

@@ -32 +32 @@
                         $bp->blogs->id,
                         'new_blog',
                         __( 'New site created', 'buddypress' ),
-                        'bp_blogs_format_activity_action_new_blog'
+                        'bp_blogs_format_activity_action_new_blog',
+                        __( 'New Sites', 'buddypress' )
                 );
         }
 
@@ -40 +41 @@
                 $bp->blogs->id,
                 'new_blog_post',
                 __( 'New post published', 'buddypress' ),
-                'bp_blogs_format_activity_action_new_blog_post'
+                'bp_blogs_format_activity_action_new_blog_post',
+                __( 'Posts', 'buddypress' ),
+                array( 'activity', 'member' )
         );
 
         bp_activity_set_action(
                 $bp->blogs->id,
                 'new_blog_comment',
                 __( 'New post comment posted', 'buddypress' ),
-                'bp_blogs_format_activity_action_new_blog_comment'
+                'bp_blogs_format_activity_action_new_blog_comment',
+                __( 'Comments', 'buddypress' ),
+                array( 'activity', 'member' )
         );
 
         do_action( 'bp_blogs_register_activity_actions' );

src/bp-friends/bp-friends-activity.php

@@ -96 +96 @@
                 $bp->friends->id,
                 'friendship_accepted',
                 __( 'Friendships accepted', 'buddypress' ),
-                'bp_friends_format_activity_action_friendship_accepted'
+                'bp_friends_format_activity_action_friendship_accepted',
+                __( 'Friendships', 'buddypress' ),
+                array( 'activity', 'member' )
         );
 
         bp_activity_set_action(
                 $bp->friends->id,
                 'friendship_created',
                 __( 'New friendships', 'buddypress' ),
-                'bp_friends_format_activity_action_friendship_created'
+                'bp_friends_format_activity_action_friendship_created',
+                __( 'Friendships', 'buddypress' ),
+                array( 'activity', 'member' )
         );
 
         // < BP 1.6 backpat

src/bp-groups/bp-groups-activity.php

@@ -27 +27 @@
                 $bp->groups->id,
                 'created_group',
                 __( 'Created a group', 'buddypress' ),
-                'bp_groups_format_activity_action_created_group'
+                'bp_groups_format_activity_action_created_group',
+                __( 'New Groups', 'buddypress' ),
+                array( 'activity', 'member', 'member_groups' )
         );
 
         bp_activity_set_action(
                 $bp->groups->id,
                 'joined_group',
                 __( 'Joined a group', 'buddypress' ),
-                'bp_groups_format_activity_action_joined_group'
+                'bp_groups_format_activity_action_joined_group',
+                __( 'Group Memberships', 'buddypress' ),
+                array( 'activity', 'group', 'member', 'member_groups' )
         );
 
         // These actions are for the legacy forums
         // Since the bbPress plugin also shares the same 'forums' identifier, we also
         // check for the legacy forums loader class to be extra cautious
         if ( bp_is_active( 'forums' ) && class_exists( 'BP_Forums_Component' ) ) {
-                bp_activity_set_action( $bp->groups->id, 'new_forum_topic', __( 'New group forum topic', 'buddypress' ) );
-                bp_activity_set_action( $bp->groups->id, 'new_forum_post',  __( 'New group forum post',  'buddypress' ) );
+                bp_activity_set_action(
+                        $bp->groups->id,
+                        'new_forum_topic',
+                        __( 'New group forum topic', 'buddypress' ),
+                        false,
+                        __( 'Forum Topics', 'buddypress' ),
+                        array( 'activity', 'group', 'member', 'member_groups' )
+                );
+
+                bp_activity_set_action(
+                        $bp->groups->id,
+                        'new_forum_post',
+                        __( 'New group forum post',  'buddypress' ),
+                        false,
+                        __( 'Forum Replies', 'buddypress' ),
+                        array( 'activity', 'group', 'member', 'member_groups' )
+                );
         }
 
         do_action( 'groups_register_activity_actions' );

src/bp-templates/bp-legacy/buddypress/activity/index.php

@@ -76 +76 @@
                                 <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
                                 <select id="activity-filter-by">
                                         <option value="-1"><?php _e( 'Everything', 'buddypress' ); ?></option>
-                                        <option value="activity_update"><?php _e( 'Updates', 'buddypress' ); ?></option>
 
-                                        <?php if ( bp_is_active( 'blogs' ) ) : ?>
-
-                                                <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ); ?></option>
-                                                <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ); ?></option>
-
-                                        <?php endif; ?>
-
-                                        <?php if ( bp_is_active( 'forums' ) ) : ?>
-
-                                                <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ); ?></option>
-                                                <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ); ?></option>
-
-                                        <?php endif; ?>
-
-                                        <?php if ( bp_is_active( 'groups' ) ) : ?>
-
-                                                <option value="created_group"><?php _e( 'New Groups', 'buddypress' ); ?></option>
-                                                <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ); ?></option>
-
-                                        <?php endif; ?>
-
-                                        <?php if ( bp_is_active( 'friends' ) ) : ?>
-
-                                                <option value="friendship_accepted,friendship_created"><?php _e( 'Friendships', 'buddypress' ); ?></option>
-
-                                        <?php endif; ?>
-
-                                        <option value="new_member"><?php _e( 'New Members', 'buddypress' ); ?></option>
+                                        <?php bp_activity_show_filters(); ?>
 
                                         <?php do_action( 'bp_activity_filter_options' ); ?>
 

src/bp-templates/bp-legacy/buddypress/groups/single/activity.php

@@ -5 +5 @@
                 <?php do_action( 'bp_group_activity_syndication_options' ); ?>
 
                 <li id="activity-filter-select" class="last">
-                        <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label> 
+                        <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
                         <select id="activity-filter-by">
                                 <option value="-1"><?php _e( 'Everything', 'buddypress' ); ?></option>
-                                <option value="activity_update"><?php _e( 'Updates', 'buddypress' ); ?></option>
 
-                                <?php if ( bp_is_active( 'forums' ) ) : ?>
-                                        <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ); ?></option>
-                                        <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ); ?></option>
-                                <?php endif; ?>
-
-                                <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ); ?></option>
+                                <?php bp_activity_show_filters( 'group' ); ?>
 
                                 <?php do_action( 'bp_group_activity_filter_options' ); ?>
                         </select>

src/bp-templates/bp-legacy/buddypress/members/single/activity.php

@@ -18 +18 @@
                         <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
                         <select id="activity-filter-by">
                                 <option value="-1"><?php _e( 'Everything', 'buddypress' ); ?></option>
-                                <option value="activity_update"><?php _e( 'Updates', 'buddypress' ); ?></option>
 
-                                <?php
-                                if ( !bp_is_current_action( 'groups' ) ) :
-                                        if ( bp_is_active( 'blogs' ) ) : ?>
+                                <?php bp_activity_show_filters(); ?>
 
-                                                <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ); ?></option>
-                                                <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ); ?></option>
-
-                                        <?php
-                                        endif;
-
-                                        if ( bp_is_active( 'friends' ) ) : ?>
-
-                                                <option value="friendship_accepted,friendship_created"><?php _e( 'Friendships', 'buddypress' ); ?></option>
-
-                                        <?php endif;
-
-                                endif;
-
-                                if ( bp_is_active( 'forums' ) ) : ?>
-
-                                        <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ); ?></option>
-                                        <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ); ?></option>
-
-                                <?php endif;
-
-                                if ( bp_is_active( 'groups' ) ) : ?>
-
-                                        <option value="created_group"><?php _e( 'New Groups', 'buddypress' ); ?></option>
-                                        <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ); ?></option>
-
-                                <?php endif;
-
-                                do_action( 'bp_member_activity_filter_options' ); ?>
+                                <?php do_action( 'bp_member_activity_filter_options' ); ?>
 
                         </select>
                 </li>

src/bp-xprofile/bp-xprofile-activity.php

@@ -21 +21 @@
                 // older avatar activity items use 'profile' for component
                 // see r4273
                 'profile',
-
                 'new_avatar',
                 __( 'Member changed profile picture', 'buddypress' ),
-                'bp_xprofile_format_activity_action_new_avatar'
+                'bp_xprofile_format_activity_action_new_avatar',
+                __( 'Updated Avatars', 'buddypress' )
         );
 
         bp_activity_set_action(
                 $bp->profile->id,
                 'new_member',
                 __( 'New member registered', 'buddypress' ),
-                'bp_xprofile_format_activity_action_new_member'
+                'bp_xprofile_format_activity_action_new_member',
+                __( 'New Members', 'buddypress' ),
+                array( 'activity' )
         );
 
         bp_activity_set_action(
                 $bp->profile->id,
                 'updated_profile',
                 __( 'Updated Profile', 'buddypress' ),
-                'bp_xprofile_format_activity_action_updated_profile'
+                'bp_xprofile_format_activity_action_updated_profile',
+                __( 'Profile Updates', 'buddypress' ),
+                array( 'activity' )
         );
 
         do_action( 'xprofile_register_activity_actions' );
@@ -309 +313 @@
  * Add filters for xprofile activity types to Show dropdowns.
  *
  * @since BuddyPress (2.0.0)
+ * @todo Mark as deprecated
  */
 function xprofile_activity_filter_options() {
         ?>
@@ -317 +322 @@
 
         <?php
 }
-add_action( 'bp_activity_filter_options', 'xprofile_activity_filter_options' );