Ticket #19470: 19470.3.patch
| File 19470.3.patch, 9.5 KB (added by , 13 years ago) |
|---|
-
wp-admin/network/site-users.php
83 83 wp_new_user_notification( $user_id, $password ); 84 84 add_user_to_blog( $id, $user_id, $_POST['new_role'] ); 85 85 $update = 'newuser'; 86 $referer = add_query_arg( 'user_id', $user_id, $referer ); 86 87 } 87 88 } 88 89 break; … … 92 93 if ( !empty( $_POST['newuser'] ) ) { 93 94 $update = 'adduser'; 94 95 $newuser = $_POST['newuser']; 95 $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) ); 96 if ( $userid ) { 97 $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" ); 98 if ( $user == false ) 99 add_user_to_blog( $id, $userid, $_POST['new_role'] ); 100 else 96 $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) ); 97 if ( $user_id ) { 98 $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id = '$user_id' AND meta_key='{$blog_prefix}capabilities'" ); 99 if ( $user == false ) { 100 add_user_to_blog( $id, $user_id, $_POST['new_role'] ); 101 $referer = add_query_arg( 'user_id', $user_id, $referer ); 102 } else { 101 103 $update = 'err_add_member'; 104 } 102 105 } else { 103 106 $update = 'err_add_notfound'; 104 107 } … … 202 205 </h3><?php 203 206 204 207 if ( isset($_GET['update']) ) : 208 if ( !empty( $_GET['user_id'] ) ) 209 $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), 'user-edit.php?user_id=' . absint( $_GET['user_id'] ) ) ); 210 205 211 switch($_GET['update']) { 206 212 case 'adduser': 207 echo '<div id="message" class="updated"><p>' . __( 'User added.') . '</p></div>';213 echo '<div id="message" class="updated"><p>' . sprintf( __( 'User added. <a href="%s">Edit User</a>' ), $edit_link ) . '</p></div>'; 208 214 break; 209 215 case 'err_add_member': 210 216 echo '<div id="message" class="error"><p>' . __( 'User is already a member of this site.' ) . '</p></div>'; … … 225 231 echo '<div id="message" class="error"><p>' . __( 'Select a user to remove.' ) . '</p></div>'; 226 232 break; 227 233 case 'newuser': 228 echo '<div id="message" class="updated"><p>' . __( 'User created.') . '</p></div>';234 echo '<div id="message" class="updated"><p>' . sprintf( __( 'User created. <a href="%s">Edit User</a>' ), $edit_link ) . '</p></div>'; 229 235 break; 230 236 case 'err_new': 231 237 echo '<div id="message" class="error"><p>' . __( 'Enter the username and email.' ) . '</p></div>'; -
wp-admin/network/user-new.php
51 51 $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) ); 52 52 } else { 53 53 wp_new_user_notification( $user_id, $password ); 54 wp_redirect( add_query_arg( array( 'update' => 'added'), 'user-new.php' ) );54 wp_redirect( add_query_arg( array( 'update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) ); 55 55 exit; 56 56 } 57 57 } … … 59 59 60 60 if ( isset($_GET['update']) ) { 61 61 $messages = array(); 62 if ( 'added' == $_GET['update'] ) 63 $messages[] = __('User added.'); 62 if ( 'added' == $_GET['update'] ) { 63 $edit_link = esc_url( network_admin_url( 'user-edit.php?user_id=' . absint( $_GET['user_id'] ) ) ); 64 $messages[] = sprintf( __( 'User added. <a href="%s">Edit User</a>' ), $edit_link ); 65 } 64 66 } 65 67 66 68 $title = __('Add New User'); -
wp-admin/network/users.php
267 267 _e( 'Users deleted.' ); 268 268 break; 269 269 case 'add': 270 _e( 'User added.' ); 270 $edit_link = esc_url( network_admin_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), 'user-edit.php?user_id=' . absint( $_GET['user_id'] ) ) ) ); 271 printf( __( 'User added. <a href="%s">Edit User</a>' ), $edit_link ); 271 272 break; 272 273 } 273 274 ?> -
wp-admin/user-new.php
68 68 } else { 69 69 if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { 70 70 add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) ); 71 $redirect = add_query_arg( array( 'update' => 'addnoconfirmation'), 'user-new.php' );71 $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $user_id ), 'user-new.php' ); 72 72 } else { 73 73 $newuser_key = substr( md5( $user_id ), 0, 5 ); 74 74 add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) ); … … 99 99 $add_user_errors = $user_id; 100 100 } else { 101 101 if ( current_user_can('edit_users') ) { 102 $new_user_login = apply_filters( 'pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));103 $redirect = 'users.php?usersearch='. urlencode( $new_user_login) . '&update=add' . '#user-' . $user_id;102 $new_user_login = apply_filters( 'pre_user_login', sanitize_user( stripslashes( $_REQUEST['user_login'] ), true ) ); 103 $redirect = 'users.php?usersearch='. urlencode( $new_user_login ) . '&update=add&user_id=' . $user_id; 104 104 } else { 105 105 $redirect = add_query_arg( 'update', 'add', 'user-new.php' ); 106 106 } … … 122 122 if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { 123 123 $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) ); 124 124 wpmu_activate_signup( $key ); 125 $redirect = add_query_arg( array( 'update' => 'addnoconfirmation'), 'user-new.php' );125 $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => get_user_by( 'login', $new_user_login )->ID ), 'user-new.php' ); 126 126 } else { 127 $redirect = add_query_arg( array( 'update' => 'newuserconfimation'), 'user-new.php' );127 $redirect = add_query_arg( array( 'update' => 'newuserconfimation' ), 'user-new.php' ); 128 128 } 129 129 wp_redirect( $redirect ); 130 130 die(); … … 190 190 191 191 if ( isset($_GET['update']) ) { 192 192 $messages = array(); 193 194 if ( !empty( $_GET['user_id'] ) ) 195 $edit_link = esc_url( admin_url( 'user-edit.php?user_id=' . absint( $_GET['user_id'] ) ) ); 196 193 197 if ( is_multisite() ) { 194 198 switch ( $_GET['update'] ) { 195 case "newuserconfimation":196 $messages[] = __( 'Invitation email sent to new user. A confirmation link must be clicked before their account is created.');199 case 'newuserconfimation': 200 $messages[] = __( 'Invitation email sent to new user. A confirmation link must be clicked before their account is created.' ); 197 201 break; 198 case "add":199 $messages[] = __( 'Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.');202 case 'add': 203 $messages[] = __( 'Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.' ); 200 204 break; 201 case "addnoconfirmation":202 $messages[] = __('User has been added to your site.');205 case 'addnoconfirmation': 206 $messages[] = sprintf( __( 'User has been added to your site. <a href="%s">Edit User</a>' ), $edit_link ); 203 207 break; 204 case "addexisting":205 $messages[] = __( 'That user is already a member of this site.');208 case 'addexisting': 209 $messages[] = __( 'That user is already a member of this site.' ); 206 210 break; 207 case "does_not_exist":208 $messages[] = __( 'The requested user does not exist.');211 case 'does_not_exist': 212 $messages[] = __( 'The requested user does not exist.' ); 209 213 break; 210 case "does_not_exist":211 $messages[] = __( 'Please enter a valid email address.');214 case 'does_not_exist': 215 $messages[] = __( 'Please enter a valid email address.' ); 212 216 break; 213 217 } 214 218 } else { 215 219 if ( 'add' == $_GET['update'] ) 216 $messages[] = __('User added.');220 $messages[] = sprintf( __( 'User added. <a href="%s">Edit User</a>' ), $edit_link ); 217 221 } 218 222 } 219 223 ?> -
wp-admin/users.php
346 346 case 'del': 347 347 case 'del_many': 348 348 $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0; 349 $messages[] = '<div id="message" class="updated"><p>' . sprintf( _n('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '</p></div>';349 $messages[] = '<div id="message" class="updated"><p>' . sprintf( _n( '%s user deleted', '%s users deleted', $delete_count ), $delete_count ) . '</p></div>'; 350 350 break; 351 351 case 'add': 352 $messages[] = '<div id="message" class="updated"><p>' . __('New user created.') . '</p></div>'; 352 $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), 'user-edit.php?user_id=' . absint( $_GET['user_id'] ) ) ); 353 $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'New user created. <a href="%s">Edit User</a>' ), $edit_link ) . '</p></div>'; 353 354 break; 354 355 case 'promote': 355 356 $messages[] = '<div id="message" class="updated"><p>' . __('Changed roles.') . '</p></div>';