Ticket #6026: 6026.smaller-steps.03.patch

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

@@ -236 +236 @@
                 ? $bp->loaded_components[ bp_current_action() ]
                 : bp_current_action();
 
+        // Specific case for the sites subscriptions
+        if ( 'blogs' === $scope && bp_is_user_blogs_activity() && bp_action_variable( 0 ) ) {
+                $scope = 'site_' . sanitize_key( bp_action_variable( 0 ) );
+        }
+
         // Support for permalinks on single item pages: /groups/my-group/activity/124/.
         $include = bp_is_current_action( bp_get_activity_slug() )
                 ? bp_action_variable( 0 )
@@ -3804 +3809 @@
                 if ( empty( $context ) ) {
 
                         // On member pages, default to 'member', unless this
-                        // is a user's Groups activity.
+                        // is a user's Groups or a user's Blogs activity.
                         if ( bp_is_user() ) {
+                                // Groups
                                 if ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
                                         $context = 'member_groups';
+
+                                // Sites
+                                } elseif ( bp_is_active( 'blogs' ) && bp_is_current_action( bp_get_blogs_slug() ) ) {
+                                        $context = 'member_sites';
                                 } else {
                                         $context = 'member';
                                 }

src/bp-activity/classes/class-bp-activity-component.php

@@ -233 +233 @@
                         );
                 }
 
+                // Additional menu if blogs is active
+                if ( bp_is_active( 'blogs' ) ) {
+                        $sub_nav[] = array(
+                                'name'            => _x( 'Sites', 'Profile activity screen sub nav', 'buddypress' ),
+                                'slug'            => bp_get_blogs_slug(),
+                                'parent_url'      => $activity_link,
+                                'parent_slug'     => $this->slug,
+                                'screen_function' => 'bp_blogs_activity_screen',
+                                'position'        => 60,
+                                'item_css_id'     => 'activity-blogs'
+                        );
+                }
+
                 parent::setup_nav( $main_nav, $sub_nav );
         }
 
@@ -329 +342 @@
                                         'position' => 50
                                 );
                         }
+
+                        // Blogs ?
+                        if ( bp_is_active( 'blogs' ) ) {
+                                $wp_admin_nav[] = array(
+                                        'parent' => 'my-account-' . $this->id,
+                                        'id'     => 'my-account-' . $this->id . '-blogs',
+                                        'title'  => _x( 'Sites', 'My Account Activity sub nav', 'buddypress' ),
+                                        'href'   => trailingslashit( $activity_link . bp_get_blogs_slug() )
+                                );
+                        }
                 }
 
                 parent::setup_admin_bar( $wp_admin_nav );

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

@@ -25 +25 @@
                         __( 'New site created', 'buddypress' ),
                         'bp_blogs_format_activity_action_new_blog',
                         __( 'New Sites', 'buddypress' ),
-                        array( 'activity', 'member', 'site' ),
+                        array( 'activity', 'member', 'site', 'member_sites' ),
                         0
                 );
         }
@@ -77 +77 @@
         $params->admin_filter    = __( 'New post published', 'buddypress' );
         $params->format_callback = 'bp_blogs_format_activity_action_new_blog_post';
         $params->front_filter    = __( 'Posts', 'buddypress' );
-        $params->contexts        = array( 'activity', 'member', 'site' );
+        $params->contexts        = array( 'activity', 'member', 'site', 'member_sites' );
         $params->position        = 5;
 
         if ( post_type_supports( $post_type, 'comments' ) ) {
@@ -105 +105 @@
                         $params->comments_tracking->admin_filter    = __( 'New post comment posted', 'buddypress' );
                         $params->comments_tracking->format_callback = 'bp_blogs_format_activity_action_new_blog_comment';
                         $params->comments_tracking->front_filter    = __( 'Comments', 'buddypress' );
-                        $params->comments_tracking->contexts        = array( 'activity', 'member', 'site' );
+                        $params->comments_tracking->contexts        = array( 'activity', 'member', 'site', 'member_sites' );
                         $params->comments_tracking->position        = 10;
                 }
         }
@@ -1425 +1425 @@
         return $retval;
 }
 add_filter( 'bp_get_activity_action_pre_meta', 'bp_blogs_activity_comment_single_action', 10, 2 );
+
+/**
+ * Set up activity arguments to use for the 'blogs' scope.
+ *
+ * @since 2.7.0
+ *
+ * @param array $retval Empty array by default
+ * @param array $filter Current activity arguments
+ * @return array
+ */
+function bp_blogs_blog_activity_scope( $retval = array(), $filter = array() ) {
+
+        // Determine the user_id
+        if ( ! empty( $filter['user_id'] ) ) {
+                $user_id = $filter['user_id'];
+        } else {
+                $user_id = bp_displayed_user_id()
+                        ? bp_displayed_user_id()
+                        : bp_loggedin_user_id();
+        }
+
+        // Determine blogs of user
+        $blogs = bp_blogs_get_blogs_for_user( $user_id );
+        if ( empty( $blogs['blogs'] ) ) {
+                $blogs = array( 'blogs' => 0 );
+        } else {
+                $blogs['blogs'] = array_keys( $blogs['blogs'] );
+        }
+
+        // Should we show all items regardless of sitewide visibility?
+        $show_hidden = array();
+        if ( ! empty( $user_id ) && ( $user_id !== bp_loggedin_user_id() ) ) {
+                $show_hidden = array(
+                        'column' => 'hide_sitewide',
+                        'value'  => 0
+                );
+        }
+
+        $retval = array(
+                'relation' => 'AND',
+                array(
+                        'relation' => 'AND',
+                        array(
+                                'column' => 'component',
+                                'value'  => buddypress()->blogs->id
+                        ),
+                        array(
+                                'column'  => 'item_id',
+                                'compare' => 'IN',
+                                'value'   => (array) $blogs['blogs']
+                        ),
+                ),
+                $show_hidden,
+
+                // overrides
+                'override' => array(
+                        'filter'      => array( 'user_id' => 0 ),
+                        'show_hidden' => true
+                ),
+        );
+
+        return $retval;
+}
+add_filter( 'bp_activity_set_blogs_scope_args', 'bp_blogs_blog_activity_scope', 10, 2 );

src/bp-blogs/bp-blogs-cache.php

@@ -44 +44 @@
  */
 function bp_blogs_clear_blog_object_cache( $blog_id = 0, $user_id = 0 ) {
         if ( ! empty( $user_id ) ) {
-                wp_cache_delete( 'bp_blogs_of_user_'        . $user_id, 'bp' );
-                wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+                wp_cache_delete( 'bp_blogs_of_user_'                     . $user_id, 'bp' );
+                wp_cache_delete( 'bp_total_blogs_for_user_'              . $user_id, 'bp' );
+                wp_cache_delete( 'bp_total_site_subscriptions_for_user_' . $user_id, 'bp' );
         }
 
         wp_cache_delete( 'bp_total_blogs', 'bp' );

src/bp-blogs/bp-blogs-filters.php

@@ -121 +121 @@
 }
 add_filter( 'bp_activity_post_pre_publish', 'bp_blogs_post_pre_publish', 10, 4 );
 add_filter( 'bp_activity_post_pre_comment', 'bp_blogs_post_pre_publish', 10, 4 );
+
+/**
+ * Use the mystery site avatar for sites.
+ *
+ * @since 2.7.0
+ *
+ * @param string $avatar Current avatar src.
+ * @param array  $params Avatar params.
+ * @return string
+ */
+function bp_blogs_default_avatar( $avatar, $params ) {
+        if ( isset( $params['object'] ) && 'blog' === $params['object'] ) {
+                $avatar = buddypress()->plugin_url . "bp-core/images/mystery-site.svg";
+        }
+
+        return $avatar;
+}
+add_filter( 'bp_core_avatar_default',       'bp_blogs_default_avatar', 10, 3 );
+add_filter( 'bp_core_avatar_default_thumb', 'bp_blogs_default_avatar', 10, 3 );

src/bp-blogs/bp-blogs-functions.php

@@ -38 +38 @@
  *     @type int         $per_page          Default: 20.
  *     @type int         $page              Default: 1.
  *     @type bool        $update_meta_cache Whether to pre-fetch blogmeta. Default: true.
+ *     @type int         $is_contributor    Whether to get sites user is at least a contributor (1)
+ *                                          or the sites he subscribed to (0). Default: 1.
  * }
  * @return array See {@link BP_Blogs_Blog::get()}.
  */
@@ -51 +53 @@
                 'search_terms'      => false,    // Limit to blogs matching these search terms
                 'per_page'          => 20,       // The number of results to return per page
                 'page'              => 1,        // The page to return if limiting per page
-                'update_meta_cache' => true      // Whether to pre-fetch blogmeta
+                'update_meta_cache' => true,     // Whether to pre-fetch blogmeta,
+                'is_contributor'    => 1,
         ), 'blogs_get_blogs' );
 
         // Get the blogs.
@@ -62 +65 @@
                 $r['user_id'],
                 $r['search_terms'],
                 $r['update_meta_cache'],
-                $r['include_blog_ids']
+                $r['include_blog_ids'],
+                $r['is_contributor']
         );
 
         // Filter and return.
@@ -814 +818 @@
 function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0 ) {
         global $wpdb;
 
+        /**
+         * WordPress is removing the user from the main blog just after
+         * creating it on it. So we need to do the same with blog association.
+         */
+        if ( doing_action( 'wpmu_new_user' ) ) {
+                BP_Blogs_Blog::delete_blog_for_user( get_current_site()->blog_id, $user_id );
+
+                // No need to carry on.
+                return false;
+        }
+
         // If no blog ID was passed, use the root blog ID.
         if ( empty( $blog_id ) ) {
                 $blog_id = isset( $wpdb->blogid ) ? $wpdb->blogid : bp_get_root_blog_id();
@@ -866 +881 @@
         bp_blogs_record_blog( $blog_id, $user_id, true );
 }
 add_action( 'set_user_role', 'bp_blogs_add_user_to_blog', 10, 2 );
+add_action( 'wpmu_new_user', 'bp_blogs_add_user_to_blog', 10, 1 );
 
 /**
  * The allowed blog roles a member must have to be recorded into the
@@ -1144 +1160 @@
  * Get the total number of blogs being tracked by BP for a specific user.
  *
  * @since 1.2.0
+ * @since 2.7.0 Now this function also gets/caches the site subscriptions count.
+ *              Adds the $is_contributor parameter.
  *
  * @param int $user_id ID of the user being queried. Default: on a user page,
  *                     the displayed user. Otherwise, the logged-in user.
  * @return int $count Total blog count for the user.
  */
-function bp_blogs_total_blogs_for_user( $user_id = 0 ) {
+function bp_blogs_total_blogs_for_user( $user_id = 0, $is_contributor = 1 ) {
         if ( empty( $user_id ) ) {
                 $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
         }
@@ -1159 +1177 @@
                 return 0;
         }
 
-        $count = wp_cache_get( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+        $cache = 'bp_total_blogs_for_user_' . $user_id;
+        if ( 0 === $is_contributor ) {
+                $cache = 'bp_total_site_subscriptions_for_user_' . $user_id;
+        }
+
+        $count = wp_cache_get( $cache, 'bp' );
         if ( false === $count ) {
-                $count = BP_Blogs_Blog::total_blog_count_for_user( $user_id );
-                wp_cache_set( 'bp_total_blogs_for_user_' . $user_id, $count, 'bp' );
+                $count = BP_Blogs_Blog::total_blog_count_for_user( $user_id, $is_contributor );
+                wp_cache_set( $cache, $count, 'bp' );
         }
 
         return $count;
@@ -1428 +1451 @@
         }
 }
 add_action( 'bp_make_ham_user', 'bp_blogs_restore_data', 10, 1 );
+
+/**
+ * Checks if we safely use sites subscriptions.
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if Site subscriptions are active. False otherwise.
+ */
+function bp_blogs_is_site_subscriptions_active() {
+        return bp_is_active( 'blogs', 'site' ) && ! bp_disable_site_subscriptions();
+}

src/bp-blogs/bp-blogs-screens.php

@@ -72 +72 @@
 }
 add_action( 'bp_screens', 'bp_blogs_screen_index', 2 );
 
+/**
+ * Load the User's activity page.
+ *
+ * @since 2.7.0
+ */
+function bp_blogs_activity_screen() {
+        bp_update_is_item_admin( bp_current_user_can( 'bp_moderate' ), 'activity' );
+
+        /**
+         * Fires right before the loading of the "My Sites" activities screen template file.
+         *
+         * @since 2.7.0
+         */
+        do_action( 'bp_blogs_activity_screen' );
+
+        /**
+         * Filters the template to load for the "My Sites"  activities screen.
+         *
+         * @since 2.7.0
+         *
+         * @param string $template Path to the activity template to load.
+         */
+        bp_core_load_template( apply_filters( 'bp_blogs_activity_screen_template', 'members/single/home' ) );
+}
+
 /** Theme Compatibility *******************************************************/
 
 new BP_Blogs_Theme_Compat();

src/bp-blogs/bp-blogs-site.php

@@ -14 +14 @@
 require dirname( __FILE__ ) . '/site/screens.php';
 require dirname( __FILE__ ) . '/site/template.php';
 require dirname( __FILE__ ) . '/site/adminbar.php';
