Ticket #24633: 24633.16.patch
File 24633.16.patch, 7.3 KB (added by , 10 years ago) |
---|
-
src/wp-admin/admin-ajax.php
61 61 'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor', 62 62 'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs', 63 63 'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail', 64 'parse-media-shortcode' 64 'parse-media-shortcode', 'generate_password', 65 65 ); 66 66 67 67 // Register core Ajax calls. -
src/wp-admin/css/forms.css
462 462 border-color: #8dff1c; 463 463 } 464 464 465 .indicator-hint {466 padding -top: 8px;465 #password2 .indicator-hint { 466 padding: 4px 0 0 220px; 467 467 } 468 468 469 469 p.search-box { … … 666 666 cursor: pointer; 667 667 } 668 668 669 .form-table tr#password td, 670 .form-table tr#password2 td { 671 padding: 0 10px; 672 } 673 .form-table tr#password2 th, 674 .form-table tr#password th { 675 padding: 0 10px 20px 0px; 676 } 677 669 678 /*------------------------------------------------------------------------------ 670 679 19.0 - Tools 671 680 ------------------------------------------------------------------------------*/ … … 963 972 padding: 0; 964 973 line-height: 2; 965 974 } 975 976 #password2 .indicator-hint { 977 padding-left: 0; 978 } 966 979 } 967 980 968 981 @media only screen and (max-width: 768px) { -
src/wp-admin/includes/ajax-actions.php
2760 2760 'body' => ob_get_clean() 2761 2761 ) ); 2762 2762 } 2763 2764 /** 2765 * Generates a password via ajax 2766 * 2767 * @since 4.1.0 2768 */ 2769 function wp_ajax_generate_password() { 2770 wp_die( wp_generate_password( 30 ) ); 2771 } -
src/wp-admin/includes/user.php
174 174 175 175 if ( $update ) { 176 176 $user_id = wp_update_user( $user ); 177 178 // Encourage the user to reset their password 179 if( ! empty( $_POST['reset_password'] ) ) { 180 update_user_option( $user_id, 'default_password_nag', true, true ); 181 } 182 183 // Send the new, plaintext password to the user 184 if( ! empty( $_POST['send_password'] ) ) { 185 $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); 186 $message = sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n"; 187 $message .= sprintf( __( 'Password: %s' ), $pass1 ) . "\r\n"; 188 $message .= wp_login_url() . "\r\n"; 189 190 wp_mail( $user->user_email, sprintf( __( '[%s] Your username and password' ), $blogname ), $message ); 191 } 192 177 193 } else { 178 194 $user_id = wp_insert_user( $user ); 179 195 wp_new_user_notification( $user_id, isset( $_POST['send_password'] ) ? wp_unslash( $pass1 ) : '' ); -
src/wp-admin/js/user-profile.js
32 32 33 33 $(document).ready( function() { 34 34 var $colorpicker, $stylesheet, user_id, current_user_id, 35 select = $( '#display_name' ) ;35 select = $( '#display_name' ), 36 36 37 $('#pass1').val('').keyup( check_pass_strength ); 38 $('#pass2').val('').keyup( check_pass_strength ); 37 /* Passwords */ 38 39 /** 40 * Add a Generate Password button 41 * Add a show password icon to view password when editing own profile 42 * @since 4.1.0 43 */ 44 $pass1 = $( '#pass1' ), 45 $pass2 = $( '#pass2' ), 46 password_repeat = $( '.password-repeat' ); 47 48 $pass2.val('').keyup( check_pass_strength ); 49 // Handle user entering password 50 $pass1.val('').on( 'keyup', function() { 51 check_pass_strength(); 52 // Show the password repeat field 53 password_repeat.show(); 54 // Ensure fireld type is password 55 if ( 'text' === $pass1.attr( 'type' ) ) { 56 $pass1.attr( 'type', 'password' ); 57 } 58 }); 59 60 // Handle the Generate Password button 61 $( '#generate-password' ).on('click', function() { 62 // Send an ajax request to the server to get a new password 63 $.post( ajaxurl, { action: 'generate_password' }, function(response) { 64 $pass2.val( response ); 65 $pass1.val( response ).trigger( 'keyup' ); 66 password_repeat.hide(); 67 $pass1.attr( 'type', 'text' ); 68 $pass1.focus().select(); 69 }); 70 }); 71 39 72 $('#pass-strength-result').show(); 73 74 /* End Passwords */ 75 40 76 $('.color-palette').click( function() { 41 77 $(this).siblings('input[name="admin_color"]').prop('checked', true); 42 78 }); -
src/wp-admin/user-edit.php
459 459 <th><label for="pass1"><?php _e( 'New Password' ); ?></label></th> 460 460 <td> 461 461 <input class="hidden" value=" " /><!-- #24364 workaround --> 462 <input type="password" name="pass1" id="pass1" class="regular-text" size="16"value="" autocomplete="off" />463 < p class="description"><?php _e( 'If you would like to change the password type a new one. Otherwise leave this blank.' ); ?></p>462 <input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" /> 463 <input type="button" name="generate-password" id="generate-password" value="<?php _e( 'Generate Password' ); ?>" class="button hide-if-no-js" /> 464 464 </td> 465 465 </tr> 466 <tr class="user-pass2-wrap">467 <th scope="row"><labelfor="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>466 <tr id="password2" class="user-pass2-wrap"> 467 <th><label class="password-repeat hidden" for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th> 468 468 <td> 469 <input name="pass2" type="password" id="pass2" class="regular-text" size="16" value="" autocomplete="off" /> 470 <p class="description"><?php _e( 'Type your new password again.' ); ?></p> 471 <br /> 472 <div id="pass-strength-result"><?php _e( 'Strength indicator' ); ?></div> 473 <p class="description indicator-hint"><?php echo _wp_password_hint(); ?></p> 469 <div class="password-repeat hidden"> 470 <input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="off" /> 471 <br /> 472 <div id="pass-strength-result"><?php _e( 'Strength indicator' ); ?></div> 473 <p class="description indicator-hint"><?php _e( 'Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ & ).' ); ?></p> 474 </div> 475 <p class="description"><?php _e( 'If you would like to change the password type or generate a new one. Otherwise leave this blank.' ); ?></p> 476 <?php if( ! IS_PROFILE_PAGE ) { ?> 477 <p class="hide-if-no-js"> 478 <label for="send_password"> 479 <input type="checkbox" name="send_password" id="send_password" value="1" /> <?php _e( 'Send this password to the user by email.' ); ?> 480 </label> 481 <br /> 482 <label for="reset_password"> 483 <input type="checkbox" name="reset_password" id="reset_password" value="1" /> <?php _e( 'Encourage the user to change their password, once logged in.' ); ?> 484 </label> 485 </p> 486 <?php } ?> 474 487 </td> 475 488 </tr> 476 489 <?php endif; ?>