WordPress 4.7

[autoinstalls/wordpress.git] / wp-admin / ms-delete-site.php

diff --git a/wp-admin/ms-delete-site.php b/wp-admin/ms-delete-site.php
index 00143089e2c584958e4759f8dd9f6efcd99e3536..6bc3cfcd89d4db3e6c3f826bf5b5a3c52e02eef2 100644 (file)
--- a/wp-admin/ms-delete-site.php
+++ b/wp-admin/ms-delete-site.php
@@ -12,27 +12,27 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 if ( !is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
-// @todo Create a delete blog cap.
-if ( ! current_user_can( 'manage_options' ) )
-       wp_die(__( 'You do not have sufficient permissions to delete this site.'));
+if ( ! current_user_can( 'delete_site' ) )
+       wp_die(__( 'Sorry, you are not allowed to delete this site.'));
 
 if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
-       if ( get_option( 'delete_blog_hash' ) == $_GET['h'] ) {
+       if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
                wpmu_delete_blog( $wpdb->blogid );
-               wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), $current_site->site_name ) );
+               wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), get_network()->site_name ) );
        } else {
                wp_die( __( "I'm sorry, the link you clicked is stale. Please select another option." ) );
        }
 }
 
-$blog = get_blog_details();
+$blog = get_site();
+$user = wp_get_current_user();
 
 $title = __( 'Delete Site' );
 $parent_file = 'tools.php';
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 echo '<div class="wrap">';
-echo '<h2>' . esc_html( $title ) . '</h2>';
+echo '<h1>' . esc_html( $title ) . '</h1>';
 
 if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
        check_admin_referer( 'delete-blog' );
@@ -42,9 +42,14 @@ if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_P
 
        $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
 
-       $content = __( "Dear User,
+       $switched_locale = switch_to_locale( get_locale() );
+
+       /* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
+       $content = __( "Howdy ###USERNAME###,
+
 You recently clicked the 'Delete Site' link on your site and filled in a
 form on that page.
+
 If you really want to delete your site, click the link below. You will not
 be asked to confirm again so only click this link if you are absolutely certain:
 ###URL_DELETE###
@@ -57,7 +62,7 @@ Thanks for using the site,
 Webmaster
 ###SITE_NAME###" );
        /**
-        * Filter the email content sent when a site in a Multisite network is deleted.
+        * Filters the email content sent when a site in a Multisite network is deleted.
         *
         * @since 3.0.0
         *
@@ -65,23 +70,34 @@ Webmaster
         */
        $content = apply_filters( 'delete_site_email_content', $content );
 
+       $content = str_replace( '###USERNAME###', $user->user_login, $content );
        $content = str_replace( '###URL_DELETE###', $url_delete, $content );
-       $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
+       $content = str_replace( '###SITE_NAME###', get_network()->site_name, $content );
 
        wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
+
+       if ( $switched_locale ) {
+               restore_previous_locale();
+       }
        ?>
 
-       <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p>
+       <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked.' ) ?></p>
 
 <?php } else {
        ?>
-       <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p>
+       <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), get_network()->site_name); ?></p>
        <p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p>
 
        <form method="post" name="deletedirect">
                <?php wp_nonce_field( 'delete-blog' ) ?>
                <input type="hidden" name="action" value="deleteblog" />
-               <p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf( __( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ), is_subdomain_install() ? $blog->domain : $blog->domain . $blog->path ); ?></strong></label></p>
+               <p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php
+                       printf(
+                               /* translators: %s: site address */
+                               __( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ),
+                               $blog->domain . $blog->path
+                       );
+               ?></strong></label></p>
                <?php submit_button( __( 'Delete My Site Permanently' ) ); ?>
        </form>
        <?php