Ticket #3460: 3460.06.diff

bp-activity/bp-activity-functions.php

@@ -1575 +1575 @@
                 $activity_obj = $activity_obj->current_comment;
         }
 
-        if ( 'new_blog_post' == $activity_obj->type || 'new_blog_comment' == $activity_obj->type || 'new_forum_topic' == $activity_obj->type || 'new_forum_post' == $activity_obj->type ) {
+        $use_primary_link = array( 'new_forum_topic', 'new_forum_post' );
+
+        if ( bp_is_active( 'blogs' ) ) {
+                // Gets all post types activity actions available
+                $blogs_post_types        = get_object_vars( buddypress()->activity->actions->blogs );
+                // Adds them to the array to check.
+                $use_primary_link = array_merge( $use_primary_link, array_keys( $blogs_post_types ) );
+        }
+
+        if ( in_array( $activity_obj->type, $use_primary_link ) ) {
                 $link = $activity_obj->primary_link;
         } else {
                 if ( 'activity_comment' == $activity_obj->type ) {

bp-activity/bp-activity-template.php

@@ -2626 +2626 @@
         $can_comment = true;
 
         if ( false === $activities_template->disable_blogforum_replies || (int) $activities_template->disable_blogforum_replies ) {
-                if ( 'new_blog_post' == bp_get_activity_action_name() || 'new_blog_comment' == bp_get_activity_action_name() || 'new_forum_topic' == bp_get_activity_action_name() || 'new_forum_post' == bp_get_activity_action_name() )
+                // initialize with forum activity types
+                $activity_comment_types = array( 'new_forum_topic', 'new_forum_post' );
+
+                if ( bp_is_active( 'blogs' ) ) {
+                        // Gets all post types activity actions available
+                        $blogs_post_types        = get_object_vars( buddypress()->activity->actions->blogs );
+                        // Adds them to the array to check.
+                        $activity_comment_types = array_merge( $activity_comment_types, array_keys( $blogs_post_types ) );
+                }
+
+                if ( in_array( bp_get_activity_action_name(), $activity_comment_types ) )
                         $can_comment = false;
         }
 

bp-blogs/bp-blogs-activity.php

@@ -106 +106 @@
         $post_url = add_query_arg( 'p', $activity->secondary_item_id, trailingslashit( $blog_url ) );
 
         $post_title = bp_activity_get_meta( $activity->id, 'post_title' );
+        $post_type  = bp_activity_get_meta( $activity->id, 'post_type'  );
 
         // Should only be empty at the time of post creation
         if ( empty( $post_title ) ) {
@@ -114 +115 @@
                 $post = get_post( $activity->secondary_item_id );
                 if ( is_a( $post, 'WP_Post' ) ) {
                         $post_title = $post->post_title;
+                        $post_type  = $post->post_type;
                         bp_activity_update_meta( $activity->id, 'post_title', $post_title );
+                        bp_activity_update_meta( $activity->id, 'post_type',  $post_type  );
                 }
 
                 restore_current_blog();
@@ -124 +127 @@
 
         $user_link = bp_core_get_userlink( $activity->user_id );
 
+        $post_type_object = get_post_type_object( $post_type );
+
+        if ( ! empty( $post_type_object->labels->singular_name ) ) {
+                $singular = strtolower( $post_type_object->labels->singular_name );
+        } else {
+                $singular = __( 'item', 'buddypress' );
+        }
+
         if ( is_multisite() ) {
-                $action  = sprintf( __( '%1$s wrote a new post, %2$s, on the site %3$s', 'buddypress' ), $user_link, $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
+                $action  = sprintf( __( '%1$s wrote a new %2$s, %3$s, on the site %4$s', 'buddypress' ), $user_link, esc_html( $singular ), $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
         } else {
-                $action  = sprintf( __( '%1$s wrote a new post, %2$s', 'buddypress' ), $user_link, $post_link );
+                $action  = sprintf( __( '%1$s wrote a new %2$s, %3$s', 'buddypress' ), esc_html( $singular ), $user_link, $post_link );
         }
 
         // Legacy filter - requires the post object
@@ -166 +177 @@
 
         $post_url   = bp_activity_get_meta( $activity->id, 'post_url' );
         $post_title = bp_activity_get_meta( $activity->id, 'post_title' );
+        $post_type  = bp_activity_get_meta( $activity->id, 'post_type'  );
 
         // Should only be empty at the time of post creation
         if ( empty( $post_url ) || empty( $post_title ) ) {
@@ -181 +193 @@
 
                         if ( is_a( $post, 'WP_Post' ) ) {
                                 $post_title = $post->post_title;
+                                $post_type  = $post->post_type;
                                 bp_activity_update_meta( $activity->id, 'post_title', $post_title );
+                                bp_activity_update_meta( $activity->id, 'post_type',  $post_type  );
                         }
                 }
 
@@ -191 +205 @@
         $post_link = '<a href="' . $post_url . '">' . $post_title . '</a>';
         $user_link = bp_core_get_userlink( $activity->user_id );
 
+        $post_type_object = get_post_type_object( $post_type );
+
+        if ( ! empty( $post_type_object->labels->singular_name ) ) {
+                $singular = strtolower( $post_type_object->labels->singular_name );
+        } else {
+                $singular = __( 'item', 'buddypress' );
+        }
+
         if ( is_multisite() ) {
-                $action  = sprintf( __( '%1$s commented on the post, %2$s, on the site %3$s', 'buddypress' ), $user_link, $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
+                $action  = sprintf( __( '%1$s commented on the %2$s, %3$s, on the site %4$s', 'buddypress' ), $user_link, esc_html( $singular ), $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );
         } else {
-                $action  = sprintf( __( '%1$s commented on the post, %2$s', 'buddypress' ), $user_link, $post_link );
+                $action  = sprintf( __( '%1$s commented on the %2$s, %3$s', 'buddypress' ), $user_link, esc_html( $singular ), $post_link );
         }
 
         // Legacy filter - requires the comment object

bp-blogs/bp-blogs-classes.php

@@ -525 +525 @@
                 return $user_blog;
         }
 }
+
+
+if ( ! class_exists( 'BP_Blogs_Post_Type_Tracker' ) ) :
+/**
+ * Load BP Blogs Post Type Tracker
+ *
+ * @package BuddyPress
+ * @subpackage blogsClasses
+ *
+ * @since BuddyPress (?)
+ */
+class BP_Blogs_Post_Type_Tracker {
+
+        /**
+         * Starts the tracker.
+         *
+         * @access public
+         * @since BuddyPress (?)
+         *
+         * @uses buddypress() to get BuddyPress main instance
+         */
+        public static function start_tracker() {
+
+                $bp = buddypress();
+
+                if( empty( $bp->blogs->tracker ) ) {
+                        $bp->blogs->tracker = new self;
+                }
+
+                return $bp->blogs->tracker;
+        }
+
+        /**
+         * Constructor method.
+         *
+         * @access public
+         * @since BuddyPress (?)
+         */
+        public function __construct() {
+                $this->setup_globals();
+                $this->setup_actions();
+        }
+
+        /**
+         * Set the trackable post types as a global.
+         *
+         * @access private
+         * @since BuddyPress (?)
+         */
+        private function setup_globals() {
+                // Activated post types
+                $this->tracked_post_types = bp_trackable_post_types();
+                $network_active = bp_get_option( 'bp-subsites-enabled-post-types', array() );
+
+                if ( ! empty( $network_active ) ) {
+                        $network_active = array_fill_keys( array_keys( $network_active ), 1 );
+                        $this->tracked_post_types = array_merge( $network_active, $this->tracked_post_types );
+                }
+
+                // BuddyPress is already tracking posts
+                if ( isset( $this->tracked_post_types['post'] ) )
+                        unset( $this->tracked_post_types['post'] );
+        }
+
+        /**
+         * Actions.
+         *
+         * @access private
+         * @since BuddyPress (?)
+         */
+        private function setup_actions() {
+                // Wait till all post types are set
+                add_action( 'init', array( $this, 'setup_post_types' ), 1000 );
+        }
+
+        /**
+         * Build the activity actions
+         *
+         * @access public
+         * @since BuddyPress (?)
+         */
+        public function setup_post_types() {
+                $bp = buddypress();
+
+                $subsite_activated = array();
+
+                $default_params = array(
+                        'singular_name'      => __( 'item', 'buddypress' ),
+                        'type'               => 'new_blog_item',
+                        'post_callback'      => 'bp_blogs_format_activity_action_new_blog_post',
+                        'comment_callback'   => 'bp_blogs_format_activity_action_new_blog_comment'
+                );
+
+                foreach ( $this->tracked_post_types as $post_type => $active ) {
+                        // Jump to next if Admin did not activate the tracking
+                        if ( empty( $active ) )
+                                continue;
+                        
+                        // Get post type settings
+                        $object = get_post_type_object( $post_type );
+
+                        // Jump to next post type after incrementing the subsite activated post types 
+                        if ( empty( $object ) ) {
+                                $subsite_activated[] = $post_type;
+                                continue;
+                        }
+
+                        // This should always be the case for network available post types
+                        if ( ! empty( $object->labels->singular_name ) ) {
+                                $singular_name = $object->labels->singular_name;
+                                $type_post     = 'new_blog_' . $post_type;
+                                $type_comment  = 'new_blog_' . $post_type . '_comment';
+
+                        // This should never happen..
+                        } else {
+                                $singular_name = $default_params['singular_name'];
+                                $type_post     = $default_params['type'];
+                                $type_comment  = $default_params['type'] . '_comment';
+                        }
+                        
+                        // Do we have a specific callback ?
+                        if ( ! empty( $object->bp_tracking['post_callback'] ) ) {
+                                $post_callback = $object->bp_tracking['post_callback'];
+                        // Use BuddyPress default
+                        } else {
+                                $post_callback = $default_params['post_callback'];
+                        }
+                        
+                        // Set activity actions for post
+                        bp_activity_set_action(
+                                $bp->blogs->id,
+                                $type_post,
+                                sprintf( __( 'New %s published', 'buddypress' ), strtolower( $singular_name ) ),
+                                $post_callback
+                        );
+
+                        if ( ! post_type_supports( $post_type, 'comments' ) )
+                                continue;
+
+                        // Do we have a specific callback ?
+                        if ( ! empty( $object->bp_tracking['comment_callback'] ) ) {
+                                $comment_callback = $object->bp_tracking['comment_callback'];
+                        // Use BuddyPress default
+                        } else {
+                                $comment_callback = $default_params['comment_callback'];
+                        }
+
+                        // Set activity actions for comments
+                        bp_activity_set_action(
+                                $bp->blogs->id,
+                                $type_comment,
+                                sprintf( __( 'New %s comment posted', 'buddypress' ), strtolower( $singular_name ) ),
+                                $comment_callback
+                        );
+
+                }
+
+                // Do we have subsite only post type ?
+                if ( ! empty( $subsite_activated ) ) {
+                        // Register one global action for all!
+                        bp_activity_set_action(
+                                $bp->blogs->id,
+                                $default_params['type'],
+                                sprintf( __( 'New %s published', 'buddypress' ), $default_params['singular_name'] ),
+                                $default_params['post_callback']
+                        );
+
+                        bp_activity_set_action(
+                                $bp->blogs->id,
+                                $default_params['type'] . '_comment',
+                                sprintf( __( 'New %s comment posted', 'buddypress' ), $default_params['singular_name'] ),
+                                $default_params['post_callback']
+                        );
+                }
+        } 
+
+}
+endif; // class_exists check
+
+// Load the BP Blogs Post Type Tracker
+add_action( 'bp_blogs_register_activity_actions', array( 'BP_Blogs_Post_Type_Tracker', 'start_tracker' ), 0 );
+
+if ( !class_exists( 'BP_Blogs_Admin' ) ) :
+/**
+ * Load Blogs admin area.
+ *
+ * @package BuddyPress
+ * @subpackage blogsAdministration
+ *
+ * @since BuddyPress (?)
+ */
+class BP_Blogs_Admin {
+
+        /** Vars *************************************************************/
+
+        /**
+         * Current blog id.
+         *
+         * @var string $blog_id
+         */
+        public $blog_id = '';
+
+        /**
+         * The list of post types active on the network.
+         *
+         * @var array $network_active
+         */
+        public $network_active;
+
+        /**
+         * The list of post type to track for the current blog
+         *
+         * @var array $tracked_post_types
+         */
+        public $tracked_post_types;
+
+        /**
+         * Is this blog trackable ?
+         *
+         * @var boolean
+         */
+        public $is_public = '';
+
+
+        /**
+         * Setup BP Blogs Admin.
+         *
+         * @access public
+         * @since BuddyPress (?)
+         *
+         * @uses buddypress() to get BuddyPress main instance
+         */
+        public static function register_blogs_admin() {
+                if( ! is_admin() || ! bp_core_do_network_admin() )
+                        return;
+
+                $bp = buddypress();
+
+                if( empty( $bp->blogs->admin ) ) {
+                        $bp->blogs->admin = new self;
+                }
+
+                return $bp->blogs->admin;
+        }
+
+        /**
+         * Constructor method.
+         *
+         * @access public
+         * @since BuddyPress (?)
+         */
+        public function __construct() {
+                $this->setup_globals();
+                $this->setup_actions();
+        }
+
+        /**
+         * Set admin-related globals.
+         *
+         * @access private
+         * @since BuddyPress (?)
+         */
+        private function setup_globals() {
+
+                $this->blog_id            = get_current_blog_id();
+                $this->network_active     = bp_trackable_post_types();
+                $this->tracked_post_types = bp_blogs_blog_trackable_post_type();
+                $this->is_public          = get_option( 'blog_public' );
+                $this->capability         = ! bp_restrict_blogs_tracking_visibility() ? 'manage_options' : 'manage_sites';
+
+        }
+
+        /**
+         * Set admin-related actions and filters.
+         *
+         * @access private
+         * @since BuddyPress (?)
+         */
+        private function setup_actions() {
+                // Bail if blog is not trackable
+                if ( empty( $this->is_public ) )
+                        return;
+
+                if( $this->blog_id == bp_get_root_blog_id() )
+                        return;
+
+                // Add an option page to blog settings
+                add_action( 'admin_menu', array( $this, 'admin_menus' ) );
+
+                // Register the blog tracking settings
+                add_action( 'bp_register_admin_settings', array( $this, 'blog_settings' ) );
+        }
+
+        /**
+         * Create the options sub menu.
+         *
+         * @access public
+         * @since BuddyPress (?)
+         *
+         * @uses add_options_page() To add the Site tracking submenu.
+         */
+        public function admin_menus() {
+
+                $hook = add_options_page( 
+                        __( 'Network Tracking', 'buddypress' ), 
+                        __( 'Network Tracking', 'buddypress' ), 
+                        $this->capability, 
+                        'bp-tracking', 
+                        array( &$this, 'tracking_settings' )
+                );
+
+                add_action( "admin_head-$hook", array( $this, 'set_network_post_types' ) );
+
+        }
+
+        /**
+         * Create the settings page.
+         *
+         * @access public
+         * @since BuddyPress (?)
+         */
+        public function tracking_settings() {
+                if ( ! current_user_can( $this->capability ) ) {
+                        die( '-1' );
+                }
+                ?>
+                <div class="wrap">
+                        <?php screen_icon( 'buddypress' ); ?>
+
+                        <h2><?php esc_html_e( 'Settings', 'buddypress' ); ?></h2>
+
+                        <form action="options.php" method="post">
+
+                                <?php settings_fields( 'buddypress_blog' ); ?>
+
+                                <?php do_settings_sections( 'buddypress_blog' ); ?>
+
+                                <p class="submit">
+                                        <input type="submit" name="submit" class="button-primary" value="<?php esc_attr_e( 'Save Settings', 'buddypress' ); ?>" />
+                                </p>
+                        </form>
+                </div>
+                <?php
+        }
+
+        /**
+         * Create the settings section & fields.
+         *
+         * @access public
+         * @since BuddyPress (?)
+         */
+        public function blog_settings() {
+                // Add the main section
+                add_settings_section(
+                        'bp_blog', 
+                        '',
+                        array( &$this, 'main_section_callback' ),
+                        'buddypress_blog'
+                );
+
+                // Add the site tracking section
+                add_settings_section(
+                        'bp_tracking',
+                        __( 'Site Tracking Settings', 'buddypress' ),
+                        array( &$this, 'tracking_section_callback' ),
+                        'buddypress_blog'
+                );
+
+                // Add the tracking setting
+                add_settings_field(
+                        'bp-enabled-post-types',
+                        __( 'List of post types to track', 'buddypress' ),
+                        array( &$this, 'post_types_setting_callback' ),
+                        'buddypress_blog',
+                        'bp_tracking'
+                );
+
+                register_setting(
+                        'buddypress_blog',
+                        'bp-enabled-post-types',
+                        array( &$this, 'post_types_sanitize_callback' )
+                );
+        }
+
+        /**
+         * Output the main section callback
+         * 
+         * @access public
+         * @since  BuddyPress (?)
+         */
+        public function main_section_callback() {}
+
+        /**
+         * Output the tracking section callback
+         * 
+         * @access public
+         * @since  BuddyPress (?)
+         */
+        public function tracking_section_callback() {
+                ?>
+                <p class="description">
+                        <?php esc_html_e( 'List of the post types active for tracking on the network:', 'buddypress' ) ;?>
+
+                        <ol>
+                        <?php foreach ( $this->network_active as $post_type => $active ) :
+                                if ( empty( $active ) )
+                                        continue;
+                                ?>
+
+                                <li><?php echo esc_html( ucfirst( $post_type ) );?></li>
+
+                        <?php endforeach; ?>
+                        </ol>
+
+                </p>
+                <p class="description"><?php printf( __( 'You can disable the tracking of your site by <a href="%s">discouraging</a> search engines from indexing your site', 'buddypress' ), admin_url( 'options-reading.php#blog_public' ) ); ?></p>
+                <p class="description"><?php esc_html_e( 'Manage your site post types by enabling, disabling the checkboxes', 'buddypress' ) ;?></p>
+                <?php
+        }
+
+        /**
+         * Output the tracking section callback
+         * 
+         * @access public
+         * @since  BuddyPress (?)
+         * 
+         * @uses bp_admin_setting_callback_post_types_tracked() to get the output
+         */
+        public function post_types_setting_callback() {
+                return bp_admin_setting_callback_post_types_tracked( $this->tracked_post_types );
+        }
+
+        /**
+         * Sanitize the tracking setting
+         * 
+         * @access public
+         * @since  BuddyPress (?)
+         * 
+         * @uses bp_admin_sanitize_callback_post_types_tracked() to sanitize the option
+         */
+        public function post_types_sanitize_callback( $option = array() ) {
+                return bp_admin_sanitize_callback_post_types_tracked( $option );
+        }
+
+        /**
+         * Saves an option listing all the post types activated on the network
+         * 
+         * @access public
+         * @since  BuddyPress (?)
+         */
+        public function set_network_post_types() {
+                if ( ! current_user_can( $this->capability ) ) {
+                        die( '-1' );
+                }
+                // Bail if no settings were updated
+                if ( empty( $_GET['settings-updated'] ) || 'true' != $_GET['settings-updated'] )
+                        return;
+
+                // the network option
+                $active_subsites_post_types = bp_get_option( 'bp-subsites-enabled-post-types', array() );
+                $before_change = $active_subsites_post_types;
+
+                // Should we update ?
+                $subsite_compare = array_diff_key( $active_subsites_post_types, $this->tracked_post_types );
+                $network_compare = array_diff_key( $this->tracked_post_types, $active_subsites_post_types );
+
+                if ( ! empty( $this->tracked_post_types ) && ! empty( $network_compare ) ) {
+                        foreach( array_keys( $this->tracked_post_types ) as $post ) {
+
+                                if ( 'post' == $post )
+                                        continue;
+
+                                if ( empty( $active_subsites_post_types[ $post ] ) || ! in_array( $this->blog_id, $active_subsites_post_types[ $post ] ) )
+                                        $active_subsites_post_types[ $post ][] = $this->blog_id;
+                        }
+                }
+
+                if ( ! empty( $active_subsites_post_types ) && ! empty( $subsite_compare ) ) {
+                        foreach( array_keys( $active_subsites_post_types ) as $post ) {
+
+                                if ( in_array( $this->blog_id, $active_subsites_post_types[ $post ] ) ) {
+                                        $active_subsites_post_types[ $post ] = array_diff( $active_subsites_post_types[ $post ], array( $this->blog_id ) );
+                                }
+
+                                if ( empty( $active_subsites_post_types[ $post ] ) )
+                                        unset( $active_subsites_post_types[ $post ] );
+                        }
+                }
+
+                if ( $before_change != $active_subsites_post_types ) {
+                        bp_update_option( 'bp-subsites-enabled-post-types', $active_subsites_post_types );
+                }
+        }
+
+}
+endif; // class_exists check
+
+// Load the BP Blogs admin
+add_action( 'bp_init', array( 'BP_Blogs_Admin','register_blogs_admin' ) );

bp-blogs/bp-blogs-functions.php

@@ -161 +161 @@
 }
 
 /**
+ * Gets the trackable post type for a given block.
+ *
+ * @since BuddyPress (?)
+ *
+ * @uses bp_trackable_post_types()
+ * @uses apply_filters()
+ *
+ * @param array $default default post types.
+ * @param int $blog_id the blog the post type is registered to.
+ * @return array the trackable post type for the given block.
+ */
+function bp_blogs_blog_trackable_post_type( $default = array(), $blog_id = 0 ) {
+        if ( empty( $blog_id ) )
+                $blog_id = get_current_blog_id();
+
+        if ( empty( $default) )
+                $default = array( 'post' => 1 );
+
+        $default = array_merge( bp_trackable_post_types(), $default );
+
+        return (array) apply_filters( 'bp_blogs_blog_trackable_post_types', (array) get_blog_option( $blog_id, 'bp-enabled-post-types', $default ), $blog_id );
+}
+
+/**
+ * Check whether a given blog post type should be tracked by the Blogs component.
+ *
+ * If $blog_id is provided, the developer can restrict a given blog post type from
+ * being trackable.
+ *
+ * @since BuddyPress (?)
+ *
+ * @uses bp_trackable_post_types()
+ * @uses apply_filters()
+ *
+ * @param string $post_type the post type being checked.
+ * @param int $blog_id the blog the post type is registered to.
+ * @return bool True if the post type is trackable, otherwise false.
+ */
+function bp_blogs_is_blog_post_type_trackable( $post_type = '', $blog_id = 0 ) {
+        /**
+         * If blog id is not root_blog_id, get the current blog settings instead of network one
+         */
+        if ( $blog_id != bp_get_root_blog_id() ) {
+                $trackable = (array) apply_filters( 'bp_blogs_is_blog_post_type_trackable', bp_blogs_blog_trackable_post_type( array(), $blog_id ), $blog_id );
+        } else {
+                $trackable = (array) apply_filters( 'bp_blogs_is_blog_post_type_trackable', bp_trackable_post_types(),                              $blog_id );
+        }
+
+        // BackCompat
+        $legacy_post_type_filter = apply_filters( 'bp_blogs_record_post_post_types', array() );
+        $legacy_comment_filter   = apply_filters( 'bp_blogs_record_comment_post_types', array() );
+        $legacy_post_type_filter = array_merge( $legacy_post_type_filter, $legacy_comment_filter );
+
+        if ( ! empty( $legacy_post_type_filter ) ) {
+                $legacy_post_type_filter = array_fill_keys( $legacy_post_type_filter, 1 );
+
+                // Merge the two arrays making sure the setting saved for the post type will be the final value 
+                $trackable = array_merge( $legacy_post_type_filter, $trackable );
+        }
+
+        return ! empty( $trackable[ $post_type ] );
+}
+
+/**
  * Make BuddyPress aware of a new site so that it can track its activity.
  *
  * @since BuddyPress (1.0.0)
@@ -318 +382 @@
         if ( (int) $blog_id == $tags_blog_id && apply_filters( 'bp_blogs_block_sitewide_tags_activity', true ) )
                 return false;
 
-        // Don't record this if it's not a post
-        if ( !in_array( $post->post_type, apply_filters( 'bp_blogs_record_post_post_types', array( 'post' ) ) ) )
+        // Don't record this if the post type is not trackable
+        if ( ! bp_blogs_is_blog_post_type_trackable( $post->post_type, $blog_id ) )
                 return false;
 
         $is_blog_public = apply_filters( 'bp_is_blog_public', (int)get_blog_option( $blog_id, 'blog_public' ) );
@@ -334 +398 @@
                                 trailingslashit( get_home_url( $blog_id ) )
                         );
 
+                        // Default
+                        $action_args = array(
+                                'action'        => 'new_blog_item',
+                                'singular_name' => __( 'item', 'buddypress' ),
+                        );
+
+                        /**
+                         * Avoiding this part would display the action instead of
+                         * the translatable string introduced in https://buddypress.trac.wordpress.org/changeset/8126 
+                         */
+                        $is_subsite_post_type = ! in_array( 
+                                $post->post_type, 
+                                array_keys( 
+                                        array_merge( bp_trackable_post_types(), array( 'page' => 1 ) ) 
+                                )
+                        );
+
+                        if ( empty( $is_subsite_post_type ) ) {
+                                $post_type_object = get_post_type_object( $post->post_type );
+                                $action_args['action'] = 'new_blog_' . $post->post_type;
+
+                                if ( ! empty( $post_type_object->labels->singular_name ) )
+                                        $action_args['singular_name'] = strtolower( $post_type_object->labels->singular_name );
+                        }
+
                         if ( is_multisite() )
-                                $activity_action  = sprintf( __( '%1$s wrote a new post, %2$s, on the site %3$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
+                                $activity_action  = sprintf( __( '%1$s wrote a new %2$s, %3$s, on the site %4$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), $action_args['singular_name'], '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
                         else
-                                $activity_action  = sprintf( __( '%1$s wrote a new post, %2$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+                                $activity_action  = sprintf( __( '%1$s wrote a new %2$s, %3$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), $action_args['singular_name'], '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
 
                         // Make sure there's not an existing entry for this post (prevent bumping)
                         if ( bp_is_active( 'activity' ) ) {
                                 $existing = bp_activity_get( array(
                                         'filter' => array(
-                                                'action'       => 'new_blog_post',
+                                                'action'       => $action_args['action'],
                                                 'primary_id'   => $blog_id,
                                                 'secondary_id' => $post_id,
                                         )
@@ -356 +445 @@
 
                         $activity_content = $post->post_content;
 
-                        bp_blogs_record_activity( array(
+                        $activity_id = bp_blogs_record_activity( array(
                                 'user_id'           => (int) $post->post_author,
-                                'content'           => apply_filters( 'bp_blogs_activity_new_post_content',      $activity_content, $post, $post_permalink ),
-                                'primary_link'      => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink,   $post_id               ),
-                                'type'              => 'new_blog_post',
+                                'action'            => apply_filters( "bp_blogs_activity_new_{$post->post_type}_action",       $activity_action,  $post, $post_permalink ),
+                                'content'           => apply_filters( "bp_blogs_activity_new_{$post->post_type}_content",      $activity_content, $post, $post_permalink ),
+                                'primary_link'      => apply_filters( "bp_blogs_activity_new_{$post->post_type}_primary_link", $post_permalink,   $post_id               ),
+                                'type'              => $action_args['action'],
                                 'item_id'           => $blog_id,
                                 'secondary_item_id' => $post_id,
                                 'recorded_time'     => $post->post_date_gmt,
                         ));
+
+                        if( ! empty( $is_subsite_post_type ) ) {
+                                bp_activity_update_meta( $activity_id, 'post_title', $post->post_title );
+                                bp_activity_update_meta( $activity_id, 'post_type',  $post->post_type  );
+                        }
                 }
 
                 // Update the blogs last activity
@@ -428 +523 @@
         if ( !empty( $recorded_comment->post->post_password ) )
                 return false;
 
-        // Don't record activity if the comment's associated post isn't a WordPress Post
-        if ( !in_array( $recorded_comment->post->post_type, apply_filters( 'bp_blogs_record_comment_post_types', array( 'post' ) ) ) )
+        // Don't record this if the post type has not been set by administrator to be tracked
+        if ( ! bp_blogs_is_blog_post_type_trackable( $recorded_comment->post->post_type, $blog_id ) )
                 return false;
 
         $is_blog_public = apply_filters( 'bp_is_blog_public', (int)get_blog_option( $blog_id, 'blog_public' ) );
@@ -441 +536 @@
                 $post_permalink = get_permalink( $recorded_comment->comment_post_ID );
                 $comment_link   = get_comment_link( $recorded_comment->comment_ID );
 
+                // Default
+                $action_args = array(
+                        'action'        => 'new_blog_item_comment',
+                        'singular_name' => __( 'item', 'buddypress' ),
+                );
+
+                /**
+                 * Avoiding this part would display the action instead of
+                 * the translatable string introduced in https://buddypress.trac.wordpress.org/changeset/8126 
+                 */
+                $is_subsite_post_type = ! in_array( 
+                        $recorded_comment->post->post_type, 
+                        array_keys( 
+                                array_merge( bp_trackable_post_types(), array( 'page' => 1 ) ) 
+                        )
+                );
+
+                if ( empty( $is_subsite_post_type ) ) {
+                        $post_type_object = get_post_type_object( $recorded_comment->post->post_type );
+                        $action_args['action'] = 'new_blog_' . $recorded_comment->post->post_type . '_comment';
+
+                        if ( ! empty( $post_type_object->labels->singular_name ) )
+                                $action_args['singular_name'] = strtolower( $post_type_object->labels->singular_name );
+                }
+
+                if ( 'post' == $recorded_comment->post->post_type ) {
+                        $action_args['action'] = 'new_blog_comment';
+                }
+
                 // Prepare to record in activity streams
                 if ( is_multisite() )
-                        $activity_action = sprintf( __( '%1$s commented on the post, %2$s, on the site %3$s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
+                        $activity_action = sprintf( __( '%1$s commented on the %2$s, %3$s, on the site %4$s', 'buddypress' ), bp_core_get_userlink( $user_id ), $action_args['singular_name'], '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
                 else
-                        $activity_action = sprintf( __( '%1$s commented on the post, %2$s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
+                        $activity_action = sprintf( __( '%1$s commented on the %2$s, %3$s', 'buddypress' ), bp_core_get_userlink( $user_id ), $action_args['singular_name'], '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
 
                 $activity_content       = $recorded_comment->comment_content;
 
                 // Record in activity streams
-                bp_blogs_record_activity( array(
+                $activity_id = bp_blogs_record_activity( array(
                         'user_id'           => $user_id,
-                        'content'           => apply_filters_ref_array( 'bp_blogs_activity_new_comment_content',      array( $activity_content, &$recorded_comment, $comment_link ) ),
-                        'primary_link'      => apply_filters_ref_array( 'bp_blogs_activity_new_comment_primary_link', array( $comment_link,     &$recorded_comment                ) ),
-                        'type'              => 'new_blog_comment',
+                        'action'            => apply_filters_ref_array( "bp_blogs_activity_new_{$recorded_comment->post->post_type}_action",       array( $activity_action,  &$recorded_comment, $comment_link ) ),
+                        'content'           => apply_filters_ref_array( "bp_blogs_activity_new_{$recorded_comment->post->post_type}_content",      array( $activity_content, &$recorded_comment, $comment_link ) ),
+                        'primary_link'      => apply_filters_ref_array( "bp_blogs_activity_new_{$recorded_comment->post->post_type}_primary_link", array( $comment_link,     &$recorded_comment                ) ),
+                        'type'              => $action_args['action'],
                         'item_id'           => $blog_id,
                         'secondary_item_id' => $comment_id,
                         'recorded_time'     => $recorded_comment->comment_date_gmt
                 ) );
 
+                if( ! empty( $is_subsite_post_type ) ) {
+                        $post_url = add_query_arg( 
+                                'p', 
+                                $recorded_comment->comment_post_ID, 
+                                trailingslashit( get_home_url( $blog_id ) ) 
+                        );
+                        bp_activity_update_meta( $activity_id, 'post_url',   $post_url                           );
+                        bp_activity_update_meta( $activity_id, 'post_title', $recorded_comment->post->post_title );
+                        bp_activity_update_meta( $activity_id, 'post_type',  $recorded_comment->post->post_type  );
+                }
+
                 // Update the blogs last active date
                 bp_blogs_update_blogmeta( $blog_id, 'last_activity', bp_core_current_time() );
         }

bp-blogs/bp-blogs-template.php

@@ -1292 +1292 @@
         // Filter and return
         return apply_filters( 'bp_blogs_get_profile_stats', $r['output'], $r );
 }
+
+/**
+ * Adds the available post types actions to activity filters
+ * 
+ * As in bp-legacy or bp-default templates the regular post type
+ * is already added we'll need to remove it from these options.
+ * Leaving it this way for backcompat theme purpose. But all
+ * post types should be handled there in the future..
+ * 
+ * @return string html output
+ */
+function bp_blogs_post_types_activity_options() {
+
+        $blogs_legacy_actions     = array( 'new_blog_post', 'new_blog_comment' );
+        $blogs_post_types_actions = buddypress()->activity->actions->blogs;
+
+        foreach ( $blogs_post_types_actions as $action ) {
+                if ( in_array( $action['key'], $blogs_legacy_actions ) )
+                        continue;
+                ?>
+                <option value="<?php echo esc_attr( $action['key'] ) ;?>"><?php echo esc_html( $action['value'] ) ;?></option>
+                <?php
+        }
+}
+add_action( 'bp_activity_filter_options',        'bp_blogs_post_types_activity_options' );
+add_action( 'bp_member_activity_filter_options', 'bp_blogs_post_types_activity_options' );

bp-core/admin/bp-core-settings.php

@@ -211 +211 @@
 <?php
 }
 
+/** Blogs custom post types Section **********************************************/
+
+/**
+ * Displays a message about the trackable post types in case BuddyPress is network activated
+ *
+ * @since BuddyPress (?)
+ * @uses  bp_core_do_network_admin() to check if BuddyPress is network activated
+ */
+function bp_admin_setting_callback_blogs_section() {
+        if ( ! bp_core_do_network_admin() )
+                return;
+        ?>
+                <p class="description"><?php _e( 'In case a Post type is only active on a child blog, its tracking needs to be set in the blog Administration', 'buddypress' );?></p>
+        <?php
+}
+
+/**
+ * Allow the Admin to define the post types to track in activity stream
+ *
+ * @since BuddyPress (?)
+ *
+ * @uses  get_post_types() to list the show_in_nav_menus enabled post types
+ * @uses  checked() To display the checked attribute
+ * @uses  post_type_supports() to check for bp_tracking support
+ */
+function bp_admin_setting_callback_post_types_tracked( $setting = '' ) {
+        /**
+         * Using show_in_nav_menus argument avoids the inclusion of the attachment post type 
+         * if show_in_nav_menus is not defined it defaults to the value of public arguments
+         */
+        $post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
+
+        // Building an array to compare with the array saved in bp-enabled-post-types option
+        $compare    = array_fill_keys( array_keys( $post_types ), 0 );
+
+        if ( empty( $setting ) )
+                $setting = bp_trackable_post_types();
+
+        // Merge the two arrays making sure the setting saved for the post type will be the final value 
+        $db_post_types = array_merge( $compare, $setting );
+
+        if ( empty( $db_post_types ) )
+                return;
+
+        foreach ( $post_types as $post_type => $arguments ) {
+                $readonly = ( 'post' == $post_type ) ? 'disabled' : '';
+                ?>
+
+                <input id="bp-enabled-post-types-<?php echo $post_type;?>" name="bp-enabled-post-types[<?php echo $post_type;?>]" type="checkbox" value="1" <?php checked( $db_post_types[ $post_type ] ); ?> <?php echo $readonly;?>/>
+                <label for="bp-enabled-post-types-<?php echo $post_type;?>"><?php echo $arguments->labels->name ?></label>
+
+                <?php
+        }
+
+}
+
+/**
+ * Allow regular admins to set the post type to track on network config
+ *
+ * @since BuddyPress (1.6)
+ *
+ * @uses checked() To display the checked attribute
+ */
+function bp_admin_setting_callback_blogs_tracking_visibility() {
+?>
+
+        <input id="bp-restrict-blogs-tracking" name="bp-restrict-blogs-tracking" type="checkbox" value="1" <?php checked( !bp_restrict_blogs_tracking_visibility( false ) ); ?> />
+        <label for="bp-restrict-blogs-tracking"><?php _e( 'Enable Blogs tracking settings for Administrators', 'buddypress' ); ?></label>
+
+<?php
+}
+
+
+/**
+ * Sanitization for bp-enabled-post-types
+ *
+ * @since BuddyPress (?)
+ */
+function bp_admin_sanitize_callback_post_types_tracked( $value = array() ) {
+        // Post is legacy : always tracked.
+        $tracked = array( 'post' => 1 );
+
+        if( is_array( $value ) )
+                $tracked = array_merge( $tracked, $value );
+
+        return array_map( 'absint', $tracked );
+}
+
 /** Forums Section ************************************************************/
 
 /**
@@ -316 +404 @@
                         'bp_disable_blogforum_comments',
                         'bp-disable-profile-sync',
                         'bp_restrict_group_creation',
+                        'bp-restrict-blogs-tracking',
                         'hide-loggedout-adminbar',
                 );
 

bp-core/bp-core-admin.php

@@ -389 +389 @@
                     add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
                     register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                    );
                 }
+
+                /** Blogs Section **************************************************/
+
+                if ( bp_is_active( 'blogs' ) ) {
+
+                        // Add the main section
+                        add_settings_section( 'bp_blogs', __( 'Site Tracking Settings', 'buddypress' ), 'bp_admin_setting_callback_blogs_section', 'buddypress' );
+
+                        // Post type tracking: list of items to track
+                        add_settings_field( 'bp-enabled-post-types', __( 'List of post types to track', 'buddypress' ), 'bp_admin_setting_callback_post_types_tracked', 'buddypress', 'bp_blogs' );
+                        register_setting  ( 'buddypress',           'bp-enabled-post-types',                            'bp_admin_sanitize_callback_post_types_tracked'                          );
+
+                        if ( bp_core_do_network_admin() ) {
+                                // Post type tracking: list of items to track
+                                add_settings_field( 'bp-restrict-blogs-tracking', __( 'Blogs tracking settings access', 'buddypress' ), 'bp_admin_setting_callback_blogs_tracking_visibility', 'buddypress', 'bp_blogs' );
+                                register_setting  ( 'buddypress',                'bp-restrict-blogs-tracking',                          'intval'                                                                        );
+                        }
+                }
         }
 
         /**

bp-core/bp-core-options.php

@@ -61 +61 @@
                 // Allow comments on blog and forum activity items
                 'bp-disable-blogforum-comments'   => true,
 
+                // Restrict blog tracking visibility to super admins
+                'bp-restrict-blogs-tracking'      => false,
+
                 // The ID for the current theme package.
                 '_bp_theme_package_id'            => 'legacy',
 
@@ -505 +508 @@
         return (bool) apply_filters( 'bp_disable_blogforum_comments', (bool) bp_get_option( 'bp-disable-blogforum-comments', $default ) );
 }
 
+ /**
+ * What are the registered post types trackable in activity streams?
+ *
+ * @since BuddyPress (?)
+ *
+ * @uses bp_get_option() To get the blog/forum comments option.
+ *
+ * @param array $default Optional. Fallback value if not found in the database.
+ *        Default: array().
+ * @return bool True if activity comments are disabled for blog and forum
+ *         items, otherwise false.
+ */
+function bp_trackable_post_types( $default = array( 'post' => 1 ) ) {
+        return (array) apply_filters( 'bp_trackable_post_types', (array) bp_get_option( 'bp-enabled-post-types', $default ) );
+}
+
 /**
+ * Is Blog tracking restricted to Super Admins ?
+ *
+ * @since BuddyPress (?)
+ * 
+ * @uses bp_get_option() To get the blog tracking visibility.
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *        Default: true.
+ * @return bool True if blog tracking visibility is restricted, otherwise false.
+ */
+function bp_restrict_blogs_tracking_visibility( $default = true ) {
+        return (bool) apply_filters( 'bp_restrict_blogs_tracking_visibility', (bool) bp_get_option( 'bp-restrict-blogs-tracking', $default ) );
+}
+
+/**
  * Is group creation turned off?
  *
  * @since BuddyPress (1.6.0)