Ticket #12386: ms_confirm_delete2.diff

includes/ms.php

@@ -166 +166 @@
 function confirm_delete_users( $users ) {
         if ( !is_array( $users ) )
                 return false;
-
-        echo '<p>' . __( 'Transfer posts before deleting users:' ) . '</p>';
-
-        echo '<form action="ms-edit.php?action=allusers" method="post">';
-        echo '<input type="hidden" name="alluser_transfer_delete" />';
-        wp_nonce_field( 'allusers' );
-        foreach ( (array) $_POST['allusers'] as $key => $val ) {
+    screen_icon();
+    ?>
+    <h2><?php esc_html_e('Users'); ?></h2>
+    <p><?php _e( 'Transfer posts before deleting users:' ); ?></p>
+    <form action="ms-edit.php?action=allusers" method="post">
+    <input type="hidden" name="alluser_transfer_delete" />
+    <?php
+    wp_nonce_field( 'allusers' );
+        foreach ( $allusers = (array) $_POST['allusers'] as $key => $val ) {
                 if ( $val != '' && $val != '0' ) {
-                        $user = new WP_User( $val );
-                        if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) )
-                                wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a site admnistrator.' ), $user->user_login ) );
+                        $user_delete = new WP_User( $val );
+            
+                        if ( in_array( $user_delete->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) )
+                                wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a site admnistrator.' ), $user_delete->user_login ) );
+                
                         echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
                         $blogs = get_blogs_of_user( $val, true );
+            
                         if ( !empty( $blogs ) ) {
+                echo '<p><strong>' . sprintf( __( 'Blogs from %s:' ), $user_delete->user_login ) . '</strong></p>';
                                 foreach ( (array) $blogs as $key => $details ) {
                                         $blog_users = get_users_of_blog( $details->userblog_id );
                                         if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
@@ -187 +193 @@
                                                 echo "<select name='blog[$val][{$key}]'>";
                                                 $out = '';
                                                 foreach ( $blog_users as $user ) {
-                                                        if ( $user->user_id != $val )
+                                                        if ( $user->user_id != $val && !in_array( $user->user_id, $allusers ) )
                                                                 $out .= "<option value='{$user->user_id}'>{$user->user_login}</option>";
                                                 }
                                                 if ( $out == '' )
-                                                        $out = "<option value='1'>admin</option>";
+                                                        $out = '<option value="1">admin</option>';
                                                 echo $out;
                                                 echo "</select>\n";
                                         }
@@ -199 +205 @@
                         }
                 }
         }
-        echo "<br /><input type='submit' value='" . __( 'Delete user and transfer posts' ) . "' />";
-        echo "</form>";
+    ?>
+    <br class="clear" />
+    <input type="submit" class="button-secondary delete" value="<?php _e( 'Delete user and transfer posts' ); ?> " />
+    </form>
+    <?php
         return true;
 }
 

ms-edit.php

@@ -461 +461 @@
                         wp_die( __('You do not have permission to access this page.') );
 
                 if ( isset($_POST['alluser_delete']) ) {
-                        require_once('admin-header.php');
-                        echo '<div class="wrap" style="position:relative;">';
-                        confirm_delete_users( $_POST['allusers'] );
-                        echo '</div>';
+                        $title = __('Users');
+            $parent_file = 'ms-admin.php';
+            require_once('admin-header.php');
+            echo '<div class="wrap">';
+            confirm_delete_users( $_POST['allusers'] );
+            require_once('admin-footer.php');
                 } elseif ( isset( $_POST[ 'alluser_transfer_delete' ] ) ) {
                         if ( is_array( $_POST[ 'blog' ] ) && !empty( $_POST[ 'blog' ] ) ) {
                                 foreach ( $_POST[ 'blog' ] as $id => $users ) {