+require dirname( __FILE__ ) . '/site/filters.php';
 
 if ( bp_is_active( 'activity' ) ) {
         require dirname( __FILE__ ) . '/site/activity.php';

src/bp-blogs/bp-blogs-template.php

@@ -143 +143 @@
  *     @type int      $user_id          The ID of the user whose blogs should be retrieved.
  *                                      When viewing a user profile page, 'user_id' defaults to the
  *                                      ID of the displayed user. Otherwise the default is false.
+ *     @type int      $is_contributor   Whether to get sites user is at least a contributor (1)
+ *                                      or the sites he subscribed to (0). Default: 1.
  * }
  * @return bool Returns true when blogs are found, otherwise false.
  */
 function bp_has_blogs( $args = '' ) {
         global $blogs_template;
 
+        $is_contributor = 1;
+        if ( bp_is_active( 'blogs', 'site' ) && bp_is_user() && bp_is_current_action( 'my-subscriptions' ) ) {
+                $is_contributor = 0;
+        }
+
         // Check for and use search terms.
         $search_terms_default = false;
         $search_query_arg = bp_core_get_component_search_query_arg( 'blogs' );
@@ -168 +175 @@
                 'user_id'           => bp_displayed_user_id(), // Pass a user_id to limit to only blogs this user is a member of.
                 'include_blog_ids'  => false,
                 'search_terms'      => $search_terms_default,
-                'update_meta_cache' => true
+                'update_meta_cache' => true,
+                'is_contributor'    => $is_contributor,
         ), 'has_blogs' );
 
         // Set per_page to maximum if max is enforced.
@@ -177 +185 @@
         }
 
         // Get the blogs.
-        $blogs_template = new BP_Blogs_Template( $r['type'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['search_terms'], $r['page_arg'], $r['update_meta_cache'], $r['include_blog_ids'] );
+        $blogs_template = new BP_Blogs_Template( $r['type'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['search_terms'], $r['page_arg'], $r['update_meta_cache'], $r['include_blog_ids'], $r['is_contributor'] );
 
         /**
          * Filters whether or not there are blogs to list.
@@ -287 +295 @@
         }
 
 /**
+ * Returns the Site's avatar.
+ *
+ * @since  2.7.0
+ *
+ * @param array|string $args  {
+ *     For more information about the arguments, see
+ *     {@link bp_core_fetch_avatar()}.
+ * }
+ * @return string HTML output for the site's avatar.
+ */
+function bp_blogs_get_site_avatar( $args = array() ) {
+        $r = wp_parse_args( $args, array(
+                'item_id'    => 0,
+                'title'      => '',
+                'avatar_dir' => 'blog-avatars',
+                'object'     => 'blog',
+                'type'       => 'full',
+                'alt'        => __( 'Site Photo', 'buddypress' ),
+                'css_id'     => 0,
+                'class'      => 'avatar site-avatar',
+                'width'      => false,
+                'height'     => false,
+                'site_name'  => '',
+        ) );
+
+        if ( ! empty( $r['site_name'] ) ) {
+                $r['alt']   = sprintf( __( 'Site Photo of %s', 'buddypress' ), $r['site_name'] );
+
+                // Only replace the title if not set.
+                if ( ! $r['title'] ) {
+                        $r['title'] = $r['alt'];
+                }
+
+                unset( $r['site_name'] );
+
+        // Only set the default title if not already set.
+        } elseif ( ! $r['title'] ) {
+                $r['title'] = __( 'Site Photo', 'buddypress' );
+        }
+
+        return bp_core_fetch_avatar( $r );
+}
+
+/**
  * Output a blog's avatar.
  *
  * @see bp_get_blog_avatar() for description of arguments.
@@ -299 +351 @@
         /**
          * Get a blog's avatar.
          *
-         * At the moment, blog avatars are simply the user avatars of the blog
-         * admin. Filter 'bp_get_blog_avatar_' . $blog_id to customize.
-         *
          * @since 2.4.0 Introduced `$title` argument.
          *
          * @see bp_core_fetch_avatar() For a description of arguments and
          *      return values.
          *
          * @param array|string $args  {
-         *     Arguments are listed here with an explanation of their defaults.
          *     For more information about the arguments, see
          *     {@link bp_core_fetch_avatar()}.
-         *     @type string   $alt     Default: 'Profile picture of site author [user name]'.
-         *     @type string   $class   Default: 'avatar'.
-         *     @type string   $title   Default: 'Profile picture of site author [user name]'.
-         *     @type string   $type    Default: 'full'.
-         *     @type int|bool $width   Default: false.
-         *     @type int|bool $height  Default: false.
-         *     @type bool     $id      Currently unused.
-         *     @type bool     $no_grav Default: true.
          * }
-         * @return string User avatar string.
+         * @return string Site avatar string.
          */
         function bp_get_blog_avatar( $args = '' ) {
                 global $blogs_template;
@@ -331 +371 @@
                         return false;
                 }
 
-                $author_displayname = bp_core_get_user_displayname( $blogs_template->blog->admin_user_id );
-
                 // Parse the arguments.
                 $r = bp_parse_args( $args, array(
-                        'type'    => 'full',
-                        'width'   => false,
-                        'height'  => false,
-                        'class'   => 'avatar',
-                        'title'   => sprintf( __( 'Profile picture of site author %s', 'buddypress' ), esc_attr( $author_displayname ) ),
-                        'id'      => false,
-                        'alt'     => sprintf( __( 'Profile picture of site author %s', 'buddypress' ), esc_attr( $author_displayname ) ),
-                        'no_grav' => true,
-                ) );
+                        'item_id'   => $blogs_template->blog->blog_id,
+                        'type'      => 'thumb',
+                        'site_name' => esc_attr( bp_get_blog_name() ),
+                        'title'     => '',
+                ), 'get_blog_avatar' );
 
                 // Fetch the avatar.
-                $avatar = bp_core_fetch_avatar( array(
-                        'item_id'    => $blogs_template->blog->admin_user_id,
-                        'title'      => $r['title'],
-                        // 'avatar_dir' => 'blog-avatars',
-                        // 'object'     => 'blog',
-                        'type'       => $r['type'],
-                        'alt'        => $r['alt'],
-                        'css_id'     => $r['id'],
-                        'class'      => $r['class'],
-                        'width'      => $r['width'],
-                        'height'     => $r['height']
-                ) );
-
-                /**
-                 * In future BuddyPress versions you will be able to set the avatar for a blog.
-                 * Right now you can use a filter with the ID of the blog to change it if you wish.
-                 * By default it will return the avatar for the primary blog admin.
-                 *
-                 * This filter is deprecated as of BuddyPress 1.5 and may be removed in a future version.
-                 * Use the 'bp_get_blog_avatar' filter instead.
-                 */
-                $avatar = apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, $avatar );
+                $avatar = bp_blogs_get_site_avatar( $r );
 
                 /**
                  * Filters a blog's avatar.
@@ -388 +401 @@
         function bp_get_blog_permalink() {
                 global $blogs_template;
 
+                if ( is_null( $blogs_template ) ) {
+                        return;
+                }
+
                 if ( empty( $blogs_template->blog->domain ) )
                         $permalink = bp_get_root_domain() . $blogs_template->blog->path;
                 else {
@@ -900 +917 @@
         }
         add_filter( 'bp_get_total_blog_count_for_user', 'bp_core_number_format' );
 
+/**
+ * Output the total number of site subscriptions for a given user.
+ *
+ * @since  2.7.0
+ *
+ * @param int $user_id ID of the user.
+ */
+function bp_total_site_subscriptions_for_user( $user_id = 0 ) {
+        echo bp_get_total_site_subscriptions_for_user( $user_id );
+}
+        /**
+         * Return the total number of site subscriptions for a given user.
+         *
+         * @since  2.7.0
+         *
+         * @param int $user_id ID of the user.
+         * @return int Total number of site subscriptions for the user.
+         */
+        function bp_get_total_site_subscriptions_for_user( $user_id = 0 ) {
+
+                /**
+                 * Filters the total number of site subscriptions for a given user.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param int $value   Total number of site subscriptions for a given user.
+                 * @param int $user_id ID of the queried user.
+                 */
+                return apply_filters( 'bp_get_total_site_subscriptions_for_user', bp_blogs_total_blogs_for_user( $user_id, 0 ), $user_id );
+        }
+        add_filter( 'bp_get_total_site_subscriptions_for_user', 'bp_core_number_format' );
+
 
 /** Blog Registration ********************************************************/
 
@@ -1483 +1532 @@
          */
         return apply_filters( 'bp_blogs_get_profile_stats', $r['output'], $r );
 }
+
+/**
+ * Displays Tabs to filter the Site's activities of the member.
+ *
+ * My sites: the activities of the sites he is at least a contributor.
+ * My Subscriptions: the activities of the sites he subscribed to.
+ *
+ * @since  2.7.0
+ *
+ * @return string HTML Output.
+ */
+function bp_blogs_member_tabs() {
+        echo join( "\n", bp_get_blogs_member_tabs() );
+}
+
+        /**
+         * Gets Tabs to filter the Site's activities of the member.
+         *
+         * @since  2.7.0
+         *
+         * @return array The list of tabs.
+         */
+        function bp_get_blogs_member_tabs() {
+                /**
+                 * Filter here to disable/edit the tabs
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param array The list of User's tabs for the activity of their Sites.
+                 */
+                $tabs = apply_filters( 'bp_get_blogs_member_tabs', array(
+                        'blogs'         => __( 'My Sites', 'buddypress' ),
+                        'subscriptions' => __( 'My Subscriptions', 'buddypress' ),
+                ) );
+
+                // The site's feature or the Subscriptions one is disable, remove the tabs!
+                if ( ! bp_blogs_is_site_subscriptions_active() ) {
+                        unset( $tabs['subscriptions'] );
+
+                        // Nobody used the filter to add tabs, let's remove everything!
+                        if ( 1 === count( $tabs ) ) {
+                                unset( $tabs['blogs'] );
+                        }
+                }
+
+                $output = array();
+
+                if ( empty( $tabs ) ) {
+                        return $output;
+                }
+
+                $current_action = bp_action_variable( 0 );
+
+                foreach ( $tabs as $action => $tab ) {
+                        $selected   = '';
+                        $link_parts = array( trim( bp_displayed_user_domain(), '/' ), bp_get_activity_slug(), bp_get_blogs_slug() );
+
+                        if ( ! $current_action && 'blogs' === $action || $current_action === $action ) {
+                                $selected = ' current selected';
+                        }
+
+                        if ( 'blogs' !== $action ) {
+                                $link_parts[] = $action;
+                        }
+
+                        $output[ $action ] = sprintf( '<li class="activity-%1$s%2$s"><a href="%3$s" class="no-ajax">%4$s</a></li>',
+                                esc_attr( $action ),
+                                $selected,
+                                esc_url( trailingslashit( join( '/', $link_parts ) ) ),
+                                esc_html( $tab )
+                        );
+                }
+
+                /**
+                 * Filter here to edit the output
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param array An associative array containing the links to filter the member's sites activity
+                 */
+                return apply_filters( 'bp_get_blogs_member_tabs_output', $output, $tabs );
+        }

src/bp-blogs/classes/class-bp-blogs-blog.php

@@ -188 +188 @@
          * @param bool        $update_meta_cache Whether to pre-fetch metadata for
          *                                       blogs. Default: true.
          * @param array|bool  $include_blog_ids  Array of blog IDs to include.
+         * @param int         $is_contributor    Whether to get sites user is at least a contributor (1)
+         *                                       or the sites he subscribed to (0). Default: 1.
          * @return array Multidimensional results array, structured as follows:
          *               'blogs' - Array of located blog objects
          *               'total' - A count of the total blogs matching the filter params
          */
