Ticket #37392: 37392.3.diff

src/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -160 +160 @@
                         $args['no_found_rows'] = false;
                 }
 
+                // Take into account the role the user has selected.
+                $status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
+                if ( in_array( $status, array( 'public', 'archived', 'mature', 'spam', 'deleted' ), true ) ) {
+                        $args[ $status ] = 1;
+                }
+
                 /**
                  * Filters the arguments for the site query in the sites list table.
                  *
@@ -201 +207 @@
                 _e( 'No sites found.' );
         }
 
+        /**
+         * Gets links to filter sites by status.
+         *
+         * @since 5.3.0
+         *
+         * @return array
+         *
+         */
+        protected function get_views() {
+                $counts = wp_count_sites();
+
+                $statuses = array(
+                        'all'      => _n_noop( 'All <span class="count">(%s)</span>', 'All <span class="count">(%1$s)</span>' ),
+                        'public'   => _n_noop( 'Public <span class="count">(%s)</span>', 'Public <span class="count">(%1$s)</span>' ),
+                        'archived' => _n_noop( 'Archived <span class="count">(%1$s)</span>', 'Archived <span class="count">(%1$s)</span>' ),
+                        'mature'   => _n_noop( 'Mature <span class="count">(%1$s)</span>', 'Mature <span class="count">(%1$s)</span>' ),
+                        'spam'     => _n_noop( 'Spam <span class="count">(%1$s)</span>', 'Spam <span class="count">(%1$s)</span>' ),
+                        'deleted'  => _n_noop( 'Deleted <span class="count">(%1$s)</span>', 'Deleted <span class="count">(%1$s)</span>' ),
+                );
+
+                $view_links       = array();
+                $requested_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
+                $url              = 'sites.php';
+
+                foreach ( $statuses as $status => $label_count ) {
+                        $current_link_attributes = $requested_status === $status || ( $requested_status === '' && 'all' === $status )
+                                ? ' class="current" aria-current="page"'
+                                : '';
+                        if ( (int) $counts[ $status ] > 0 ) {
+                                $label = sprintf( translate_nooped_plural( $label_count, $counts[ $status ] ), number_format_i18n( $counts[ $status ] ) );
+                                $full_url = 'all' === $status ? $url : add_query_arg( 'status', $status, $url );
+
+                                $view_links[ $status ] = sprintf(
+                                        '<a href="%1$s"%2$s>%3$s</a>',
+                                        esc_url( $full_url ),
+                                        $current_link_attributes,
+                                        $label
+                                );
+                        }
+                }
+
+                return $view_links;
+        }
+
         /**
          * @return array
          */

src/wp-admin/network/sites.php

@@ -369 +369 @@
 
 <hr class="wp-header-end">
 
+<?php $wp_list_table->views(); ?>
+
 <?php echo $msg; ?>
 
 <form method="get" id="ms-search" class="wp-clearfix">

src/wp-includes/ms-blogs.php

@@ -853 +853 @@
 
         update_posts_count();
 }
+
+/**
+ * Count number of sites grouped by site status.
+ *
+ * @since 5.3.0
+ *
+ * @param int $network_id The network to get counts for.  Default is the current network id.
+ * @return array Includes a grand total 'all' and an array of counts indexed by
+ *                status strings: public, archived, mature, spam, deleted.
+ */
+function wp_count_sites( $network_id = null ) {
+        if ( empty( $network_id ) ) {
+                $network_id = get_current_network_id();
+        }
+
+        $counts = array();
+        $args   = array(
+                'network_id'    => $network_id,
+                'number'        => 1,
+                'fields'        => 'ids',
+                'no_found_rows' => false,
+        );
+
+        $q             = new WP_Site_Query( $args );
+        $counts['all'] = $q->found_sites;
+
+        $_args    = $args;
+        $statuses = array( 'public', 'archived', 'mature', 'spam', 'deleted' );
+
+        foreach ( $statuses as $status ) {
+                $_args            = $args;
+                $_args[ $status ] = 1;
+
+                $q                 = new WP_Site_Query( $_args );
+                $counts[ $status ] = $q->found_sites;
+        }
+
+        return $counts;
+}

tests/phpunit/tests/multisite.php

@@ -34 +34 @@
                         $reg_blog = $wpdb->get_col( $wpdb->prepare( "SELECT email FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.blog_id = 1 AND IP LIKE %s", $ip ) );
                         $this->assertEquals( $user->user_email, $reg_blog[ count( $reg_blog ) - 1 ] );
                 }
+
+                /**
+                 * @ticket 37392
+                 */
+                function test_wp_count_sites() {
+                        // create a random number of sites with each status.
+                        $site_ids = array(
+                                'public'   => self::factory()->blog->create_many(
+                                        random_int( 0, 5 ),
+                                        array( 'meta' => array( 'public' => 1 ) )
+                                ),
+                                'archived' => self::factory()->blog->create_many(
+                                        random_int( 0, 5 ),
+                                        array( 'meta' => array( 'archived' => 1 ) )
+                                ),
+                                'mature'   => self::factory()->blog->create_many(
+                                        random_int( 0, 5 ),
+                                        array( 'meta' => array( 'mature' => 1 ) )
+                                ),
+                                'spam'     => self::factory()->blog->create_many(
+                                        random_int( 0, 5 ),
+                                        array( 'meta' => array( 'spam' => 1 ) )
+                                ),
+                                'deleted'  => self::factory()->blog->create_many(
+                                        random_int( 0, 5 ),
+                                        array( 'meta' => array( 'deleted' => 1 ) )
+                                ),
+                        );
+
+                        $counts = wp_count_sites();
+
+                        $counts_by_status = array_map( 'count', $site_ids );
+                        $expected        = array_merge(
+                                array( 'all' => array_sum( $counts_by_status ) ),
+                                $counts_by_status
+                        );
+                        // add 1 to all & public for the main site.
+                        $expected['all']    += 1;
+                        $expected['public'] += 1;
+
+                        $this->assertEquals( $expected, $counts );
+                }
         }
 
 endif;