diff -r 7b1b88e27a20 -r 48c4eec2b7e6 wp/wp-admin/includes/class-wp-ms-sites-list-table.php --- a/wp/wp-admin/includes/class-wp-ms-sites-list-table.php Thu Sep 29 08:06:27 2022 +0200 +++ b/wp/wp-admin/includes/class-wp-ms-sites-list-table.php Fri Sep 05 18:40:08 2025 +0200 @@ -11,7 +11,6 @@ * Core class used to implement displaying sites in a list table for the network admin. * * @since 3.1.0 - * @access private * * @see WP_List_Table */ @@ -82,7 +81,7 @@ $s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : ''; $wild = ''; - if ( false !== strpos( $s, '*' ) ) { + if ( str_contains( $s, '*' ) ) { $wild = '*'; $s = trim( $s, '*' ); } @@ -110,12 +109,17 @@ if ( empty( $s ) ) { // Nothing to do. - } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) || - preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) || - preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) || - preg_match( '/^[0-9]{1,3}\.$/', $s ) ) { + } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) + || preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) + || 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 ) . ( ! empty( $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 ) { @@ -262,23 +266,23 @@ $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 ] ) ); + $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( - '%3$s', - esc_url( $full_url ), - $current_link_attributes, - $label + $view_links[ $status ] = array( + 'url' => esc_url( $full_url ), + 'label' => $label, + 'current' => $requested_status === $status || ( '' === $requested_status && 'all' === $status ), ); } } - return $view_links; + return $this->get_views_links( $view_links ); } /** @@ -298,7 +302,7 @@ /** * @global string $mode List table view mode. * - * @param string $which The location of the pagination nav markup: 'top' or 'bottom'. + * @param string $which The location of the pagination nav markup: Either 'top' or 'bottom'. */ protected function pagination( $which ) { global $mode; @@ -311,11 +315,11 @@ } /** - * Extra controls to be displayed between bulk actions and pagination. + * Displays extra controls between bulk actions and pagination. * * @since 5.3.0 * - * @param string $which The location of the extra table nav markup: 'top' or 'bottom'. + * @param string $which The location of the extra table nav markup: Either 'top' or 'bottom'. */ protected function extra_tablenav( $which ) { ?> @@ -329,7 +333,7 @@ * * @since 5.3.0 * - * @param string $which The location of the extra table nav markup: 'top' or 'bottom'. + * @param string $which The location of the extra table nav markup: Either 'top' or 'bottom'. */ do_action( 'restrict_manage_sites', $which ); @@ -349,13 +353,13 @@ * * @since 5.3.0 * - * @param string $which The location of the extra table nav markup: 'top' or 'bottom'. + * @param string $which The location of the extra table nav markup: Either 'top' or 'bottom'. */ do_action( 'manage_sites_extra_tablenav', $which ); } /** - * @return array + * @return string[] Array of column titles keyed by their column name. */ public function get_columns() { $sites_columns = array( @@ -385,10 +389,19 @@ * @return array */ protected function get_sortable_columns() { + + if ( is_subdomain_install() ) { + $blogname_abbr = __( 'Domain' ); + $blogname_orderby_text = __( 'Table ordered by Site Domain Name.' ); + } else { + $blogname_abbr = __( 'Path' ); + $blogname_orderby_text = __( 'Table ordered by Site Path.' ); + } + return array( - 'blogname' => 'blogname', - 'lastupdated' => 'lastupdated', - 'registered' => 'blog_id', + 'blogname' => array( 'blogname', false, $blogname_abbr, $blogname_orderby_text ), + 'lastupdated' => array( 'lastupdated', true, __( 'Last Updated' ), __( 'Table ordered by Last Updated.' ) ), + 'registered' => array( 'blog_id', true, _x( 'Registered', 'site' ), __( 'Table ordered by Site Registered Date.' ), 'desc' ), ); } @@ -407,13 +420,15 @@ if ( ! is_main_site( $blog['blog_id'] ) ) : $blogname = untrailingslashit( $blog['domain'] . $blog['path'] ); ?> - + + + - - - site_states( $blog ); ?> + %2$s', + esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ), + $blogname + ); + + $this->site_states( $blog ); + ?> %s', + '%2$s', esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ), number_format_i18n( $user_count ) ); @@ -570,6 +596,9 @@ * @param string $column_name Current column name. */ public function column_default( $item, $column_name ) { + // Restores the more descriptive, specific name for use within this method. + $blog = $item; + /** * Fires for each registered custom column in the Sites list table. * @@ -578,7 +607,7 @@ * @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, $item['blog_id'] ); + do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] ); } /** @@ -591,7 +620,7 @@ reset( $this->status_list ); foreach ( $this->status_list as $status => $col ) { - if ( 1 == $blog[ $status ] ) { + if ( '1' === $blog[ $status ] ) { $class = " class='{$col[0]}'"; } } @@ -605,7 +634,7 @@ } /** - * Maybe output comma-separated site states. + * Determines whether to output comma-separated site states. * * @since 5.3.0 * @@ -625,7 +654,7 @@ $site_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : ''; foreach ( $this->status_list as $status => $col ) { - if ( ( 1 === (int) $_site->{$status} ) && ( $site_status !== $status ) ) { + if ( '1' === $_site->{$status} && $site_status !== $status ) { $site_states[ $col[0] ] = $col[1]; } } @@ -651,9 +680,9 @@ foreach ( $site_states as $state ) { ++$i; - $sep = ( $i < $state_count ) ? ', ' : ''; + $separator = ( $i < $state_count ) ? ', ' : ''; - echo "{$state}{$sep}"; + echo "{$state}{$separator}"; } } } @@ -687,7 +716,8 @@ } // Restores the more descriptive, specific name for use within this method. - $blog = $item; + $blog = $item; + $blogname = untrailingslashit( $blog['domain'] . $blog['path'] ); // Preordered. @@ -704,33 +734,110 @@ 'visit' => '', ); - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['backend'] = "" . __( 'Dashboard' ) . ''; - if ( get_network()->site_id != $blog['blog_id'] ) { - if ( '1' == $blog['deleted'] ) { - $actions['activate'] = '' . __( 'Activate' ) . ''; + $actions['edit'] = sprintf( + '%2$s', + esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ), + __( 'Edit' ) + ); + + $actions['backend'] = sprintf( + '%2$s', + esc_url( get_admin_url( $blog['blog_id'] ) ), + __( 'Dashboard' ) + ); + + if ( ! is_main_site( $blog['blog_id'] ) ) { + if ( '1' === $blog['deleted'] ) { + $actions['activate'] = sprintf( + '%2$s', + esc_url( + wp_nonce_url( + network_admin_url( 'sites.php?action=confirm&action2=activateblog&id=' . $blog['blog_id'] ), + 'activateblog_' . $blog['blog_id'] + ) + ), + _x( 'Activate', 'site' ) + ); } else { - $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; + $actions['deactivate'] = sprintf( + '%2$s', + esc_url( + wp_nonce_url( + network_admin_url( 'sites.php?action=confirm&action2=deactivateblog&id=' . $blog['blog_id'] ), + 'deactivateblog_' . $blog['blog_id'] + ) + ), + __( 'Deactivate' ) + ); } - if ( '1' == $blog['archived'] ) { - $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; + if ( '1' === $blog['archived'] ) { + $actions['unarchive'] = sprintf( + '%2$s', + esc_url( + wp_nonce_url( + network_admin_url( 'sites.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] ), + 'unarchiveblog_' . $blog['blog_id'] + ) + ), + __( 'Unarchive' ) + ); } else { - $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . ''; + $actions['archive'] = sprintf( + '%2$s', + esc_url( + wp_nonce_url( + network_admin_url( 'sites.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] ), + 'archiveblog_' . $blog['blog_id'] + ) + ), + _x( 'Archive', 'verb; site' ) + ); } - if ( '1' == $blog['spam'] ) { - $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . ''; + if ( '1' === $blog['spam'] ) { + $actions['unspam'] = sprintf( + '%2$s', + esc_url( + wp_nonce_url( + network_admin_url( 'sites.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] ), + 'unspamblog_' . $blog['blog_id'] + ) + ), + _x( 'Not Spam', 'site' ) + ); } else { - $actions['spam'] = '' . _x( 'Spam', 'site' ) . ''; + $actions['spam'] = sprintf( + '%2$s', + esc_url( + wp_nonce_url( + network_admin_url( 'sites.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] ), + 'spamblog_' . $blog['blog_id'] + ) + ), + _x( 'Spam', 'site' ) + ); } if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) { - $actions['delete'] = '' . __( 'Delete' ) . ''; + $actions['delete'] = sprintf( + '%2$s', + esc_url( + wp_nonce_url( + network_admin_url( 'sites.php?action=confirm&action2=deleteblog&id=' . $blog['blog_id'] ), + 'deleteblog_' . $blog['blog_id'] + ) + ), + __( 'Delete' ) + ); } } - $actions['visit'] = "" . __( 'Visit' ) . ''; + $actions['visit'] = sprintf( + '%2$s', + esc_url( get_home_url( $blog['blog_id'], '/' ) ), + __( 'Visit' ) + ); /** * Filters the action links displayed for each site in the Sites list table.