diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/includes/class-wp-ms-sites-list-table.php
--- a/wp/wp-admin/includes/class-wp-ms-sites-list-table.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/class-wp-ms-sites-list-table.php Mon Oct 14 17:39:30 2019 +0200
@@ -1,41 +1,79 @@
status_list = array(
+ 'archived' => array( 'site-archived', __( 'Archived' ) ),
+ 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ),
+ 'deleted' => array( 'site-deleted', __( 'Deleted' ) ),
+ 'mature' => array( 'site-mature', __( 'Mature' ) )
+ );
+
parent::__construct( array(
'plural' => 'sites',
'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
) );
}
+ /**
+ *
+ * @return bool
+ */
public function ajax_user_can() {
return current_user_can( 'manage_sites' );
}
+ /**
+ * Prepares the list of sites for display.
+ *
+ * @since 3.1.0
+ *
+ * @global string $s
+ * @global string $mode
+ * @global wpdb $wpdb
+ */
public function prepare_items() {
global $s, $mode, $wpdb;
- $current_site = get_current_site();
-
- $mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
+ if ( ! empty( $_REQUEST['mode'] ) ) {
+ $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
+ set_user_setting( 'sites_list_mode', $mode );
+ } else {
+ $mode = get_user_setting( 'sites_list_mode', 'list' );
+ }
$per_page = $this->get_items_per_page( 'sites_network_per_page' );
@@ -44,13 +82,13 @@
$s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : '';
$wild = '';
if ( false !== strpos($s, '*') ) {
- $wild = '%';
+ $wild = '*';
$s = trim($s, '*');
}
/*
* If the network is large and a search is not being performed, show only
- * the latest blogs with no paging in order to avoid expensive count queries.
+ * the latest sites with no paging in order to avoid expensive count queries.
*/
if ( !$s && wp_is_large_network() ) {
if ( !isset($_REQUEST['orderby']) )
@@ -59,7 +97,11 @@
$_GET['order'] = $_REQUEST['order'] = 'DESC';
}
- $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
+ $args = array(
+ 'number' => intval( $per_page ),
+ 'offset' => intval( ( $pagenum - 1 ) * $per_page ),
+ 'network_id' => get_current_network_id(),
+ );
if ( empty($s) ) {
// Nothing to do.
@@ -68,74 +110,89 @@
preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
// IPv4 address
- $sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . $wild );
+ $sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
$reg_blog_ids = $wpdb->get_col( $sql );
- if ( !$reg_blog_ids )
- $reg_blog_ids = array( 0 );
-
- $query = "SELECT *
- FROM {$wpdb->blogs}
- WHERE site_id = '{$wpdb->siteid}'
- AND {$wpdb->blogs}.blog_id IN (" . implode( ', ', $reg_blog_ids ) . ")";
+ if ( $reg_blog_ids ) {
+ $args['site__in'] = $reg_blog_ids;
+ }
+ } elseif ( is_numeric( $s ) && empty( $wild ) ) {
+ $args['ID'] = $s;
} else {
- if ( is_numeric($s) && empty( $wild ) ) {
- $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.blog_id = %s )", $s );
- } elseif ( is_subdomain_install() ) {
- $blog_s = str_replace( '.' . $current_site->domain, '', $s );
- $blog_s = $wpdb->esc_like( $blog_s ) . $wild . $wpdb->esc_like( '.' . $current_site->domain );
- $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s );
- } else {
- if ( $s != trim('/', $current_site->path) ) {
- $blog_s = $wpdb->esc_like( $current_site->path . $s ) . $wild . $wpdb->esc_like( '/' );
- } else {
- $blog_s = $wpdb->esc_like( $s );
- }
- $query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.path LIKE %s )", $blog_s );
+ $args['search'] = $s;
+
+ if ( ! is_subdomain_install() ) {
+ $args['search_columns'] = array( 'path' );
}
}
$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
- if ( $order_by == 'registered' ) {
- $query .= ' ORDER BY registered ';
- } elseif ( $order_by == 'lastupdated' ) {
- $query .= ' ORDER BY last_updated ';
- } elseif ( $order_by == 'blogname' ) {
- if ( is_subdomain_install() )
- $query .= ' ORDER BY domain ';
- else
- $query .= ' ORDER BY path ';
- } elseif ( $order_by == 'blog_id' ) {
- $query .= ' ORDER BY blog_id ';
- } else {
- $order_by = null;
+ if ( 'registered' === $order_by ) {
+ // registered is a valid field name.
+ } elseif ( 'lastupdated' === $order_by ) {
+ $order_by = 'last_updated';
+ } elseif ( 'blogname' === $order_by ) {
+ if ( is_subdomain_install() ) {
+ $order_by = 'domain';
+ } else {
+ $order_by = 'path';
+ }
+ } elseif ( 'blog_id' === $order_by ) {
+ $order_by = 'id';
+ } elseif ( ! $order_by ) {
+ $order_by = false;
+ }
+
+ $args['orderby'] = $order_by;
+
+ if ( $order_by ) {
+ $args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
}
- if ( isset( $order_by ) ) {
- $order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
- $query .= $order;
+ if ( wp_is_large_network() ) {
+ $args['no_found_rows'] = true;
+ } else {
+ $args['no_found_rows'] = false;
}
- // Don't do an unbounded count on large networks
- if ( ! wp_is_large_network() )
- $total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+ /**
+ * Filters the arguments for the site query in the sites list table.
+ *
+ * @since 4.6.0
+ *
+ * @param array $args An array of get_sites() arguments.
+ */
+ $args = apply_filters( 'ms_sites_list_table_query_args', $args );
- $query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
- $this->items = $wpdb->get_results( $query, ARRAY_A );
+ $_sites = get_sites( $args );
+ if ( is_array( $_sites ) ) {
+ update_site_cache( $_sites );
- if ( wp_is_large_network() )
- $total = count($this->items);
+ $this->items = array_slice( $_sites, 0, $per_page );
+ }
+
+ $total_sites = get_sites( array_merge( $args, array(
+ 'count' => true,
+ 'offset' => 0,
+ 'number' => 0,
+ ) ) );
$this->set_pagination_args( array(
- 'total_items' => $total,
+ 'total_items' => $total_sites,
'per_page' => $per_page,
) );
}
+ /**
+ */
public function no_items() {
_e( 'No sites found.' );
}
+ /**
+ *
+ * @return array
+ */
protected function get_bulk_actions() {
$actions = array();
if ( current_user_can( 'delete_sites' ) )
@@ -147,6 +204,8 @@
}
/**
+ * @global string $mode List table view mode.
+ *
* @param string $which
*/
protected function pagination( $which ) {
@@ -154,36 +213,40 @@
parent::pagination( $which );
- if ( 'top' == $which )
+ if ( 'top' === $which )
$this->view_switcher( $mode );
}
+ /**
+ * @return array
+ */
public function get_columns() {
- $blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' );
$sites_columns = array(
'cb' => '',
- 'blogname' => $blogname_columns,
+ 'blogname' => __( 'URL' ),
'lastupdated' => __( 'Last Updated' ),
'registered' => _x( 'Registered', 'site' ),
- 'users' => __( 'Users' )
+ 'users' => __( 'Users' ),
);
- if ( has_filter( 'wpmublogsaction' ) )
+ if ( has_filter( 'wpmublogsaction' ) ) {
$sites_columns['plugins'] = __( 'Actions' );
+ }
/**
- * Filter the displayed site columns in Sites list table.
+ * Filters the displayed site columns in Sites list table.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param array $sites_columns An array of displayed site columns. Default 'cb',
* 'blogname', 'lastupdated', 'registered', 'users'.
*/
- $sites_columns = apply_filters( 'wpmu_blogs_columns', $sites_columns );
-
- return $sites_columns;
+ return apply_filters( 'wpmu_blogs_columns', $sites_columns );
}
+ /**
+ * @return array
+ */
protected function get_sortable_columns() {
return array(
'blogname' => 'blogname',
@@ -192,213 +255,305 @@
);
}
- public function display_rows() {
+ /**
+ * Handles the checkbox column output.
+ *
+ * @since 4.3.0
+ *
+ * @param array $blog Current site.
+ */
+ public function column_cb( $blog ) {
+ if ( ! is_main_site( $blog['blog_id'] ) ) :
+ $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+ ?>
+
+
+ array( 'site-archived', __( 'Archived' ) ),
- 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ),
- 'deleted' => array( 'site-deleted', __( 'Deleted' ) ),
- 'mature' => array( 'site-mature', __( 'Mature' ) )
- );
+ $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+ $blog_states = array();
+ reset( $this->status_list );
+
+ foreach ( $this->status_list as $status => $col ) {
+ if ( $blog[ $status ] == 1 ) {
+ $blog_states[] = $col[1];
+ }
+ }
+ $blog_state = '';
+ if ( ! empty( $blog_states ) ) {
+ $state_count = count( $blog_states );
+ $i = 0;
+ $blog_state .= ' — ';
+ foreach ( $blog_states as $state ) {
+ ++$i;
+ $sep = ( $i == $state_count ) ? '' : ', ';
+ $blog_state .= "$state$sep";
+ }
+ }
- if ( 'list' == $mode ) {
+ ?>
+
+
+
+
+ ';
+ printf(
+ /* translators: 1: site name, 2: site tagline. */
+ __( '%1$s – %2$s' ),
+ get_option( 'blogname' ),
+ '' . get_option( 'blogdescription ' ) . ''
+ );
+ echo '';
+ restore_current_blog();
+ }
+ }
+
+ /**
+ * Handles the lastupdated column output.
+ *
+ * @since 4.3.0
+ *
+ * @global string $mode List table view mode.
+ *
+ * @param array $blog Current site.
+ */
+ public function column_lastupdated( $blog ) {
+ global $mode;
+
+ if ( 'list' === $mode ) {
+ $date = __( 'Y/m/d' );
+ } else {
+ $date = __( 'Y/m/d g:i:s a' );
+ }
+
+ echo ( $blog['last_updated'] === '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+ }
+
+ /**
+ * Handles the registered column output.
+ *
+ * @since 4.3.0
+ *
+ * @global string $mode List table view mode.
+ *
+ * @param array $blog Current site.
+ */
+ public function column_registered( $blog ) {
+ global $mode;
+
+ if ( 'list' === $mode ) {
$date = __( 'Y/m/d' );
} else {
$date = __( 'Y/m/d g:i:s a' );
}
- foreach ( $this->items as $blog ) {
- $class = '';
- reset( $status_list );
+ if ( $blog['registered'] === '0000-00-00 00:00:00' ) {
+ echo '—';
+ } else {
+ echo mysql2date( $date, $blog['registered'] );
+ }
+ }
+
+ /**
+ * Handles the users column output.
+ *
+ * @since 4.3.0
+ *
+ * @param array $blog Current site.
+ */
+ public function column_users( $blog ) {
+ $user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
+ if ( ! $user_count ) {
+ $blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) );
+ $user_count = count( $blog_users );
+ unset( $blog_users );
+ wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
+ }
+
+ printf(
+ '%s',
+ esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
+ number_format_i18n( $user_count )
+ );
+ }
- $blog_states = array();
- foreach ( $status_list as $status => $col ) {
- if ( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
+ /**
+ * Handles the plugins column output.
+ *
+ * @since 4.3.0
+ *
+ * @param array $blog Current site.
+ */
+ public function column_plugins( $blog ) {
+ if ( has_filter( 'wpmublogsaction' ) ) {
+ /**
+ * Fires inside the auxiliary 'Actions' column of the Sites list table.
+ *
+ * By default this column is hidden unless something is hooked to the action.
+ *
+ * @since MU (3.0.0)
+ *
+ * @param int $blog_id The site ID.
+ */
+ do_action( 'wpmublogsaction', $blog['blog_id'] );
+ }
+ }
+
+ /**
+ * Handles output for the default column.
+ *
+ * @since 4.3.0
+ *
+ * @param array $blog Current site.
+ * @param string $column_name Current column name.
+ */
+ public function column_default( $blog, $column_name ) {
+ /**
+ * Fires for each registered custom column in the Sites list table.
+ *
+ * @since 3.1.0
+ *
+ * @param string $column_name The name of the column to display.
+ * @param int $blog_id The site ID.
+ */
+ do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
+ }
+
+ /**
+ *
+ * @global string $mode
+ */
+ public function display_rows() {
+ foreach ( $this->items as $blog ) {
+ $blog = $blog->to_array();
+ $class = '';
+ reset( $this->status_list );
+
+ foreach ( $this->status_list as $status => $col ) {
+ if ( $blog[ $status ] == 1 ) {
$class = " class='{$col[0]}'";
- $blog_states[] = $col[1];
}
}
- $blog_state = '';
- if ( ! empty( $blog_states ) ) {
- $state_count = count( $blog_states );
- $i = 0;
- $blog_state .= ' - ';
- foreach ( $blog_states as $state ) {
- ++$i;
- ( $i == $state_count ) ? $sep = '' : $sep = ', ';
- $blog_state .= "$state$sep";
- }
- }
+
echo "";
- $blogname = ( is_subdomain_install() ) ? str_replace( '.' . get_current_site()->domain, '', $blog['domain'] ) : $blog['path'];
-
- list( $columns, $hidden ) = $this->get_column_info();
-
- foreach ( $columns as $column_name => $column_display_name ) {
- $style = '';
- if ( in_array( $column_name, $hidden ) )
- $style = ' style="display:none;"';
-
- switch ( $column_name ) {
- case 'cb': ?>
- |
-
-
-
-
- |
-
-
-
- |
- "; ?>
-
- ' . sprintf( _x( '%1$s – %2$s', '%1$s: site name. %2$s: site tagline.' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '';
- restore_current_blog();
- }
-
- // Preordered.
- $actions = array(
- 'edit' => '', 'backend' => '',
- 'activate' => '', 'deactivate' => '',
- 'archive' => '', 'unarchive' => '',
- 'spam' => '', 'unspam' => '',
- 'delete' => '',
- 'visit' => '',
- );
-
- $actions['edit'] = '' . __( 'Edit' ) . '';
- $actions['backend'] = "" . __( 'Dashboard' ) . '';
- if ( get_current_site()->blog_id != $blog['blog_id'] ) {
- if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
- $actions['activate'] = '' . __( 'Activate' ) . '';
- else
- $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
-
- if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
- $actions['unarchive'] = '' . __( 'Unarchive' ) . '';
- else
- $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . '';
-
- if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
- $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . '';
- else
- $actions['spam'] = '' . _x( 'Spam', 'site' ) . '';
-
- if ( current_user_can( 'delete_site', $blog['blog_id'] ) )
- $actions['delete'] = '' . __( 'Delete' ) . '';
- }
-
- $actions['visit'] = "" . __( 'Visit' ) . '';
+ $this->single_row_columns( $blog );
- /**
- * Filter the action links displayed for each site in the Sites list table.
- *
- * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
- * default for each site. The site's status determines whether to show the
- * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
- * 'Not Spam' or 'Spam' link for each site.
- *
- * @since 3.1.0
- *
- * @param array $actions An array of action links to be displayed.
- * @param int $blog_id The site ID.
- * @param string $blogname Site path, formatted depending on whether it is a sub-domain
- * or subdirectory multisite install.
- */
- $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
- echo $this->row_actions( $actions );
- ?>
-
- ";
- echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); ?>
-
- ";
- if ( $blog['registered'] == '0000-00-00 00:00:00' )
- echo '—';
- else
- echo mysql2date( $date, $blog['registered'] );
- ?>
-
- ";
- $blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
- if ( is_array( $blogusers ) ) {
- $blogusers_warning = '';
- if ( count( $blogusers ) > 5 ) {
- $blogusers = array_slice( $blogusers, 0, 5 );
- $blogusers_warning = __( 'Only showing first 5 users.' ) . ' ' . __( 'More' ) . '';
- }
- foreach ( $blogusers as $user_object ) {
- echo '' . esc_html( $user_object->user_login ) . ' ';
- if ( 'list' != $mode )
- echo '( ' . $user_object->user_email . ' )';
- echo '
';
- }
- if ( $blogusers_warning != '' )
- echo '' . $blogusers_warning . '
';
- }
- ?>
-
-
- ";
- /**
- * Fires inside the auxiliary 'Actions' column of the Sites list table.
- *
- * By default this column is hidden unless something is hooked to the action.
- *
- * @since MU
- *
- * @param int $blog_id The site ID.
- */
- do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
-
- ";
- /**
- * Fires for each registered custom column in the Sites list table.
- *
- * @since 3.1.0
- *
- * @param string $column_name The name of the column to display.
- * @param int $blog_id The site ID.
- */
- do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
- echo "";
- break;
- }
- }
- ?>
-
- ';
}
}
+
+ /**
+ * Gets the name of the default primary column.
+ *
+ * @since 4.3.0
+ *
+ * @return string Name of the default primary column, in this case, 'blogname'.
+ */
+ protected function get_default_primary_column_name() {
+ return 'blogname';
+ }
+
+ /**
+ * Generates and displays row action links.
+ *
+ * @since 4.3.0
+ *
+ * @param object $blog Site being acted upon.
+ * @param string $column_name Current column name.
+ * @param string $primary Primary column name.
+ * @return string Row actions output.
+ */
+ protected function handle_row_actions( $blog, $column_name, $primary ) {
+ if ( $primary !== $column_name ) {
+ return;
+ }
+
+ $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+
+ // Preordered.
+ $actions = array(
+ 'edit' => '', 'backend' => '',
+ 'activate' => '', 'deactivate' => '',
+ 'archive' => '', 'unarchive' => '',
+ 'spam' => '', 'unspam' => '',
+ 'delete' => '',
+ 'visit' => '',
+ );
+
+ $actions['edit'] = '' . __( 'Edit' ) . '';
+ $actions['backend'] = "" . __( 'Dashboard' ) . '';
+ if ( get_network()->site_id != $blog['blog_id'] ) {
+ if ( $blog['deleted'] == '1' ) {
+ $actions['activate'] = '' . __( 'Activate' ) . '';
+ } else {
+ $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
+ }
+
+ if ( $blog['archived'] == '1' ) {
+ $actions['unarchive'] = '' . __( 'Unarchive' ) . '';
+ } else {
+ $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . '';
+ }
+
+ if ( $blog['spam'] == '1' ) {
+ $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . '';
+ } else {
+ $actions['spam'] = '' . _x( 'Spam', 'site' ) . '';
+ }
+
+ if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
+ $actions['delete'] = '' . __( 'Delete' ) . '';
+ }
+ }
+
+ $actions['visit'] = "" . __( 'Visit' ) . '';
+
+ /**
+ * Filters the action links displayed for each site in the Sites list table.
+ *
+ * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
+ * default for each site. The site's status determines whether to show the
+ * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
+ * 'Not Spam' or 'Spam' link for each site.
+ *
+ * @since 3.1.0
+ *
+ * @param array $actions An array of action links to be displayed.
+ * @param int $blog_id The site ID.
+ * @param string $blogname Site path, formatted depending on whether it is a sub-domain
+ * or subdirectory multisite installation.
+ */
+ $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
+ return $this->row_actions( $actions );
+ }
}