X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/e08b42e8ad054ec67522d7ac1aaae5dc68cb3d01..HEAD:/wp-admin/network/sites.php diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php index 5eae37eb..96d708ac 100644 --- a/wp-admin/network/sites.php +++ b/wp-admin/network/sites.php @@ -10,11 +10,8 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! is_multisite() ) - wp_die( __( 'Multisite support is not enabled.' ) ); - if ( ! current_user_can( 'manage_sites' ) ) - wp_die( __( 'You do not have permission to access this page.' ) ); + wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 ); $wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' ); $pagenum = $wp_list_table->get_pagenum(); @@ -22,7 +19,7 @@ $pagenum = $wp_list_table->get_pagenum(); $title = __( 'Sites' ); $parent_file = 'sites.php'; -add_screen_option( 'per_page', array( 'label' => _x( 'Sites', 'sites per page (screen options)' ) ) ); +add_screen_option( 'per_page' ); get_current_screen()->add_help_tab( array( 'id' => 'overview', @@ -35,80 +32,101 @@ get_current_screen()->add_help_tab( array( '
  • ' . __('Dashboard leads to the Dashboard for that site.') . '
  • ' . '
  • ' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '
  • ' . '
  • ' . __('Delete which is a permanent action after the confirmation screens.') . '
  • ' . - '
  • ' . __('Visit to go to the frontend site live.') . '
  • ' . + '
  • ' . __('Visit to go to the front-end site live.') . '
  • ' . '

    ' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '

    ' . '

    ' . __('Clicking on bold headings can re-sort this table.') . '

    ' ) ); get_current_screen()->set_help_sidebar( '

    ' . __('For more information:') . '

    ' . - '

    ' . __('Documentation on Site Management') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Documentation on Site Management') . '

    ' . + '

    ' . __('Support Forums') . '

    ' ); +get_current_screen()->set_screen_reader_content( array( + 'heading_pagination' => __( 'Sites list navigation' ), + 'heading_list' => __( 'Sites list' ), +) ); + $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; if ( isset( $_GET['action'] ) ) { /** This action is documented in wp-admin/network/edit.php */ do_action( 'wpmuadminedit' ); + // A list of valid actions and their associated messaging for confirmation output. + $manage_actions = array( + 'activateblog' => __( 'You are about to activate the site %s.' ), + 'deactivateblog' => __( 'You are about to deactivate the site %s.' ), + 'unarchiveblog' => __( 'You are about to unarchive the site %s.' ), + 'archiveblog' => __( 'You are about to archive the site %s.' ), + 'unspamblog' => __( 'You are about to unspam the site %s.' ), + 'spamblog' => __( 'You are about to mark the site %s as spam.' ), + 'deleteblog' => __( 'You are about to delete the site %s.' ), + 'unmatureblog' => __( 'You are about to mark the site %s as mature.' ), + 'matureblog' => __( 'You are about to mark the site %s as not mature.' ), + ); + if ( 'confirm' === $_GET['action'] ) { - check_admin_referer( 'confirm' ); + // The action2 parameter contains the action being taken on the site. + $site_action = $_GET['action2']; + + if ( ! array_key_exists( $site_action, $manage_actions ) ) { + wp_die( __( 'The requested action is not valid.' ) ); + } + + // The mature/unmature UI exists only as external code. Check the "confirm" nonce for backward compatibility. + if ( 'matureblog' === $site_action || 'unmatureblog' === $site_action ) { + check_admin_referer( 'confirm' ); + } else { + check_admin_referer( $site_action . '_' . $id ); + } if ( ! headers_sent() ) { nocache_headers(); header( 'Content-Type: text/html; charset=utf-8' ); } - if ( $current_site->blog_id == $id ) - wp_die( __( 'You are not allowed to change the current site.' ) ); + + if ( get_network()->site_id == $id ) { + wp_die( __( 'Sorry, you are not allowed to change the current site.' ) ); + } + + $site_details = get_site( $id ); + $site_address = untrailingslashit( $site_details->domain . $site_details->path ); + + require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> - - > - - - <?php _e( 'WordPress › Confirm your action' ); ?> - - - - - -

    -
    - +
    +

    + + - -

    - + +

    + - - +
    403 ) ); $updated_action = 'not_deleted'; - if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) { + if ( $id != '0' && $id != get_network()->site_id && current_user_can( 'delete_site', $id ) ) { wpmu_delete_blog( $id, true ); $updated_action = 'delete'; } @@ -119,11 +137,11 @@ if ( isset( $_GET['action'] ) ) { $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2']; foreach ( (array) $_POST['allblogs'] as $key => $val ) { - if ( $val != '0' && $val != $current_site->blog_id ) { + if ( $val != '0' && $val != get_network()->site_id ) { switch ( $doaction ) { case 'delete': if ( ! current_user_can( 'delete_site', $val ) ) - wp_die( __( 'You are not allowed to delete the site.' ) ); + wp_die( __( 'Sorry, you are not allowed to delete the site.' ) ); $updated_action = 'all_delete'; wpmu_delete_blog( $val, true ); @@ -136,11 +154,23 @@ if ( isset( $_GET['action'] ) ) { break; } } else { - wp_die( __( 'You are not allowed to change the current site.' ) ); + wp_die( __( 'Sorry, you are not allowed to change the current site.' ) ); } } + if ( ! in_array( $doaction, array( 'delete', 'spam', 'notspam' ), true ) ) { + $redirect_to = wp_get_referer(); + $blogs = (array) $_POST['allblogs']; + /** This action is documented in wp-admin/network/site-themes.php */ + $redirect_to = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $blogs, $id ); + wp_safe_redirect( $redirect_to ); + exit(); + } } else { - wp_redirect( network_admin_url( 'sites.php' ) ); + $location = network_admin_url( 'sites.php' ); + if ( ! empty( $_REQUEST['paged'] ) ) { + $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location ); + } + wp_redirect( $location ); exit(); } break; @@ -152,10 +182,25 @@ if ( isset( $_GET['action'] ) ) { case 'activateblog': update_blog_status( $id, 'deleted', '0' ); + + /** + * Fires after a network site is activated. + * + * @since MU + * + * @param string $id The ID of the activated site. + */ do_action( 'activate_blog', $id ); break; case 'deactivateblog': + /** + * Fires before a network site is deactivated. + * + * @since MU + * + * @param string $id The ID of the site being deactivated. + */ do_action( 'deactivate_blog', $id ); update_blog_status( $id, 'deleted', '1' ); break; @@ -171,8 +216,9 @@ if ( isset( $_GET['action'] ) ) { break; } - if ( empty( $updated_action ) && in_array( $_GET['action'], $manage_actions ) ) + if ( empty( $updated_action ) && array_key_exists( $_GET['action'], $manage_actions ) ) { $updated_action = $_GET['action']; + } if ( ! empty( $updated_action ) ) { wp_safe_redirect( add_query_arg( array( 'updated' => $updated_action ), wp_get_referer() ) ); @@ -196,7 +242,7 @@ if ( isset( $_GET['updated'] ) ) { $msg = __( 'Site deleted.' ); break; case 'not_deleted': - $msg = __( 'You do not have permission to delete that site.' ); + $msg = __( 'Sorry, you are not allowed to delete that site.' ); break; case 'archiveblog': $msg = __( 'Site archived.' ); @@ -217,12 +263,22 @@ if ( isset( $_GET['updated'] ) ) { $msg = __( 'Site marked as spam.' ); break; default: + /** + * Filters a specific, non-default site-updated message in the Network admin. + * + * The dynamic portion of the hook name, `$_GET['updated']`, refers to the + * non-default site update action. + * + * @since 3.1.0 + * + * @param string $msg The update message. Default 'Settings saved'. + */ $msg = apply_filters( 'network_sites_updated_message_' . $_GET['updated'], __( 'Settings saved.' ) ); break; } if ( ! empty( $msg ) ) - $msg = '

    ' . $msg . '

    '; + $msg = '

    ' . $msg . '

    '; } $wp_list_table->prepare_items(); @@ -231,20 +287,22 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
    -

    +

    - + -' . __( 'Search results for “%s”' ) . '', esc_html( $s ) ); } ?> -

    + -