Changeset 15488
- Timestamp:
- 08/02/2010 06:10:43 PM (15 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/ms.php
r15487 r15488 175 175 do_action( 'deleted_user', $id ); 176 176 177 return true;178 }179 180 function confirm_delete_users( $users ) {181 $current_user = wp_get_current_user();182 if ( !is_array( $users ) )183 return false;184 185 screen_icon();186 ?>187 <h2><?php esc_html_e( 'Users' ); ?></h2>188 <p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p>189 <form action="ms-edit.php?action=dodelete" method="post">190 <input type="hidden" name="dodelete" />191 <?php192 wp_nonce_field( 'ms-users-delete' );193 $site_admins = get_super_admins();194 $admin_out = "<option value='$current_user->ID'>$current_user->user_login</option>";195 196 foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {197 if ( $val != '' && $val != '0' ) {198 $delete_user = new WP_User( $val );199 200 if ( in_array( $delete_user->user_login, $site_admins ) )201 wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user->user_login ) );202 203 echo "<input type='hidden' name='user[]' value='{$val}'/>\n";204 $blogs = get_blogs_of_user( $val, true );205 206 if ( !empty( $blogs ) ) {207 ?>208 <br /><fieldset><p><legend><?php printf( __( "What should be done with posts and links owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>209 <?php210 foreach ( (array) $blogs as $key => $details ) {211 $blog_users = get_users_of_blog( $details->userblog_id );212 if ( is_array( $blog_users ) && !empty( $blog_users ) ) {213 $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";214 $user_dropdown = "<select name='blog[$val][{$key}]'>";215 $user_list = '';216 foreach ( $blog_users as $user ) {217 if ( $user->user_id != $val && !in_array( $user->user_id, $allusers ) )218 $user_list .= "<option value='{$user->user_id}'>{$user->user_login}</option>";219 }220 if ( '' == $user_list )221 $user_list = $admin_out;222 $user_dropdown .= $user_list;223 $user_dropdown .= "</select>\n";224 ?>225 <ul style="list-style:none;">226 <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>227 <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />228 <?php _e( 'Delete all posts and links.' ); ?></label></li>229 <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />230 <?php echo __( 'Attribute all posts and links to:' ) . '</label>' . $user_dropdown; ?></li>231 </ul>232 <?php233 }234 }235 echo "</fieldset>";236 }237 }238 }239 ?>240 <p class="submit"><input type="submit" class="button-secondary delete" value="<?php esc_attr_e( 'Confirm Deletion' ); ?>" /></p>241 </form>242 <?php243 177 return true; 244 178 } -
trunk/wp-admin/network/edit.php
r15481 r15488 14 14 15 15 if ( empty( $_GET['action'] ) ) 16 wp_redirect( admin_url( 'ms-admin.php' ) ); 16 wp_redirect( admin_url( 'index.php' ) ); 17 18 function confirm_delete_users( $users ) { 19 $current_user = wp_get_current_user(); 20 if ( !is_array( $users ) ) 21 return false; 22 23 screen_icon(); 24 ?> 25 <h2><?php esc_html_e( 'Users' ); ?></h2> 26 <p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p> 27 <form action="edit.php?action=dodelete" method="post"> 28 <input type="hidden" name="dodelete" /> 29 <?php 30 wp_nonce_field( 'ms-users-delete' ); 31 $site_admins = get_super_admins(); 32 $admin_out = "<option value='$current_user->ID'>$current_user->user_login</option>"; 33 34 foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) { 35 if ( $val != '' && $val != '0' ) { 36 $delete_user = new WP_User( $val ); 37 38 if ( in_array( $delete_user->user_login, $site_admins ) ) 39 wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user->user_login ) ); 40 41 echo "<input type='hidden' name='user[]' value='{$val}'/>\n"; 42 $blogs = get_blogs_of_user( $val, true ); 43 44 if ( !empty( $blogs ) ) { 45 ?> 46 <br /><fieldset><p><legend><?php printf( __( "What should be done with posts and links owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p> 47 <?php 48 foreach ( (array) $blogs as $key => $details ) { 49 $blog_users = get_users_of_blog( $details->userblog_id ); 50 if ( is_array( $blog_users ) && !empty( $blog_users ) ) { 51 $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>"; 52 $user_dropdown = "<select name='blog[$val][{$key}]'>"; 53 $user_list = ''; 54 foreach ( $blog_users as $user ) { 55 if ( $user->user_id != $val && !in_array( $user->user_id, $allusers ) ) 56 $user_list .= "<option value='{$user->user_id}'>{$user->user_login}</option>"; 57 } 58 if ( '' == $user_list ) 59 $user_list = $admin_out; 60 $user_dropdown .= $user_list; 61 $user_dropdown .= "</select>\n"; 62 ?> 63 <ul style="list-style:none;"> 64 <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li> 65 <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" /> 66 <?php _e( 'Delete all posts and links.' ); ?></label></li> 67 <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" /> 68 <?php echo __( 'Attribute all posts and links to:' ) . '</label>' . $user_dropdown; ?></li> 69 </ul> 70 <?php 71 } 72 } 73 echo "</fieldset>"; 74 } 75 } 76 } 77 ?> 78 <p class="submit"><input type="submit" class="button-secondary delete" value="<?php esc_attr_e( 'Confirm Deletion' ); ?>" /></p> 79 </form> 80 <?php 81 return true; 82 } 17 83 18 84 do_action( 'wpmuadminedit' , ''); … … 30 96 31 97 if ( empty( $_POST ) ) 32 wp_die( sprintf( __( 'You probably need to go back to the <a href="%s">options page</a>.', esc_url( admin_url( ' ms-options.php' ) ) ) ) );98 wp_die( sprintf( __( 'You probably need to go back to the <a href="%s">options page</a>.', esc_url( admin_url( 'settings.php' ) ) ) ) ); 33 99 34 100 if ( isset($_POST['WPLANG']) && ( '' === $_POST['WPLANG'] || in_array( $_POST['WPLANG'], get_available_languages() ) ) ) … … 134 200 do_action( 'update_wpmu_options' ); 135 201 136 wp_redirect( add_query_arg( 'updated', 'true', admin_url( ' ms-options.php' ) ) );202 wp_redirect( add_query_arg( 'updated', 'true', admin_url( 'settings.php' ) ) ); 137 203 exit(); 138 204 break; … … 209 275 210 276 if ( empty( $_POST ) ) 211 wp_die( sprintf( __( 'You probably need to go back to the <a href="%s">sites page</a>', esc_url( admin_url( 'ms-sites.php' ) ) ) ) );277 wp_die( sprintf( __( 'You probably need to go back to the <a href="%s">sites page</a>', esc_url( network_admin_url( 'sites.php' ) ) ) ) ); 212 278 213 279 switch_to_blog( $id ); … … 368 434 exit(); 369 435 } else { 370 wp_redirect( admin_url( 'ms-sites.php' ) );436 wp_redirect( network_admin_url( 'sites.php' ) ); 371 437 } 372 438 break; … … 477 543 <body> 478 544 <h1 id="logo"><img alt="WordPress" src="<?php echo esc_attr( admin_url( 'images/wordpress-logo.png' ) ); ?>" /></h1> 479 <form action=" ms-edit.php?action=<?php echo esc_attr( $_GET['action2'] ) ?>" method="post">545 <form action="edit.php?action=<?php echo esc_attr( $_GET['action2'] ) ?>" method="post"> 480 546 <input type="hidden" name="action" value="<?php echo esc_attr( $_GET['action2'] ) ?>" /> 481 547 <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" /> … … 500 566 $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays 501 567 $title = __( 'Users' ); 502 $parent_file = ' ms-admin.php';503 require_once( ' admin-header.php' );568 $parent_file = 'users.php'; 569 require_once( '../admin-header.php' ); 504 570 echo '<div class="wrap">'; 505 571 confirm_delete_users( $_POST['allusers'] ); 506 572 echo '</div>'; 507 require_once( ' admin-footer.php' );573 require_once( '../admin-footer.php' ); 508 574 exit(); 509 575 } else { 510 wp_redirect( admin_url( 'ms-users.php' ) );576 wp_redirect( network_admin_url( 'users.php' ) ); 511 577 } 512 578 break; … … 527 593 case 'delete': 528 594 $title = __( 'Users' ); 529 $parent_file = ' ms-admin.php';530 require_once( ' admin-header.php' );595 $parent_file = 'users.php'; 596 require_once( '../admin-header.php' ); 531 597 echo '<div class="wrap">'; 532 598 confirm_delete_users( $_POST['allusers'] ); 533 599 echo '</div>'; 534 require_once( ' admin-footer.php' );600 require_once( '../admin-footer.php' ); 535 601 exit(); 536 602 break; … … 565 631 exit(); 566 632 } else { 567 wp_redirect( admin_url( 'ms-users.php' ) );633 wp_redirect( network_admin_url( 'users.php' ) ); 568 634 } 569 635 break; … … 596 662 $deletefunction = 'all_delete'; 597 663 598 wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), admin_url( 'ms-users.php' ) ) );664 wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) ); 599 665 break; 600 666 … … 632 698 633 699 default: 634 wp_redirect( admin_url( 'ms-admin.php' ) );700 wp_redirect( network_admin_url( 'index.php' ) ); 635 701 break; 636 702 }
Note: See TracChangeset
for help on using the changeset viewer.