-        public static function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false, $update_meta_cache = true, $include_blog_ids = false ) {
+        public static function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false, $update_meta_cache = true, $include_blog_ids = false, $is_contributor = 1 ) {
                 // Default query vars
                 $query_vars = array(
                         'public'                => 1,
@@ -214 +216 @@
 
                 if ( ! empty( $user_id ) ) {
                         $query_vars['user_id'] = (int) $user_id;
+
+                        if ( ! is_null( $is_contributor ) ) {
+                                $query_vars['is_contributor'] = (int) $is_contributor;
+                        }
                 }
 
                 switch ( $type ) {
@@ -323 +329 @@
                         $sql['where']['user_id'] = $wpdb->prepare( 'b.user_id = %d', $query_vars['user_id'] );
 
                         // Defaults to blogs user is a least a contributor of
-                        if ( ! isset( $query_vars['only_contributors'] ) ) {
+                        if ( ! isset( $query_vars['is_contributor'] ) ) {
                                 $sql['where']['is_contributor'] = 'b.is_contributor = 1';
                         } else {
-                                $sql['where']['is_contributor'] = $wpdb->prepare( 'b.is_contributor = %d', $query_vars['only_contributors'] );
+                                $sql['where']['is_contributor'] = $wpdb->prepare( 'b.is_contributor = %d', $query_vars['is_contributor'] );
                         }
                 }
 
@@ -828 +834 @@
          *
          * @since  2.7.0
          *
-         * @param  int  $blog_id         The blog ID to get users for.
-         * @param  int  $is_contributor  Get only contributors (1) or subscribers (0).
+         * @param  int         $blog_id         The blog ID to get users for.
+         * @param  int|null    $is_contributor  Get only contributors (1) or subscribers (0).
+         * @param  string|null $order           Null for no order, DESC or ASC.
          * @return array                 The list of users of the blog
          */
-        public static function get_site_user_ids( $blog_id, $is_contributor = null ) {
+        public static function get_site_user_ids( $blog_id, $is_contributor = null, $order = null ) {
                 global $wpdb;
 
                 $bp = buddypress();
@@ -848 +855 @@
                         $sql['where']['is_contributor'] = $wpdb->prepare( 'is_contributor = %d', $is_contributor );
                 }
 
+                if ( 'DESC' === $order || 'ASC' === $order ) {
+                        $sql['order'] = sprintf( 'ORDER BY id %s', $order );
+                }
+
                 $sql['where'] = 'WHERE ' . join( ' AND ', $sql['where'] );
                 $query        = join( ' ', $sql );
 

src/bp-blogs/classes/class-bp-blogs-component.php

@@ -112 +112 @@
 
                 if ( is_multisite() && bp_is_blogs_component() && bp_current_action() && bp_is_active( $this->id, 'site' ) ) {
                         // Initialize a global placeholder for the site.
-                        $this->site = new stdClass;
+                        $this->site           = new stdClass;
+                        $this->site->settings = array();
 
                         // Set the current Site object
                         if ( bp_is_current_action( bp_blogs_get_root_site_slug() ) ) {
@@ -150 +151 @@
                         // Initialize the nav for the current site.
                         $this->nav = new BP_Core_Nav( $this->current_site->blog_id );
 
+                        /**
+                         * Hook here to add your custom globals for the site feature.
+                         * Use it to add specific settings using bp_blogs_register_site_settings()
+                         *
+                         * @since  2.7.0
+                         *
+                         * @param  int $value The current site id.
+                         */
+                        do_action( "bp_{$this->id}_setup_site_globals", $this->current_site->blog_id );
+
                 // Set current_site to 0 to prevent debug errors.
                 } else {
                         $this->current_site = 0;
@@ -300 +311 @@
                                 'screen_function' => 'bp_blogs_screen_my_blogs',
                                 'position'        => 10
                         );
+
+                        if ( bp_blogs_is_site_subscriptions_active() ) {
+                                $sub_nav[] = array(
+                                        'name'            => __( 'My Subscriptions', 'buddypress' ),
+                                        'slug'            => 'my-subscriptions',
+                                        'parent_url'      => $parent_url,
+                                        'parent_slug'     => $slug,
+                                        'screen_function' => 'bp_blogs_screen_my_blogs',
+                                        'position'        => 20
+                                );
+                        }
                 }
 
                 // Setup navigation.
@@ -429 +451 @@
                          * Access is restricted to the site admins.
                          */
 
-                        /**
-                         * Manage members.
-                         *
-                         * Eventually remove subscriptions.
-                         */
-                        bp_core_new_subnav_item( array(
-                                'name'              => _x( 'Members', 'Single Site manage members screen', 'buddypress' ),
-                                'slug'              => 'members',
-                                'parent_url'        => trailingslashit( $site_link . 'manage' ),
-                                'parent_slug'       => 'manage',
-                                'screen_function'   => 'bp_blogs_screen_site_manage',
-                                'position'          => 20,
-                                'user_has_access'   => bp_is_item_admin(),
-                                'no_access_url'     => $site_link,
-                                'show_in_admin_bar' => true,
-                        ), 'blogs' );
+                        if ( bp_blogs_current_site_can_subscribe() ) {
+                                /**
+                                 * Manage members.
+                                 *
+                                 * Eventually remove subscriptions.
+                                 */
+                                bp_core_new_subnav_item( array(
+                                        'name'              => _x( 'Members', 'Single Site manage members screen', 'buddypress' ),
+                                        'slug'              => 'members',
+                                        'parent_url'        => trailingslashit( $site_link . 'manage' ),
+                                        'parent_slug'       => 'manage',
+                                        'screen_function'   => 'bp_blogs_screen_site_manage',
+                                        'position'          => 20,
+                                        'user_has_access'   => bp_is_item_admin(),
+                                        'no_access_url'     => $site_link,
+                                        'show_in_admin_bar' => true,
+                                ), 'blogs' );
+                        }
                 }
 
                 /**
@@ -507 +531 @@
                                 'position' => 10
                         );
 
+                        if ( bp_blogs_is_site_subscriptions_active() ) {
+                                $wp_admin_nav[] = array(
+                                        'parent' => 'my-account-' . $this->id,
+                                        'id'     => 'my-account-' . $this->id . '-my-subscriptions',
+                                        'title'  => __( 'My Subscriptions', 'buddypress' ),
+                                        'href'   => trailingslashit( $blogs_link . 'my-subscriptions' )
+                                );
+                        }
+
                         // Create a Site.
                         if ( bp_blog_signup_enabled() ) {
                                 $wp_admin_nav[] = array(

src/bp-blogs/classes/class-bp-blogs-template.php

@@ -96 +96 @@
          * @param bool       $update_meta_cache Whether to pre-fetch metadata for
          *                                      queried blogs.
          * @param array|bool $include_blog_ids  Array of blog IDs to include.
+         * @param int        $is_contributor    Whether to get sites user is at least a contributor (1)
+         *                                      or the sites he subscribed to (0). Default: 1.
          */
-        public function __construct( $type, $page, $per_page, $max, $user_id, $search_terms, $page_arg = 'bpage', $update_meta_cache = true, $include_blog_ids = false ) {
+        public function __construct( $type, $page, $per_page, $max, $user_id, $search_terms, $page_arg = 'bpage', $update_meta_cache = true, $include_blog_ids = false, $is_contributor = 1 ) {
 
                 $this->pag_arg  = sanitize_key( $page_arg );
                 $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $page     );
@@ -117 +119 @@
                                 'search_terms'      => $search_terms,
                                 'update_meta_cache' => $update_meta_cache,
                                 'include_blog_ids'  => $include_blog_ids,
+                                'is_contributor'    => $is_contributor,
                         ) );
                 }
 

src/bp-blogs/classes/class-bp-site-query.php

@@ -93 +93 @@
                  * is a contributor or a subscriber of.
                  */
                 if ( ! empty( $this->query_vars['user_id'] ) ) {
-                        $user_sites = BP_BLOGS_BLOG::get_blog_ids_for_user( $this->query_vars['user_id'] );
+                        $is_contributor = 1;
+
+                        if ( isset( $this->query_vars['is_contributor'] ) ) {
+                                $is_contributor = (int) $this->query_vars['is_contributor'];
+                        }
+
+                        $user_sites = BP_Blogs_Blog::get_blog_ids_for_user( $this->query_vars['user_id'], $is_contributor );
 
                         if ( empty( $user_sites ) ) {
                                 $this->sites       = array();

src/bp-blogs/site/activity.php

@@ -10 +10 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
 
-// Put the code for the site activity here!
+/**
+ * Register activity actions for the site subscriptions feature.
+ *
+ * @since 2.7.0
+ */
+function bp_blogs_site_register_subscription_activity_action() {
+        if ( bp_disable_site_subscriptions() ) {
+                return;
+        }
+
+        /**
+         * Only add subscription actions if subscription are enabled
+         * for current blog, or when viewing the blogs activities on
+         * a user's profile or on the activity directory
+         */
+        if ( ( bp_is_site() && bp_blogs_current_site_can_subscribe() ) || bp_is_user() || bp_is_activity_directory() ) {
+                bp_activity_set_action(
+                        buddypress()->blogs->id,
+                        'site_subscription',
+                        __( 'New site subscription', 'buddypress' ),
+                        'bp_blogs_site_format_activity_action_new_subscription',
+                        __( 'Site Subscriptions', 'buddypress' ),
+                        array( 'activity', 'member', 'site', 'member_sites' ),
+                        20
+                );
+        }
+}
+add_action( 'bp_blogs_register_activity_actions', 'bp_blogs_site_register_subscription_activity_action' );
+
+ /**
+ * Activity action callback for new site subscriptions
+ *
+ * @since 2.7.0
+ *
+ * @param  string                    $action   The content of the action.
+ * @param  BP_Activity_Activity|null $activity The activity object.
+ * @return string The content of the action.
+ */
+function bp_blogs_site_format_activity_action_new_subscription( $action = '', $activity = null ) {
+        if ( empty( $activity->item_id ) ) {
+                return $action;
+        }
+
+        $user_link   = bp_core_get_userlink( $activity->user_id );
+        $blog_name   = bp_blogs_get_blogmeta( $activity->item_id, 'name' );
+        $blog_url    = bp_blogs_get_blogmeta( $activity->item_id, 'url' );
+        $root_url    = trailingslashit( bp_get_root_domain() );
+        $root_domain = get_current_site()->domain;
+        $protocol    = 'http://';
+        if ( is_ssl() ) {
+                $protocol = 'https://';
+        }
+
+        if ( (int) $activity->item_id !== (int) get_current_site()->blog_id ) {
+                if ( is_subdomain_install() ) {
+                        $slug = trim( str_replace( $root_domain, '', $blog_url ), '.' );
+                        $slug = str_replace( $protocol, '', $slug );
+                } else {
+                        $slug = trim( str_replace( $root_url, '', $blog_url ), '/' );
+                }
+
+                $community_link = bp_blogs_get_site_community_url( $slug );
+        } else {
+                $community_link = bp_blogs_get_site_community_url( bp_blogs_get_root_site_slug() );
+        }
+
+        $action = sprintf(
+                __( '%1$s subscribed to the site %2$s', 'buddypress' ),
+                $user_link,
+                '<a href="' . esc_url( $community_link ) . '">' . esc_html( $blog_name ) . '</a>'
+        );
+
+        return apply_filters( 'bp_blogs_site_format_activity_action_new_subscription', $action, $activity );
+}
+
+/**
+ * Add an activity once the user subscribed to the site.
+ *
+ * @since  2.7.0
+ *
+ * @param  int            $user_id The user id who subscribed.
+ * @param  WP_Site|object $site    The site object he subscribed to.
+ */
+function bp_blogs_site_activity_user_subcribed( $user_id, $site ) {
+        $action = sprintf(
+                __( '%1$s subscribed to the site %2$s', 'buddypress' ),
+                bp_core_get_userlink( $user_id ),
+                '<a href="' . esc_url( bp_blogs_get_site_community_url( $site->slug ) ) . '">' . esc_html( $site->name ) . '</a>'
+        );
+
+        bp_blogs_record_activity( array(
+                'action'  => $action,
+                'type'    => 'site_subscription',
+                'item_id' => $site->blog_id,
+        ) );
+
+        // Update the blog's last activity.
+        bp_blogs_update_blogmeta( $site->blog_id, 'last_activity', bp_core_current_time() );
+}
+add_action( 'bp_blogs_after_site_subscribed', 'bp_blogs_site_activity_user_subcribed', 10, 2 );
+
+/**
+ * Remove an activity once the user unsubscribed to the site.
+ *
+ * @since  2.7.0
+ *
+ * @param  int            $user_id The user id who unsubscribed.
+ * @param  WP_Site|object $site    The site object he unsubscribed to.
+ */
+function bp_blogs_site_activity_user_unsubscribed( $user_id, $site ) {
+        bp_blogs_delete_activity( array(
+                'user_id' => $user_id,
+                'item_id' => $site->blog_id,
+                'type'    => 'site_subscription',
+        ) );
+}
+add_action( 'bp_blogs_after_site_unsubscribed', 'bp_blogs_site_activity_user_unsubscribed', 10, 2 );

src/bp-blogs/site/filters.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site Filters
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteFilters
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+add_filter( 'bp_get_site_description',          'wptexturize'       );
+add_filter( 'bp_get_sitename',                  'wptexturize'       );
+add_filter( 'bp_get_site_description',          'convert_smilies'   );
+add_filter( 'bp_get_site_description',          'convert_chars'     );
+add_filter( 'bp_get_sitename',                  'convert_chars'     );
+add_filter( 'bp_get_site_description',          'wpautop'           );
+add_filter( 'bp_get_site_description',          'make_clickable', 9 );
+add_filter( 'bp_get_sitename',                  'wp_filter_kses', 1 );
+add_filter( 'bp_get_site_description',          'wp_filter_kses', 1 );
+add_filter( 'bp_get_site_description',          'stripslashes'      );
+add_filter( 'bp_get_site_description_editable', 'stripslashes'      );
+add_filter( 'bp_get_sitename',                  'stripslashes'      );
+add_filter( 'bp_get_site_name_editable',        'stripslashes'      );

src/bp-blogs/site/functions.php

@@ -139 +139 @@
                 return $site;
         }
 
+        // Check if we need to switch the blog.
+        $needs_switch = ! bp_is_root_blog( (int) $site->blog_id );
+
         // Check the current user caps for this site
-        if ( ! bp_is_root_blog() ) {
+        if ( $needs_switch ) {
                 switch_to_blog( $site->blog_id );
         }
 
-        $site->is_member = bp_current_user_can( 'read' );
+        $site->is_member = current_user_can( 'read' );
 
-        if ( bp_current_user_can( 'manage_options' ) ) {
+        if ( current_user_can( 'manage_options' ) ) {
                 $site->is_admin = true;
-        } elseif ( bp_current_user_can( 'edit_posts' ) ) {
+        } elseif ( current_user_can( 'edit_posts' ) ) {
                 $site->is_contributor = true;
         }
 
-        if ( ! bp_is_root_blog() ) {
+        // Most of the time, there will be only one admin.
+        if ( 1 === count( $site->site_admins ) ) {
+                $user_id = reset( $site->site_admins );
+                $site->admins_list = array( get_user_by( 'id', $user_id ) );
+
+        // NB: WordPress introduced the 'role__in' parameter in 4.4
+        } else {
+                $site->admins_list = get_users( array(
+                        'include' => $site->site_admins,
+                        'orderby' => 'ID',
+                        'order'   => 'ASC',
+                ) );
+        }
+
+        if ( $needs_switch ) {
                 restore_current_blog();
         }
 
@@ -289 +306 @@
 }
 
 /**
+ * Can users subscribe to the site?
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if subscriptions are enabled. False otherwise.
+ */
+function bp_blogs_current_site_can_subscribe() {
+        if ( bp_disable_site_subscriptions() ) {
+                return false;
+        }
+
+        $can = bp_blogs_current_site_is_public();
+
+        if ( $can ) {
+                $can = ! bp_blogs_get_current_site_property( 'disallow_subscriptions' );
+        }
+
+        /**
+         * Filters subscriptions setting for the site
+         *
+         * @since 2.7.0
+         *
+         * @param bool $can True if subscriptions are enabled. False otherwise.
+         */
+        return (bool) apply_filters( 'bp_get_site_can_subscribe', $can );
+}
+
+/**
  * Edit the BP User Query query vars to only get the site members
  *
  * @since  2.7.0
@@ -310 +355 @@
                 $is_contributor = $bp->blogs->site->members->loop_args['is_contributor'];
         }
 
-        $bp->blogs->site->members->extra = BP_Blogs_Blog::get_site_user_ids( $blog_id, $is_contributor );
+        $order = null;
+        if ( 'last_joined' === $bp->blogs->site->members->loop_args['type'] ) {
+                $order = 'DESC';
+        } elseif ( 'first_joined' === $bp->blogs->site->members->loop_args['type'] ) {
+                $order = 'ASC';
+        }
+
+        $bp->blogs->site->members->extra = BP_Blogs_Blog::get_site_user_ids( $blog_id, $is_contributor, $order );
 
         if ( empty( $bp->blogs->site->members->extra ) ) {
                 $user_ids = array( 0 );
         } else {
                 $user_ids = wp_list_pluck( $bp->blogs->site->members->extra, 'user_id' );
+
+                if ( ! is_null( $order ) ) {
+                        $bp->blogs->site->members->order_by = array_merge( array( 'u.id' ), wp_parse_id_list( $user_ids ) );
+                }
         }
 
         // Only include site members
@@ -324 +380 @@
 }
 
 /**
+ * Edit the order of the BP User Query clause if needed.
+ *
+ * @since  2.7.0
+ *
+ * @param  BP_User_Query|null $site_user_query The BP User Query object
+ */
+function bp_blogs_pre_site_user_query( BP_User_Query $site_user_query = null ) {
+        $bp = buddypress();
+
+        if ( empty( $bp->blogs->site->members->order_by ) ) {
+                return;
+        }
+
+        $site_user_query->uid_clauses['orderby'] = "ORDER BY FIELD(" . join( ',', $bp->blogs->site->members->order_by ) . ")";
+}
+
+/**
  * Add specific site extra to members fetched in the BP User Query
  *
  * @since  2.7.0
@@ -349 +422 @@
                 }
         }
 }
+
+/**
+ * BuddyPress Restricted Blogmetas.
+ *
+ * @since  2.7.0
+ *
+ * @return array The list of restricted Blogmetas.
+ */
+function bp_blogs_get_restricted_options() {
+        return array(
+                'name',
+                'description',
+                'last_activity',
+                'close_comments_for_old_posts',
+                'close_comments_days_old',
+                'thread_comments_depth',
+                'site_admins',
+                'url',
+                'disallow_subscriptions',
+        );
+}
+
+/**
+ * Register custom settings for the site's manage settings screen.
+ *
+ * @since  2.7.0
+ *
+ * @param  string $option_name The 'meta_key' you choose for the blogmeta
+ * @param  array|string $args {
+ *     An array of required arguments.
+ *     @type string   $display_function   Required. The name of the function to use
+ *                                        for the setting display.
+ *     @type string   $sanitize_function  Required. The name of the function to use
+ *                                        to sanitize the value of the option.
+ * }
+ * @return bool       True if the setting has been registered. False otherwise.
+ */
+function bp_blogs_register_site_settings( $option_name, $args = array() ) {
+        if ( ! doing_action( 'bp_blogs_setup_site_globals' ) ) {
+                return false;
+        }
+
+        $bp           = buddypress();
+        $core_options = bp_blogs_get_restricted_options();
+        $option_name  = sanitize_key( $option_name );
+
+        $restricted = array_flip( array_merge( $core_options, wp_list_pluck( $bp->blogs->site->settings, 'option_name' ) ) );
+
+        if ( empty( $option_name ) || isset( $restricted[ $option_name ] ) ) {
+                return false;
+        }
+
+        $option_args = wp_parse_args( $args, array(
+                'display_function'  => '',
+                'sanitize_function' => '',
+        ) );
+
+        $option_args['option_name'] = $option_name;
+
+        $bp->blogs->site->settings[ $option_name ] = (object) $option_args;
+
+        // Settings is registered.
+        return true;
+}
+
+/**
+ * Get all or a specific site custom setting.
+ *
+ * @since  2.7.0
+ *
+ * @param  string             $option The 'meta_key' of the custom option.
+ * @return array|object|false         The list of all registered settings.
+ *                                    The specific requested setting object.
+ *                                    False or an empty array if no settings were found.
+ */
+function bp_blogs_get_site_settings( $option = '' ) {
+        $settings = buddypress()->blogs->site->settings;
+
+        if ( empty( $option ) ) {
+                return $settings;
+        } elseif ( ! isset( $settings[ $option ] ) || ! $settings[ $option ]->display_function || ! $settings[ $option ]->sanitize_function ) {
+                return false;
+        }
+
+        return $settings[ $option ];
+}

src/bp-blogs/site/screens.php

@@ -173 +173 @@
                 return false;
         }
 
-        if ( bp_is_site_manage_screen( 'members' ) && 'remove' === bp_action_variable( 1 ) ) {
+        if ( bp_is_site_manage_settings() ) {
 
-                check_admin_referer( 'site_remove_member' );
+                // Update settings.
+                if ( ! empty( $_POST['bp_site']['submit'] ) ) {
 
-                $blog_id = bp_blogs_get_current_site_id();
-                $user_id = (int) bp_action_variable( 2 );
+                        check_admin_referer( 'site_manage_settings' );
 
-                $referer = wp_get_referer();
-                $message = __( 'We were not able to perform this action, please try again later', 'buddypress' );
-                $type    = 'error';
+                        unset( $_POST['bp_site']['submit'] );
+                        $options = $_POST['bp_site'];
 
-                if ( ! bp_is_item_admin() || empty( $blog_id ) || empty( $user_id ) ) {
-                        bp_core_add_message( $message, $type );
+                        $blog_id = bp_blogs_get_current_site_id();
+                        $referer = wp_unslash( $_POST['_wp_http_referer'] );
+                        $message = __( 'We were not able to perform this action, please try again later', 'buddypress' );
+                        $type    = 'error';
+                        $name_check = empty( $options['blogname'] );
+
+                        if ( ! bp_is_item_admin() || empty( $blog_id ) || $name_check ) {
+                                if ( $name_check ) {
+                                        $message = __( 'The site title is required.', 'buddypress' );
+                                }
+
+                                bp_core_add_message( $message, $type );
+                                bp_core_redirect( $referer );
+                        }
+
+                        if ( ! isset( $options['blog_public'] ) ) {
+                                $options['blog_public'] = 0;
+                        }
+
+                        // This option will only be saved in BuddyPress blog metas
+                        if ( isset( $options['disallow_subscriptions'] ) ) {
+                                bp_blogs_update_blogmeta( $blog_id, 'disallow_subscriptions', (int) $options['disallow_subscriptions'] );
+                                unset( $options['disallow_subscriptions'] );
+                        } else {
+                                bp_blogs_delete_blogmeta( $blog_id, 'disallow_subscriptions' );
+                        }
+
+                        $needs_switch = ! bp_is_root_blog( (int) $blog_id );
+
+                        if ( $needs_switch ) {
+                                switch_to_blog( $blog_id );
+                        }
+
+                        $whitelist_options = array(
+                                'blogname'        => true,
+                                'blogdescription' => true,
+                                'blog_public'     => true,
+                        );
+
+                        foreach ( $options as $key => $option ) {
+                                if ( empty( $whitelist_options[ $key ] ) ) {
+                                        continue;
+                                }
+
+                                $sanitized_option = sanitize_option( $key, $option );
+
+                                update_option( $key, $sanitized_option );
+                        }
+
+                        if ( isset( $needs_reset ) ) {
+                                restore_current_blog();
+                        }
+
+                        $options = array_diff_key( $options, $whitelist_options );
+
+                        // Now manage the options plugins can eventually add, if any.
+                        $plugin_settings = bp_blogs_get_site_settings();
+
+                        if ( ! empty( $plugin_settings ) ) {
+                                foreach ( $plugin_settings as $plugin_setting ) {
+                                        if ( empty( $plugin_setting->sanitize_function ) || ! is_callable( $plugin_setting->sanitize_function ) ) {
+                                                continue;
+                                        }
+
+                                        if ( isset( $options[ $plugin_setting->option_name ] ) ) {
+                                                $plugin_option = call_user_func_array( $plugin_setting->sanitize_function, array( $options[ $plugin_setting->option_name ] ) );
+
+                                                bp_blogs_update_blogmeta( $blog_id, $plugin_setting->option_name, $plugin_option );
+                                        } else {
+                                                bp_blogs_delete_blogmeta( $blog_id, $plugin_setting->option_name );
+                                        }
+                                }
+                        }
+
+                        // Redirect the user once done
+                        bp_core_add_message( __( 'Settings saved.', 'buddypress' ) );
                         bp_core_redirect( $referer );
                 }
 
-                if ( bp_user_can( $user_id, 'edit_posts', array( 'site_id' => $blog_id ) ) ) {
-                        $message = __( 'Only subscribers can be removed from this screen.', 'buddypress' );
+        } elseif ( bp_is_site_manage_members() ) {
+
+                if ( 'remove' === bp_action_variable( 1 ) ) {
+                        check_admin_referer( 'site_remove_member' );
+
+                        $blog_id = bp_blogs_get_current_site_id();
+                        $user_id = (int) bp_action_variable( 2 );
+
+                        $referer = wp_get_referer();
+                        $message = __( 'We were not able to perform this action, please try again later', 'buddypress' );
+                        $type    = 'error';
+
+                        if ( ! bp_is_item_admin() || empty( $blog_id ) || empty( $user_id ) ) {
+                                bp_core_add_message( $message, $type );
+                                bp_core_redirect( $referer );
+                        }
+
+                        if ( bp_user_can( $user_id, 'delete_published_posts', array( 'site_id' => $blog_id ) ) ) {
+                                $message = __( 'Only subscribers or contributors can be removed from this screen.', 'buddypress' );
+                                bp_core_add_message( $message, $type );
+                                bp_core_redirect( $referer );
+                        }
+
+                        /**
+                         * Fires before the user is removed from the blog
+                         *
+                         * @since 2.7.0
+                         *
+                         * @param int $user_id the ID of the current user
+                         * @param int $blog_id the ID of the blog
+                         */
+                        do_action( 'bp_blogs_before_remove_user_from_site', $user_id, $blog_id );
+
+                        /**
+                         * Removing the user
+                         */
+                        $removed = remove_user_from_blog( $user_id, $blog_id );
+
+                        if ( ! is_wp_error( $removed ) ) {
+                                $message = __( 'Member successfully removed from the site.', 'buddypress' );
+                                $type    = '';
+
+                                /**
+                                 * Fires after the user was removed from the blog
+                                 *
+                                 * @since 2.7.0
+                                 *
+                                 * @param int $user_id the ID of the current user
+                                 * @param int $blog_id the ID of the blog
+                                 */
+                                do_action( 'bp_blogs_after_remove_user_from_site', $user_id, $blog_id );
+
+                        } else {
+                                $message = $removed->get_error_message();
+                                $type    = 'error';
+                        }
+
                         bp_core_add_message( $message, $type );
                         bp_core_redirect( $referer );
-                }
 
-                /**
-                 * Fires before the user is removed from the blog
-                 *
-                 * @since 2.7.0
-                 *
-                 * @param int $user_id the ID of the current user
-                 * @param int $blog_id the ID of the blog
-                 */
-                do_action( 'bp_blogs_before_remove_user_from_site', $user_id, $blog_id );
+                // Toggle involvement
+                } elseif ( 'promote' === bp_action_variable( 1 ) || 'demote' === bp_action_variable( 1 ) ) {
+                        $action = sanitize_key( bp_action_variable( 1 ) );
 
-                /**
-                 * Removing the user
-                 */
-                $removed = remove_user_from_blog( $user_id, $blog_id );
+                        check_admin_referer( "site_{$action}_member" );
+
+                        $blog_id = bp_blogs_get_current_site_id();
+                        $user_id = (int) bp_action_variable( 2 );
+
+                        $referer = wp_get_referer();
+                        $message = __( 'We were not able to perform this action, please try again later', 'buddypress' );
+                        $type    = 'error';
+
+                        if ( ! bp_is_item_admin() || empty( $blog_id ) || empty( $user_id ) ) {
+                                bp_core_add_message( $message, $type );
+                                bp_core_redirect( $referer );
+                        }
 
-                if ( ! is_wp_error( $removed ) ) {
-                        $message = __( 'Member successfully removed from the site.', 'buddypress' );
-                        $type    = 'success';
+                        $needs_switch = ! bp_is_root_blog( (int) $blog_id );
+
+                        if ( $needs_switch ) {
+                                switch_to_blog( $blog_id );
+                        }
+
+                        if ( user_can( $user_id, 'delete_published_posts' ) ) {
+                                $message = __( 'Only subscribers or contributors can be managed from this screen. Please use your Site Administration to manage the role of this specific member.', 'buddypress' );
+                                bp_core_add_message( $message, $type );
+                                bp_core_redirect( $referer );
+                        }
 
                         /**
-                         * Fires after the user was removed from the blog
+                         * Fires before the user is promoted or demoted
                          *
                          * @since 2.7.0
                          *
                          * @param int $user_id the ID of the current user
                          * @param int $blog_id the ID of the blog
                          */
-                        do_action( 'bp_blogs_after_remove_user_from_site', $user_id, $blog_id );
+                        do_action( "bp_blogs_before_{$action}_user_from_site", $user_id, $blog_id );
 
-                } else {
-                        $message = $removed->get_error_message();
-                        $type    = 'error';
-                }
+                        $message  = __( 'Member successfully promoted to contributor.', 'buddypress' );
+                        $userdata = array( 'ID' => $user_id, 'role' => 'contributor' );
+
+                        if ( 'demote' === $action ) {
+                                $message          = __( 'Member successfully demoted to subscriber.', 'buddypress' );
+                                $userdata['role'] = 'subscriber';
+                        }
+
+                        /**
+                         * Updating the user role
+                         */
+                        $updated = wp_update_user( $userdata );
 
-                bp_core_add_message( $message, $type );
-                bp_core_redirect( $referer );
+                        if ( $needs_switch ) {
+                                restore_current_blog();
+                        }
+
+                        if ( is_wp_error( $updated ) ) {
+                                $message = $updated->get_error_message();
+                                $type    = 'error';
+                        } else {
+                                $type = '';
+
+                                /**
+                                 * Fires after the user was promoted or demoted.
+                                 *
+                                 * @since 2.7.0
+                                 *
+                                 * @param int $user_id the ID of the current user
+                                 * @param int $blog_id the ID of the blog
+                                 */
+                                do_action( "bp_blogs_after_{$action}_user_from_site", $user_id, $blog_id );
+                        }
+
+                        bp_core_add_message( $message, $type );
+                        bp_core_redirect( $referer );
+                }
         }
 
         /**

src/bp-blogs/site/subscriptions.php

@@ -10 +10 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
 
-// Put the code for the front-end site subscriptions feature here!
+/**
+ * Displays a subscribe button for the current site.
+ *
+ * @since  2.7.0
+ *
+ * @param  WP_Site|object $site The site object.
+ * @return string HTML Output.
+ */
+function bp_site_subscribe_button( $site = null ) {
+        if ( empty( $site ) ) {
+                $site = bp_blogs_get_current_site();
+        }
+
+        echo bp_get_site_subscribe_button( $site );
+}
+
+/**
+ * Builds the arguments of the subscribe button for the current site.
+ *
+ * @since  2.7.0
+ *
+ * @param  WP_Site|object $site The site object.
+ * @return array The button arguments.
+ */
+function bp_get_site_subscribe_button_args( $site = null ) {
+        if ( empty( $site->blog_id ) ) {
+                $site = bp_blogs_get_current_site();
+        }
+
+        if ( ! $site || ! empty( $site->is_admin ) ) {
+                return;
+        }
+
+        $start_button = array(
+                'id'                => 'subscribe_unsubscribe',
+                'component'         => 'blogs',
+                'must_be_logged_in' => true,
+                'block_self'        => false,
+        );
+
+        if ( ! $site->is_member ) {
+                $end_button = array(
+                        'wrapper_class'     => 'site-button subscribe',
+                        'link_href'         => esc_url( wp_nonce_url(
+                                add_query_arg( 'action', 'subscribe', bp_blogs_get_site_community_url() ),
+                                'site_subscribe'
+                        ) ),
+                        'link_class'        => 'site-button subscribe',
+                        'link_text'         => __( 'Subscribe', 'buddypress' ),
+                );
+        } else {
+                $link_text = __( 'Unsubscribe', 'buddypress' );
+
+                // To avoid any confusion
+                if ( ! empty( $site->is_contributor ) ) {
+                        $link_text = __( 'Leave', 'buddypress' );
+                }
+
+                $end_button = array(
+                        'wrapper_class'     => 'site-button unsubscribe',
+                        'link_href'         => esc_url( wp_nonce_url(
+                                add_query_arg( 'action', 'unsubscribe', bp_blogs_get_site_community_url() ),
+                                'site_unsubscribe'
+                        ) ),
+                        'link_class'        => 'site-button unsubscribe confirm',
+                        'link_text'         => $link_text,
+                );
+        }
+
+        $button = array_merge( $start_button, $end_button );
+
+        /**
+         * Filter here to edit button arguments.
+         *
+         * @since  2.7.0
+         *
+         * @param  array  $button The Button arguments.
+         * @param  object $site   The site object.
+         */
+        return apply_filters( 'bp_get_site_subscribe_button_args', $button, $site );
+}
+
+/**
+ * Gets the Subscribe Button for the current site.
+ *
+ * @since  2.7.0
+ *
+ * @param  WP_Site|object $site The site object.
+ * @return string HTML Output.
+ */
+function bp_get_site_subscribe_button( $site = null ) {
+        return bp_get_button( bp_get_site_subscribe_button_args( $site ) );
+}
+
+/**
+ * Listen to the subscribe/unsubscribe actions and handle them.
+ *
+ * @since  2.7.0
+ */
+function bp_blogs_site_subscriptions_handle_actions() {
+        if ( empty( $_GET['action'] ) || ( 'subscribe' !== $_GET['action'] && 'unsubscribe' !== $_GET['action'] ) ) {
+                return;
+        }
+
+        $action = sanitize_key( $_GET['action'] );
+
+        check_admin_referer( 'site_' . $action );
+
+        $referer = wp_get_referer();
+        $result = array(
+                'message' => __( 'We were not able to perform this action, please try again later', 'buddypress' ),
+                'type'    => 'error',
+        );
+
+        if ( is_user_logged_in() && is_callable( 'bp_blogs_site_' . $action ) ) {
+                $result = call_user_func( 'bp_blogs_site_' . $action );
+        }
+
+        bp_core_add_message( $result['message'], $result['type'] );
+        bp_core_redirect( $referer );
+}
+add_action( 'bp_blogs_screen_site_home', 'bp_blogs_site_subscriptions_handle_actions' );
+
+/**
+ * Subscribes a user to a site.
+ *
+ * @since  2.7.0
+ *
+ * @param int $user_id The ID of the user.
+ * @param int $site_id The ID of the site.
+ * @return array       The feedback message and type.
+ */
+function bp_blogs_site_subscribe( $user_id = 0, $site_id = 0 ) {
+        if ( empty( $user_id ) ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        if ( empty( $site_id ) ) {
+                $site = bp_blogs_get_current_site();
+        } else {
+                $site = bp_blogs_get_site( $site_id );
+        }
+
+        // Default result
+        $result = array(
+                'message' => __( 'We were not able to perform this action, please try again later', 'buddypress' ),
+                'type'    => 'error',
+        );
+
+        if ( bp_disable_site_subscriptions() || empty( $site->blog_id ) || empty( $site->public ) || ! empty( $site->disallow_subscriptions ) ) {
+                return $result;
+        }
+
+        // First make sure not to add a user that is already a subscriber of the blog.
+        if ( bp_user_can( $user_id, 'read', array( 'site_id' => $site->blog_id ) ) ) {
+                $result['message'] = __( 'You already subcribed to this site.', 'buddypress' );
+                return $result;
+        }
+
+        /**
+         * Fires before the user subcribes to the site.
+         *
+         * @since 2.7.0
+         *
+         * @param int            $user_id the ID of the user.
+         * @param WP_Site|object $site    The Site object.
+         */
+        do_action( 'bp_blogs_before_site_subscribe', $user_id, $site );
+
+        $subscribed = add_user_to_blog( $site->blog_id, $user_id, 'subscriber' );
+
+        if ( is_wp_error( $subscribed ) ) {
+                $result = array(
+                        'message' => $subscribed->get_error_message(),
+                        'type'    => 'error',
+                );
+        } else {
+                // Update Site object
+                $site->is_member = true;
+
+                $result = array(
+                        'message' => __( 'You successfully subscribed to the site.', 'buddypress' ),
+                        'type'    => '',
+                );
+
+                /**
+                 * Fires after the user subcribed to the site.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param int            $user_id the ID of the user.
+                 * @param WP_Site|object $site    The Site object.
+                 */
+                do_action( 'bp_blogs_after_site_subscribed', $user_id, $site );
+        }
+
+        return $result;
+}
+
+/**
+ * Unsubscribes a user to a site.
+ *
+ * @since  2.7.0
+ *
+ * @param int $user_id The ID of the user.
+ * @param int $site_id The ID of the site.
+ * @return array       The feedback message and type.
+ */
+function bp_blogs_site_unsubscribe( $user_id = 0, $site_id = 0 ) {
+        if ( empty( $user_id ) ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        if ( empty( $site_id ) ) {
+                $site = bp_blogs_get_current_site();
+        } else {
+                $site = bp_blogs_get_site( $site_id );
+        }
+
+        // Default result
+        $result = array(
+                'message' => __( 'We were not able to perform this action, please try again later', 'buddypress' ),
+                'type'    => 'error',
+        );
+
+        if ( bp_disable_site_subscriptions() || empty( $site->blog_id ) || empty( $site->public ) || ! empty( $site->disallow_subscriptions ) ) {
+                return $result;
+        }
+
+        // First check the user is a subscriber.
+        if ( ! bp_user_can( $user_id, 'read', array( 'site_id' => $site->blog_id ) ) ) {
+                $result['message'] = __( 'You already unsubcribed to this site.', 'buddypress' );
+                return $result;
+        }
+
+        /**
+         * Fires before the user unsubscribes to the site.
+         *
+         * @since 2.7.0
+         *
+         * @param int            $user_id The ID of the user.
+         * @param WP_Site|object $site    The site object.
+         */
+        do_action( 'bp_blogs_before_site_unsubscribe', $user_id, $site );
+
+        $unsubscribed = remove_user_from_blog( $user_id, $site->blog_id );
+
+        if ( is_wp_error( $unsubscribed ) ) {
+                $result = array(
+                        'message' => $unsubscribed->get_error_message(),
+                        'type'    => 'error',
+                );
+        } else {
+                // Update Site object
+                $site->is_member = false;
+
+                $result = array(
+                        'message' => __( 'You successfully unsubscribed to the site.', 'buddypress' ),
+                        'type'    => 'success',
+                );
+
+                /**
+                 * Fires after the user unsubscribed to the site.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param int            $user_id The ID of the user.
+                 * @param WP_Site|object $site    The site object.
+                 */
+                do_action( 'bp_blogs_after_site_unsubscribed', $user_id, $site );
+        }
+
+        return $result;
+}
+

src/bp-blogs/site/template.php

@@ -237 +237 @@
  * @return string HTML Output.
  */
 function bp_site_primary_nav() {
+        /**
+         * Fires before the site primary nav
+         *
+         * (inside an <ul> tag)
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_before_site_primary_nav' );
+
         echo join( "\n", bp_get_site_nav( 'primary' ) );
+
+        /**
+         * Fires after the site primary nav
+         *
+         * (inside an <ul> tag)
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_after_site_primary_nav' );
 }
 
 /**
@@ -248 +266 @@
  * @return string HTML Output.
  */
 function bp_site_secondary_nav() {
+        /**
+         * Fires before the site secondary nav
+         *
+         * (inside an <ul> tag)
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_before_site_secondary_nav' );
+
         echo join( "\n", bp_get_site_nav( 'secondary' ) );
+
+        /**
+         * Fires after the site secondary nav
+         *
+         * (inside an <ul> tag)
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_after_site_secondary_nav' );
 }
 
 /**
@@ -297 +333 @@
 }
 
 /**
+ * Display the site name.
+ *
+ * @since  2.7.0
+ *
+ * @return string The site name.
+ */
+function bp_sitename() {
+        echo bp_get_sitename();
+}
+
+        /**
+         * Get the site name to display.
+         *
+         * @since  2.7.0
+         *
+         * @return string The site name.
+         */
+        function bp_get_sitename() {
+                return apply_filters( 'bp_get_sitename', bp_blogs_get_current_site_property( 'name' ) );
+        }
+
+/**
+ * Display the site description.
+ *
+ * @since  2.7.0
+ *
+ * @return string The site name.
+ */
+function bp_site_description() {
+        /**
+         * Fires before the site description
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_before_site_description' );
+
+        echo bp_get_site_description();
+
+        /**
+         * Fires after the site description
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_after_site_description' );
+}
+
+/**
+ * Get the site description to display.
+ *
+ * @since  2.7.0
+ *
+ * @return string The site description.
+ */
+function bp_get_site_description() {
+        return apply_filters( 'bp_get_site_description', bp_blogs_get_current_site_property( 'description' ) );
+}
+
+/**
+ * Display the site's avatar
+ *
+ * @since  2.7.0
+ *
+ * @return string The site's avatar.
+ */
+function bp_site_avatar() {
+        echo bp_blogs_get_site_avatar( array(
+                'item_id'   => bp_blogs_get_current_site_id(),
+                'type'      => 'full',
+                'site_name' => esc_attr( bp_get_sitename() ),
+        ) );
+}
+
+/**
+ * Display the admins in the site's header
+ *
+ * @since 2.7.0
+ *
+ * @return string HTML output
+ */
+function bp_site_list_admins() {
+        /**
+         * Fires before the site admins list
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_before_site_list_admins' );
+
+        echo bp_get_site_list_admins();
+
+        /**
+         * Fires after the site admins list
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_after_site_list_admins' );
+}
+        /**
+         * Get the admins list
+         *
+         * @since 2.7.0
+         *
+         * @return string HTML output
+         */
+        function bp_get_site_list_admins() {
+                $admins_list = bp_blogs_get_current_site_property( 'admins_list' );
+                $pre_output  = false;
+
+                /**
+                 * Use this filter if you need to override the content of the admins list
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param string  $pre_output The new content.
+                 * @param array   $site admins
+                 */
+                $pre_output = apply_filters( 'bp_pre_get_site_list_admins', $pre_output, $admins_list );
+                if ( false !== $pre_output ) {
+                        return $pre_output;
+                }
+
+                $output = '<h2>' . esc_html__( 'Site Admins', 'buddypress' ) . '</h2>';
+
+                if ( ! empty( $admins_list ) ) {
+                        $output .= '<ul id="site-admins">';
+
+                        foreach( (array) $admins_list as $admin ) {
+                                $output .= '<li>';
+
+                                if ( bp_disable_avatar_uploads() ) {
+                                        $output .= sprintf(
+                                                '<a href="%1$s" title="%2$s">%3$s</a>',
+                                                esc_url( bp_core_get_user_domain( $admin->ID, $admin->user_nicename, $admin->user_login ) ),
+                                                sprintf( esc_attr__( 'Profile of %s', 'buddypress' ), $admin->display_name ),
+                                                esc_html( $admin->user_nicename )
+                                        );
+                                } else {
+                                        $output .= sprintf(
+                                                '<a href="%1$s">%2$s</a>',
+                                                esc_url( bp_core_get_user_domain( $admin->ID, $admin->user_nicename, $admin->user_login ) ),
+                                                bp_core_fetch_avatar( array(
+                                                        'item_id' => esc_attr( $admin->ID ),
+                                                        'email'   => esc_attr( $admin->user_email ),
+                                                        'alt'     => sprintf( esc_attr__( 'Profile picture of %s', 'buddypress' ), $admin->display_name )
+                                                ) )
+                                        );
+                                }
+
+                                $output .= '</li>';
+                        }
+
+                        $output .= '</ul>';
+                } else {
+                        $output .= '<span class="activity">' . esc_html__( 'No Admins', 'buddypress' ) . '</span>';
+                }
+
+                return apply_filters( 'bp_get_site_list_admins', $output, $admins_list );
+        }
+
+/**
+ * Display action buttons inside the header of the current site.
+ *
+ * @since 2.7.0
+ *
+ * @return string HTML Output.
+ */
+function bp_site_header_actions() {
+        echo join( ' ', bp_get_site_header_actions() );
+}
+
+/**
+ * Checks if there are action buttons to display in the header of the current site.
+ *
+ * @since 2.7.0
+ *
+ * @return bool True if there are buttons. False otherwise.
+ */
+function bp_site_has_header_actions() {
+        $buttons = bp_get_site_header_actions();
+        return ! empty( $buttons );
+}
+
+        /**
+         * Returns the action buttons of the current site member in the loop.
+         *
+         * @since 2.7.0
+         *
+         * @return array List of BP Buttons to output.
+         */
+        function bp_get_site_header_actions() {
+                $bp = buddypress();
+
+                if ( ! empty( $bp->blogs->site->header_action_buttons ) ) {
+                        return $bp->blogs->site->header_action_buttons;
+                }
+
+                $bp->blogs->site->header_action_buttons = array(
+                        'visit' => bp_get_blogs_visit_blog_button( array( 'link_href' => bp_blogs_get_current_site_url() ) ),
+                );
+
+                // Add the join/leave button
+                if ( bp_blogs_current_site_can_subscribe() ) {
+                        $bp->blogs->site->header_action_buttons['subscrive_unsubscribe'] = bp_get_site_subscribe_button();
+                }
+
+                return apply_filters( 'bp_get_site_member_actions', $bp->blogs->site->header_action_buttons );
+        }
+
+/**
  * Template tag to allow plugins to add their
  * specific content.
  *
@@ -344 +588 @@
          */
         function bp_get_site_members_filters() {
                 $filters = apply_filters( 'bp_get_site_members_filters', array(
+                        'last_joined'  => __( 'Newest', 'buddypress' ),
+                        'first_joined' => __( 'Oldest', 'buddypress' ),
                         'active'       => __( 'Last Active', 'buddypress' ),
-                        'alphabetical' => __( 'Alphabetical', 'buddypress' )
+                        'alphabetical' => __( 'Alphabetical', 'buddypress' ),
                 ) );
 
                 if ( isset( $filters['alphabetical'] ) && ! bp_is_active( 'xprofile' ) ) {
@@ -355 +601 @@
                 $output = '';
 
                 foreach ( $filters as $kfilter => $vfilter ) {
-                        $output .= sprintf( '<option value="%1$s">%2$s</option>', $kfilter, $vfilter ) . "\n";
+                        $output .= sprintf( '<option value="%1$s">%2$s</option>', $kfilter, esc_html( $vfilter ) ) . "\n";
                 }
 
                 return $output;
@@ -392 +638 @@
         $bp->blogs->site->members = new stdClass;
 
         $is_contributor = null;
-        if ( bp_is_site_manage_screen( 'members' ) ) {
-                $is_contributor = 0;
+        if ( bp_is_site_manage_members() ) {
+                $involvement_type = bp_action_variable( 1 );
+
+                if ( 'contributors' === $involvement_type ) {
+                        $is_contributor = 1;
+                } elseif ( 'subscribers' === $involvement_type ) {
+                        $is_contributor = 0;
+                }
         }
 
         $bp->blogs->site->members->loop_args = bp_parse_args( $args, array(
                 'blog_id'         => bp_blogs_get_current_site_id(), // Only return users recorded for the site.
                 'is_contributor'  => $is_contributor,                // Null to get all site members, 1 for contributors and 0 for subscribers
-                'type'            => 'active',
+                'type'            => 'newest',
                 'page'            => 1,
                 'per_page'        => 20,
                 'page_arg'        => 'site_page',
@@ -408 +660 @@
 
         // Set up our query construct hook & populate_extras hook
         add_action( 'bp_pre_user_query_construct',   'bp_blogs_set_site_user_query',             10, 1 );
+        add_action( 'bp_pre_user_query',             'bp_blogs_pre_site_user_query',             10, 1 );
         add_action( 'bp_user_query_populate_extras', 'bp_blogs_user_query_site_populate_extras', 10, 1 );
 
         if ( ! empty( $GLOBALS['members_template'] ) ) {
@@ -425 +678 @@
 
         // Remove hooks
         remove_action( 'bp_pre_user_query_construct',   'bp_blogs_set_site_user_query',             10, 1 );
+        remove_action( 'bp_pre_user_query',             'bp_blogs_pre_site_user_query',             10, 1 );
         remove_action( 'bp_user_query_populate_extras', 'bp_blogs_user_query_site_populate_extras', 10, 1 );
 
         // Return the has members bool.
@@ -744 +998 @@
                 $screen  = 'members';
 
                 // Manage actions for the manage-members screen
-                if ( bp_is_site_manage_screen( 'members' ) ) {
+                if ( bp_is_site_manage_members() ) {
                         $screen      = 'manage-members';
                         $involvement = (int) $members_template->member->is_contributor;
 
-                        $members_template->member->action_buttons['remove'] = bp_get_site_manage_member_button( $user_id, $involvement );
+                        $members_template->member->action_buttons = array(
+                                'involve' => bp_get_site_involvement_member_button(),
+                                'remove'  => bp_get_site_remove_member_button(),
+                        );
 
                 // Regular actions for members screen.
                 } else {
@@ -761 +1018 @@
         }
 
 /**
- * Output the button to manage the member of the site.
+ * Output the button to remove the member of the site.
  *
  * @see BP_Button for a the description of arguments and return
  *      value.
  *
  * @since  2.7.0
- *
- * @param  int $user_id     The ID of the user to manage
- * @param  int $involvement The level of involvement of the user (Only Subscriber for now).
  */
-function bp_site_manage_member_button( $user_id = 0, $involvement = 0 ) {
-        echo bp_get_site_manage_member_button( $user_id, $involvement );
+function bp_site_remove_member_button() {
+        echo bp_get_site_remove_member_button();
 }
 
         /**
-         * Get the arguments of the site's community button.
+         * Get the arguments of the remove site member button.
          *
          * @since  2.7.0
-         *
-         * @param  int $user_id     The ID of the user to manage
-         * @param  int $involvement The level of involvement of the user (Only Subscriber for now).
          */
-        function bp_get_site_manage_member_button_args( $user_id, $involvement ) {
-                if ( empty( $user_id ) ) {
-                        return;
+        function bp_get_site_remove_member_button_args() {
+                $members_template = buddypress()->blogs->site->members->template;
+
+                if ( empty( $members_template->member ) || ! empty( $members_template->member->is_admin ) ) {
+                        return false;
                 }
 
                 $button = array(
+                        'id'                => 'remove_member',
                         'component'         => 'blogs',
                         'must_be_logged_in' => true,
-                        'block_self'        => false,
+                        'block_self'        => true,
+                        'wrapper_class'     => 'site-button remove',
+                        'link_href'         => wp_nonce_url( bp_blogs_get_site_community_url() .  'manage/members/remove/' . $members_template->member->id . '/', 'site_remove_member' ),
+                        'link_class'        => 'site-button remove confirm',
+                        'link_text'         => __( 'Remove', 'buddypress' ),
+                );
+
+                /**
+                 * Filter here to edit button arguments.
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param  array  $button The Button arguments.
+                 * @param  object $value  The site member object.
+                 */
+                return apply_filters( 'bp_get_site_remove_member_button_args', $button, $members_template->member );
+        }
+        /**
+         * Return button to remove the member from the site
+         *
+         * @see BP_Button for a the description of arguments and return
+         *      value.
+         *
+         * @since  2.7.0
+         * @return string The HTML for the Manage button.
+         */
+        function bp_get_site_remove_member_button() {
+                // Make sure the block self button will do its job.
+                add_filter( 'bp_get_member_user_id', 'bp_get_site_member_user_id' );
+
+                $button = bp_get_button( bp_get_site_remove_member_button_args() );
+
+                remove_filter( 'bp_get_member_user_id', 'bp_get_site_member_user_id' );
+
+                return $button;
+        }
+
+/**
+ * Output the button to promote the member to contributor or demote him to subscriber.
+ *
+ * @see BP_Button for a the description of arguments and return
+ *      value.
+ *
+ * @since  2.7.0
+ */
+function bp_site_involvement_member_button() {
+        echo bp_get_site_involvement_member_button();
+}
+
+        /**
+         * Get the arguments of the site member involvement button.
+         *
+         * @since  2.7.0
+         */
+        function bp_get_site_involvement_member_button_args() {
+                $members_template = buddypress()->blogs->site->members->template;
+
+                if ( empty( $members_template->member ) || ! empty( $members_template->member->is_admin ) ) {
+                        return false;
+                }
+
+                $start_button = array(
+                        'id'                => 'toggle_involvment',
+                        'component'         => 'blogs',
+                        'must_be_logged_in' => true,
+                        'block_self'        => true,
                 );
 
-                switch ( $involvement ) {
-                        case 1 :
-                                return;
-                                break;
-                        case 0 :
-                        default  :
-                                $button = array_merge( $button, array(
-                                        'id'                => 'remove_member',
-                                        'wrapper_class'     => 'site-button remove',
-                                        'link_href'         => wp_nonce_url( bp_blogs_get_site_community_url() .  'manage/members/remove/' . $user_id . '/', 'site_remove_member' ),
-                                        'link_class'        => 'site-button remove',
-                                        'link_text'         => __( 'Remove', 'buddypress' ),
-                                ) );
-
-                                break;
+                if ( 1 === (int) $members_template->member->is_contributor ) {
+                        $end_button = array(
+                                'wrapper_class'     => 'site-button demote',
+                                'link_href'         => wp_nonce_url( bp_blogs_get_site_community_url() .  'manage/members/demote/' . $members_template->member->id . '/', 'site_demote_member' ),
+                                'link_class'        => 'site-button demote confirm',
+                                'link_text'         => __( 'Demote to Subscriber', 'buddypress' ),
+                        );
+                } else {
+                        $end_button = array(
+                                'wrapper_class'     => 'site-button promote',
+                                'link_href'         => wp_nonce_url( bp_blogs_get_site_community_url() .  'manage/members/promote/' . $members_template->member->id . '/', 'site_promote_member' ),
+                                'link_class'        => 'site-button promote',
+                                'link_text'         => __( 'Promote to Contributor', 'buddypress' ),
+                        );
                 }
 
-                return apply_filters( 'bp_get_site_manage_member_button_args', $button );
+                $button = array_merge( $start_button, $end_button );
+
+                /**
+                 * Filter here to edit button arguments.
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param  array  $button The Button arguments.
+                 * @param  object $value  The site member object.
+                 */
+                return apply_filters( 'bp_get_site_involvement_member_button_args', $button, $members_template->member );
         }
         /**
-         * Return button to manage the member of the site
+         * Return button to promote or demote the member of the site.
          *
          * @see BP_Button for a the description of arguments and return
          *      value.
          *
          * @since  2.7.0
+         * @return string The HTML for the button.
+         */
+        function bp_get_site_involvement_member_button() {
+                // Make sure the block self button will do its job.
+                add_filter( 'bp_get_member_user_id', 'bp_get_site_member_user_id' );
+
+                $button = bp_get_button( bp_get_site_involvement_member_button_args() );
+
+                remove_filter( 'bp_get_member_user_id', 'bp_get_site_member_user_id' );
+
+                return $button;
+        }
+
+/**
+ * Output Links to filter members according to their involvement levels.
+ *
+ * @since  2.7.0
+ *
+ * @return string HTML output.
+ */
+function bp_site_manage_members_subnav() {
+        echo join( "\n", bp_get_site_manage_members_subnav() );
+}
+
+        /**
+         * Get the links to filter members according to their involvement levels.
          *
-         * @param  int $user_id     The ID of the user to manage
-         * @param  int $involvement The level of involvement of the user (Only Subscriber for now).
-         * @return string The HTML for the Manage button.
+         * @since  2.7.0
+         *
+         * @return array The list of tabs.
          */
-        function bp_get_site_manage_member_button( $user_id = 0, $involvement = 0 ) {
-                return bp_get_button( bp_get_site_manage_member_button_args( $user_id, $involvement ) );
+        function bp_get_site_manage_members_subnav() {
+                /**
+                 * Filter here to disable/edit the links
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param array The list of BuddyPress involvement levels.
+                 */
+                $involvement_types = apply_filters( 'bp_get_site_involvement_types', array(
+                        'all'          => __( 'All Members', 'buddypress' ),
+                        'contributors' => __( 'Contributors', 'buddypress' ),
+                        'subscribers'  => __( 'Subscribers', 'buddypress' ),
+                ) );
+
+                $output = array();
+
+                if ( empty( $involvement_types ) ) {
+                        return $output;
+                }
+
+                $current_action = bp_action_variable( 1 );
+
+                foreach ( $involvement_types as $type => $label ) {
+                        $selected = '';
+                        $link     = trailingslashit( bp_blogs_get_site_community_url() . 'manage/members' );
+
+                        if ( ! $current_action && 'all' === $type || $current_action === $type ) {
+                                $selected = ' current selected';
+                        }
+
+
+                        if ( 'all' !== $type ) {
+                                $link .= trailingslashit( $type );
+                        }
+
+                        $output[ $type ] = sprintf( '<li class="site-members-%1$s%2$s"><a href="%3$s" class="no-ajax">%4$s</a></li>',
+                                esc_attr( $type ),
+                                $selected,
+                                esc_url( $link ),
+                                esc_html( $label )
+                        );
+                }
+
+                /**
+                 * Filter here to edit the output
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param array An associative array containing the links to filter the members
+                 *              according to their involvement levels.
+                 */
+                return apply_filters( 'bp_get_site_manage_members_subnav', $output, $involvement_types );
         }
+
+/**
+ * Get the site name to edit inside the settings screen.
+ *
+ * @since  2.7.0
+ *
+ * @return string The site name.
+ */
+function bp_get_site_name_editable() {
+        return apply_filters( 'bp_get_site_name_editable', bp_blogs_get_current_site_property( 'name' ) );
+}
+
+/**
+ * Get the site description to edit inside the settings screen.
+ *
+ * @since  2.7.0
+ *
+ * @return string The site description.
+ */
+function bp_get_site_description_editable() {
+        return apply_filters( 'bp_get_site_description_editable', bp_blogs_get_current_site_property( 'description' ) );
+}
+
+/**
+ * Can users subscribe to this site?
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if users can subscribe. False otherwise.
+ */
+function bp_site_can_subscribe() {
+        return bp_blogs_current_site_can_subscribe();
+}
+
+/**
+ * Output custom setting fields in the site's settings screen.
+ *
+ * @see bp_blogs_register_site_settings() to register your custom settings.
+ * NB: make sure to use a name attribute looking like this `bp_site[option_name]`
+ * for the input used in your display function.
+ *
+ * @since  2.7.0
+ *
+ * @return string HTML output.
+ */
+function bp_site_plugin_settings() {
+        $plugin_settings = bp_blogs_get_site_settings();
+
+        if ( empty( $plugin_settings ) ) {
+                return;
+        }
+
+        foreach ( $plugin_settings as $plugin_setting ) {
+                if ( empty( $plugin_setting->display_function ) || ! is_callable( $plugin_setting->display_function ) ) {
+                        continue;
+                }
+
+                add_action( 'bp_site_plugin_settings_output', $plugin_setting->display_function );
+        }
+
+        printf( "<fieldset class=\"site-other-settings\">\n<legend>%s</legend>\n", esc_html__( 'Other settings', 'buddypress' ) );
+
+        do_action( 'bp_site_plugin_settings_output' );
+
+        print( "\n<fieldset>\n" );
+}

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

@@ -262 +262 @@
  * Disable front-end site subscriptions.
  *
  * @since 2.7.0
- *
  */
 function bp_admin_setting_callback_blog_subscriptions() {
 ?>
@@ -273 +272 @@
 <?php
 }
 
+/**
+ * Disable the site's avatar uploads
+ *
+ * @since 2.7.0
+ */
+function bp_admin_setting_callback_blog_avatar_uploads() {
+?>
+
+        <input id="bp-disable-site-avatar-uploads" name="bp-disable-site-avatar-uploads" type="checkbox" value="1" <?php checked( ! bp_disable_site_avatar_uploads() ); ?> />
+        <label for="bp-disable-site-avatar-uploads"><?php _e( 'Allow customizable avatars for sites', 'buddypress' ); ?></label>
+<?php
+}
+
 /** Settings Page *************************************************************/
 
 /**
@@ -341 +353 @@
                         'bp-disable-group-cover-image-uploads',
                         'bp_disable_blogforum_comments',
                         'bp-disable-site-subscriptions',
+                        'bp-disable-site-avatar-uploads',
                         'bp-disable-profile-sync',
                         'bp_restrict_group_creation',
                         'hide-loggedout-adminbar',

src/bp-core/bp-core-avatars.php

@@ -566 +566 @@
 
         // By default, Gravatar is not pinged for groups.
         if ( null === $params['no_grav'] ) {
-                $params['no_grav'] = 'group' === $params['object'];
+                $params['no_grav'] = 'group' === $params['object'] || 'blog' === $params['object'];
         }
 
         /**

src/bp-core/bp-core-options.php

@@ -73 +73 @@
                 // Disallow members to subscribe to sites.
                 'bp-disable-site-subscriptions'        => false,
 
+                // Blog Profile Photos
+                'bp-disable-site-avatar-uploads'       => false,
+
                 // The ID for the current theme package.
                 '_bp_theme_package_id'                 => 'legacy',
 
@@ -721 +724 @@
 }
 
 /**
+ * Are site avatars disabled?
+ *
+ * @since 2.7.0
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *                      Defaults: False.
+ * @return bool True if site avatar uploads are disabled, otherwise false.
+ */
+function bp_disable_site_avatar_uploads( $default = false ) {
+        /**
+         * Filters whether or not members are able to upload site avatars.
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param bool $disabled Whether or not members are able to upload their site avatars.
+         * @param bool $default  Default value passed to the function.
+         */
+        return (bool) apply_filters( 'bp_disable_site_avatar_uploads', (bool) bp_get_option( 'bp-disable-site-avatar-uploads', $default ) );
+}
+
+/**
  * Is group creation turned off?
  *
  * @since 1.6.0

src/bp-core/bp-core-template.php

@@ -2356 +2356 @@
 }
 
 /**
+ * Is the current page a user's Blogs activity stream?
+ *
+ * Eg http://example.com/members/joe/activity/blogs/
+ *
+ * @since 2.7.0
+ *
+ * @return bool True if the current page is a user's Groups activity stream.
+ */
+function bp_is_user_blogs_activity() {
+
+        if ( ! bp_is_active( 'blogs' ) ) {
+                return false;
+        }
+
+        $slug = 'blogs';
+        if ( bp_get_blogs_slug() ) {
+                $slug = bp_get_blogs_slug();
+        }
+
+        if ( bp_is_user_activity() && bp_is_current_action( $slug ) ) {
+                return true;
+        }
+
+        return false;
+}
+
+/**
  * Is the current page part of a user's extended profile?
  *
  * Eg http://example.com/members/joe/profile/ (or a subpage thereof).
@@ -2997 +3024 @@
 }
 
 /**
+ * Is the current page a the manage members screen?
+ *
+ * @since 2.7.0
+ *
+ * @return bool
+ */
+function bp_is_site_manage_members() {
+        return bp_is_site_manage_screen( 'members' );
+}
+
+/**
+ * Is the current page a the manage settings screen?
+ *
+ * @since 2.7.0
+ *
+ * @return bool
+ */
+function bp_is_site_manage_settings() {
+        return bp_is_site_manage_screen( 'settings' );
+}
+
+/**
  * What is the current site manage action?
  *
  * @since 2.7.0

src/bp-core/classes/class-bp-admin.php

@@ -478 +478 @@
                         // Add the main section.
                         add_settings_section( 'bp_blogs', __( 'Sites Settings', 'buddypress' ), 'bp_admin_setting_callback_blogs_section', 'buddypress' );
 
-                        // Activity commenting on blog and forum posts.
+                        // Disable site subscriptions.
                         add_settings_field( 'bp-disable-site-subscriptions', __( 'Site subscriptions.', 'buddypress' ), 'bp_admin_setting_callback_blog_subscriptions', 'buddypress', 'bp_blogs' );
                         register_setting( 'buddypress', 'bp-disable-site-subscriptions', 'intval' );
+
+                        // Disable site avatars
+                        add_settings_field( 'bp-disable-site-avatar-uploads', __( 'Site Photo Uploads', 'buddypress' ), 'bp_admin_setting_callback_blog_avatar_uploads', 'buddypress', 'bp_blogs' );
+                        register_setting( 'buddypress', 'bp-disable-site-avatar-uploads', 'intval' );
                 }
         }
 

src/bp-core/images/mystery-site.svg

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20" viewBox="0 0 20 20">
+<rect x="0" y="0" width="20" height="20" fill="#fff"/><g fill="#ccc"><g><path d="M18 14v-10c0-0.55-0.45-1-1-1h-14c-0.55 0-1 0.45-1 1v10c0 0.55 0.45 1 1 1h14c0.55 0 1-0.45 1-1zM10 6c2.3 0 4.4 1.14 6 3-1.6 1.86-3.7 3-6 3s-4.4-1.14-6-3c1.6-1.86 3.7-3 6-3zM12 9c0-1.1-0.9-2-2-2s-2 0.9-2 2 0.9 2 2 2 2-0.9 2-2zM14 17h3v1h-14v-1h3v-1h8v1z"></path></g></g>
+</svg>

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -681 +681 @@
         }
 
         if ( ! empty( $_BP_COOKIE['bp-' . $object . '-scope'] ) ) {
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
+
                 if ( 'personal' == $_BP_COOKIE['bp-' . $object . '-scope'] ) {
-                        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
                         $qs[] = 'user_id=' . $user_id;
+
+                // Blogs directory, list sites the user subscribed to
+                } elseif ( 'blogs' === $object && 'subscriptions' === $_BP_COOKIE['bp-' . $object . '-scope'] ) {
+                        $qs[] = 'user_id=' . $user_id;
+                        $qs[] = 'is_contributor=0';
                 }
 
                 // Activity stream scope only on activity directory.

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

@@ -124 +124 @@
 
                                 <?php endif; ?>
 
+                                <?php if ( bp_is_active( 'blogs' ) && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
+
+                                        <li id="activity-blogs"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_blogs_slug() . '/'; ?>" title="<?php esc_attr_e( 'The activity of sites I contribute to.', 'buddypress' ); ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+
+                                <?php endif; ?>
+
                         <?php endif; ?>
 
                         <?php

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

@@ -58 +58 @@
 
                                 <?php endif; ?>
 
+                                <?php if ( bp_blogs_is_site_subscriptions_active() && is_user_logged_in() && bp_get_total_site_subscriptions_for_user( bp_loggedin_user_id() ) ) : ?>
+
+                                        <li id="blogs-subscriptions"><a href="<?php echo esc_url( bp_loggedin_user_domain() . bp_get_blogs_slug() . '/my-subscriptions/' ); ?>"><?php printf( __( 'My Subscriptions %s', 'buddypress' ), '<span>' . bp_get_total_site_subscriptions_for_user( bp_loggedin_user_id() ) . '</span>' ); ?></a></li>
+
+                                <?php endif; ?>
+
                                 <?php
 
                                 /**

src/bp-templates/bp-legacy/buddypress/blogs/single/home.php

@@ -13 +13 @@
 
 <div id="buddypress">
 
-        <?php do_action( 'template_notices' ); ?>
+        <div id="item-header" role="complementary">
+
+                <?php bp_get_template_part( 'blogs/single/site-header' ); ?>
+
+        </div><!-- #item-header -->
 
         <div id="item-nav">
                 <div class="item-list-tabs no-ajax" id="object-nav" role="navigation">

src/bp-templates/bp-legacy/buddypress/blogs/single/manage.php

@@ -20 +20 @@
 </div>
 
 <?php switch ( bp_site_get_manage_action() ) :
+        case 'settings'  :
+                bp_get_template_part( 'blogs/single/manage/settings' );
+                break;
         case 'members'   :
                 bp_get_template_part( 'blogs/single/members' );
                 break;

src/bp-templates/bp-legacy/buddypress/blogs/single/manage/edit-avatar.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Site Edit Avatar
+ *
+ * @since  2.7.0
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>

src/bp-templates/bp-legacy/buddypress/blogs/single/manage/edit-cover-image.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Site Edit Cover Image
+ *
+ * @since  2.7.0
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+ No newline at end of file

src/bp-templates/bp-legacy/buddypress/blogs/single/manage/settings.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Site Manage settings
+ *
+ * @since  2.7.0
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<form action="" method="post" class="standard-form" id="settings-form">
+
+        <fieldset class="site-general-settings">
+
+                <legend><?php esc_html_e( 'General', 'buddypress' ); ?></legend>
+
+                <label for="site_name"><?php esc_html_e( 'Site Name (required)', 'buddypress' ); ?></label>
+                <input type="text" name="bp_site[blogname]" id="site_name" value="<?php echo esc_attr( bp_get_site_name_editable() ); ?>" class="settings-input" />
+
+                <label for="site_description"><?php esc_html_e( 'Site Description', 'buddypress' ); ?></label>
+                <input type="text" name="bp_site[blogdescription]" id="site_description" value="<?php echo esc_attr( bp_get_site_description_editable() ); ?>" class="settings-input" />
+
+                <label for="site_public">
+                        <input type="checkbox" name="bp_site[blog_public]" id="site_public" value="1" <?php checked( true, bp_site_is_public() ); ?> />
+                        <?php esc_html_e( 'Public site', 'buddypress' ); ?>
+                </label>
+                <p class="description"><?php esc_html_e( 'If you choose to deactivate this option, post types tracking and subscriptions will not be available for your site.', 'buddypress' ); ?></p>
+
+                <?php if ( bp_site_is_public() ) : ?>
+                        <label for="site_disallow_subscriptions">
+                                <input type="checkbox" name="bp_site[disallow_subscriptions]" id="site_disallow_subscriptions" value="1" <?php checked( true, ! bp_site_can_subscribe() ); ?> />
+                                <?php esc_html_e( 'Disallow subscriptions', 'buddypress' ); ?>
+                        </label>
+                        <p class="description"><?php esc_html_e( 'Subscriptions are only available for public sites', 'buddypress' ); ?></p>
+                <?php endif ; ?>
+
+        </fieldset>
+
+        <?php bp_site_plugin_settings(); ?>
+
+        <div class="submit">
+                <input type="submit" name="bp_site[submit]" value="<?php esc_attr_e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
+        </div>
+
+        <?php wp_nonce_field( 'site_manage_settings' ); ?>
+
+</form>

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

@@ -15 +15 @@
 
         <div class="item-list-tabs" id="subnav" role="navigation">
                 <ul>
+                        <?php if ( bp_is_site_manage_members() ) :
+
+                                bp_site_manage_members_subnav();
+
+                        endif; ?>
+
                         <li id="site_members-order-select" class="last filter">
                                 <label for="site_members-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
                                 <select id="site_members-order-by">

src/bp-templates/bp-legacy/buddypress/blogs/single/site-header.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Site Manage settings
+ *
+ * @since  2.7.0
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<div id="item-actions">
+
+        <?php if ( bp_site_has_access() ) : ?>
+
+                <?php bp_site_list_admins();
+
+        endif; ?>
+
+</div><!-- #item-actions -->
+
+<?php if ( ! bp_disable_site_avatar_uploads() ) : ?>
+        <div id="item-header-avatar">
+                <a href="<?php echo esc_url( bp_blogs_get_site_community_url() ); ?>" title="<?php echo esc_attr( bp_get_sitename() ); ?>">
+
+                        <?php bp_site_avatar(); ?>
+
+                </a>
+        </div><!-- #item-header-avatar -->
+<?php endif; ?>
+
+<div id="item-header-content">
+
+        <div id="item-meta">
+
+                <?php bp_site_description(); ?>
+
+                <?php if ( bp_site_has_header_actions() ) : ?>
+                        <div id="item-buttons">
+
+                                <?php bp_site_header_actions() ;?>
+
+                        </div><!-- #item-buttons -->
+                <?php endif; ?>
+
+        </div>
+
+</div><!-- #item-header-content -->
+
+<?php
+
+/** This action is documented in bp-templates/bp-legacy/buddypress/activity/index.php */
+do_action( 'template_notices' ); ?>

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

@@ -34 +34 @@
         </ul>
 </div><!-- .item-list-tabs -->
 
+<?php if ( bp_is_user_blogs_activity() ) :
+
+        bp_get_template_part( 'members/single/blogs/site-tabs' );
+
+endif; ?>
+
 <?php
 
 /**

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

@@ -8 +8 @@
 
 ?>
 
-<div class="item-list-tabs" id="subnav" role="navigation">
+<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
         <ul>
 
                 <?php bp_get_options_nav(); ?>
@@ -39 +39 @@
 switch ( bp_current_action() ) :
 
         // Home/My Blogs
-        case 'my-sites' :
+        case 'my-sites'         :
+        case 'my-subscriptions' :
 
                 /**
                  * Fires before the display of member blogs content.

src/bp-templates/bp-legacy/buddypress/members/single/blogs/site-tabs.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress - Site Tabs
+ *
+ * @since  2.7.0
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<div class="item-list-tabs no-ajax" id="subsubnav" role="navigation">
+        <ul>
+
+                <?php bp_blogs_member_tabs(); ?>
+
+        </ul>
+</div><!-- .item-list-tabs -->

tests/phpunit/testcases/blogs/site.php

@@ -35 +35 @@
                 }
 
                 $this->set_current_user( $this->current_user );
+
+                /**
+                 * Workaround till #7150 is fixed
+                 *
+                 * @see https://buddypress.trac.wordpress.org/ticket/7150
+                 */
+                $bp_pages = array_keys( bp_get_option( 'bp-pages' ) );
+                if ( ! isset( $bp_pages['blogs'] ) && bp_is_active( 'blogs' ) ) {
+                        bp_core_add_root_component( 'blogs' );
+                        bp_core_create_root_component_page();
+                }
+
+                add_action( 'bp_init', array( $this, 'set_early_setting' ) );
+                add_action( 'bp_blogs_setup_site_globals', array( $this, 'set_site_settings' ) );
         }
 
         public function tearDown() {
                 parent::tearDown();
 
                 $this->set_current_user( $this->old_user );
+
+                remove_action( 'bp_init', array( $this, 'set_early_setting' ) );
+                remove_action( 'bp_blogs_setup_site_globals', array( $this, 'set_site_settings' ) );
         }
 
         /**
@@ -76 +93 @@
                         remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
                 }
         }
+
+        public function set_early_setting() {
+                bp_blogs_register_site_settings( 'foobar', array(
+                        'display_function' => 'foobar_display',
+                        'sanitize_function' => 'foobar_sanitize',
+                ) );
+        }
+
+        public function set_site_settings() {
+                bp_blogs_register_site_settings( 'barfoo', array(
+                        'display_function' => 'barfoo_display',
+                        'sanitize_function' => 'barfoo_sanitize',
+                ) );
+
+                bp_blogs_register_site_settings( 'name', array(
+                        'display_function' => 'name_display',
+                        'sanitize_function' => 'name_sanitize',
+                ) );
+        }
+
+        /**
+         * @group site_settings
+         */
+        public function test_bp_blogs_register_site_settings() {
+                $bp = buddypress();
+
+                $single_site = bp_blogs_get_site( 'foobar' );
+
+                $this->go_to( bp_blogs_get_site_community_url( $single_site->slug ) );
+
+                $this->assertNotEmpty( $bp->blogs->site->settings['barfoo'] );
+                $this->assertTrue( 1 === count( $bp->blogs->site->settings ) );
+        }
+
+        /**
+         * @group site_settings
+         */
+        public function test_bp_blogs_get_site_settings() {
+                $bp = buddypress();
+
+                $this->go_to( bp_blogs_get_site_community_url( 'barfoo' ) );
+
+                $this->assertNotEmpty( bp_blogs_get_site_settings( 'barfoo' ) );
+
+                $bp->blogs->site->settings['barfoo']->display_function = '';
+
+                $this->assertEmpty( bp_blogs_get_site_settings( 'barfoo' ) );
+        }
+
+        /**
+         * @group subscriptions
+         */
+        public function test_bp_blogs_site_subscribe() {
+                $bp = buddypress();
+
+                $u = $this->factory->user->create();
+
+                // Trying to subscribe to a private site
+                $result = bp_blogs_site_subscribe( $u, 'tazfoo' );
+                $this->assertTrue( 'error' === $result['type'] );
+
+                // Trying to subscribe to a site when subscription are disabled
+                add_filter( 'bp_disable_site_subscriptions', '__return_true' );
+
+                $result = bp_blogs_site_subscribe( $u, 'barfoo' );
+                $this->assertTrue( 'error' === $result['type'] );
+
+                remove_filter( 'bp_disable_site_subscriptions', '__return_true' );
+
+                // Trying to subscribe to a site when it disabled subscriptions
+                bp_blogs_update_blogmeta( $this->sites['bar']['id'], 'disallow_subscriptions', 1 );
+
+                $result = bp_blogs_site_subscribe( $u, 'barfoo' );
+                $this->assertTrue( 'error' === $result['type'] );
+
+                bp_blogs_delete_blogmeta( $this->sites['bar']['id'], 'disallow_subscriptions' );
+
+                // Finally subscribe to foobar!
+                $result = bp_blogs_site_subscribe( $u, 'foobar' );
+                $this->assertFalse( 'error' === $result['type'] );
+
+                $user_blogs = BP_Blogs_Blog::get_user_blog( $u, $this->sites['foo']['id'] );
+                $this->assertInternalType( 'integer', $user_blogs );
+        }
+
+        /**
+         * @group subscriptions
+         */
+        public function test_bp_blogs_site_unsubscribe() {
+                $bp = buddypress();
+
+                $u = $this->factory->user->create();
+
+                // Never subscribed!
+                $result = bp_blogs_site_unsubscribe( $u, 'foobar' );
+                $this->assertTrue( 'error' === $result['type'] );
+
+                add_user_to_blog( $this->sites['bar']['id'], $u, 'subscriber' );
+
+                $user_blogs = BP_Blogs_Blog::get_user_blog( $u, $this->sites['bar']['id'] );
+                $this->assertInternalType( 'integer', $user_blogs );
+
+                // Finally unsubscribe to barfoo!
+                $result = bp_blogs_site_unsubscribe( $u, 'barfoo' );
+                $this->assertFalse( 'error' === $result['type'] );
+
+                $user_blogs = BP_Blogs_Blog::get_user_blog( $u, $this->sites['bar']['id'] );
+                $this->assertEmpty( $user_blogs );
+        }
 }

tests/phpunit/testcases/blogs/template.php

@@ -384 +384 @@
                 $blogs_template->blog->blog_id = get_current_blog_id();
                 $blogs_template->blog->admin_user_id = $user->ID;
                 $blogs_template->blog->admin_user_email = $user->user_email;
+                $blogs_template->blog->name = 'Site name';
 
                 $actual = bp_get_blog_avatar( array(
                         'title' => 'Foo',
@@ -401 +402 @@
         /**
          * @ticket BP6519
          */
-        public function test_bp_blog_get_avatar_title_attribute_should_default_to_user_displayname() {
+        public function test_bp_blog_get_avatar_title_attribute_should_default_to_site_name() {
                 global $blogs_template;
 
                 if ( isset( $blogs_template ) ) {
@@ -415 +416 @@
                 $blogs_template->blog->blog_id = get_current_blog_id();
                 $blogs_template->blog->admin_user_id = $user->ID;
                 $blogs_template->blog->admin_user_email = $user->user_email;
+                $blogs_template->blog->name = 'Site name';
 
                 $actual = bp_get_blog_avatar();
 
@@ -424 +426 @@
                         unset( $blogs_template );
                 }
 
-                $this->assertContains( 'title="Profile picture of site author ' . bp_core_get_user_displayname( $user->ID ) . '"', $actual );
+                $this->assertContains( 'title="Site Photo of Site name"', $actual );
         }
 }