Ticket #24633: 24633.24.patch

src/wp-admin/admin-ajax.php

@@ -61 +61 @@
         'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
         'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
         'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
-        'parse-media-shortcode', 'destroy-sessions'
+        'parse-media-shortcode', 'destroy-sessions', 'generate_password',
 );
 
 // Register core Ajax calls.

src/wp-admin/css/forms.css

@@ -1004 +1004 @@
                 padding: 0;
                 line-height: 2;
         }
-
-        .form-field #domain {
-                max-width: none;
-        }
 }
 
 @media only screen and (max-width: 768px) {

src/wp-admin/includes/ajax-actions.php

@@ -2828 +2828 @@
 
         wp_send_json_success( array( 'message' => $message ) );
 }
+
+/**
+ * Generates a password via ajax
+ *
+ * @since 4.1.0
+ */
+function wp_ajax_generate_password() {
+        wp_die( wp_generate_password( 30 ) );
+}

src/wp-admin/js/user-profile.js

@@ -1 +1 @@
 /* global ajaxurl, pwsL10n */
 (function($){
 
-        function check_pass_strength() {
-                var pass1 = $('#pass1').val(), pass2 = $('#pass2').val(), strength;
+        $(document).ready( function() {
+                var $colorpicker, $stylesheet, user_id, current_user_id,
+                        select = $( '#display_name' );
 
-                $('#pass-strength-result').removeClass('short bad good strong');
-                if ( ! pass1 ) {
-                        $('#pass-strength-result').html( pwsL10n.empty );
-                        return;
-                }
+                /* Passwords */
 
-                strength = wp.passwordStrength.meter( pass1, wp.passwordStrength.userInputBlacklist(), pass2 );
+                wp.passwords.init( '#pass1', '#pass2', '#generate-password' );
 
-                switch ( strength ) {
-                        case 2:
-                                $('#pass-strength-result').addClass('bad').html( pwsL10n.bad );
-                                break;
-                        case 3:
-                                $('#pass-strength-result').addClass('good').html( pwsL10n.good );
-                                break;
-                        case 4:
-                                $('#pass-strength-result').addClass('strong').html( pwsL10n.strong );
-                                break;
-                        case 5:
-                                $('#pass-strength-result').addClass('short').html( pwsL10n.mismatch );
-                                break;
-                        default:
-                                $('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
-                }
-        }
+                /* End Passwords */
 
-        $(document).ready( function() {
-                var $colorpicker, $stylesheet, user_id, current_user_id,
-                        select = $( '#display_name' );
-
-                $('#pass1').val('').keyup( check_pass_strength );
-                $('#pass2').val('').keyup( check_pass_strength );
-                $('#pass-strength-result').show();
                 $('.color-palette').click( function() {
                         $(this).siblings('input[name="admin_color"]').prop('checked', true);
                 });

src/wp-admin/user-edit.php

@@ -468 +468 @@
         <th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
         <td>
                 <input class="hidden" value=" " /><!-- #24364 workaround -->
-                <input type="password" name="pass1" id="pass1" class="regular-text" size="16" value="" autocomplete="off" />
-                <p class="description"><?php _e( 'If you would like to change the password type a new one. Otherwise leave this blank.' ); ?></p>
+                <input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" />
+                <input type="button" name="generate-password" id="generate-password" value="<?php _e( 'Generate Password' ); ?>" class="button hide-if-no-js" />
         </td>
 </tr>
-<tr class="user-pass2-wrap">
-        <th scope="row"><label for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
+<tr id="password2" class="user-pass2-wrap">
+        <th><label class="password-repeat" for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
         <td>
-        <input name="pass2" type="password" id="pass2" class="regular-text" size="16" value="" autocomplete="off" />
-        <p class="description"><?php _e( 'Type your new password again.' ); ?></p>
-        <br />
-        <div id="pass-strength-result"><?php _e( 'Strength indicator' ); ?></div>
-        <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
+                <div class="password-repeat">
+                        <input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="off" />
+                        <br />
+                        <div id="pass-strength-result"><?php _e( 'Strength indicator' ); ?></div>
+                        <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 ! " ? $ % ^ &amp; ).' ); ?></p>
+                </div>
+                <p class="description"><?php _e( 'If you would like to change the password type or generate a new one. Otherwise leave this blank.' ); ?></p>
+                <?php if( ! IS_PROFILE_PAGE ) { ?>
+                <p class="hide-if-no-js">
+                        <label for="send_password">
+                                <input type="checkbox" name="send_password" id="send_password" value="1" /> <?php _e( 'Send this password to the user by email.' ); ?>
+                        </label>
+                        <br />
+                        <label for="reset_password">
+                                <input type="checkbox" name="reset_password" id="reset_password" value="1" /> <?php _e( 'Encourage the user to change their password, once logged in.' ); ?>
+                        </label>
+                </p>
+                <?php } ?>
         </td>
 </tr>
 <?php endif; ?>

src/wp-includes/js/wp-util.js

@@ -109 +109 @@
                 }
         };
 
+        wp.passwords = {
+                
+                pass1: '',
+                pass2: '',
+                submit: '',
+                results: $('#pass-strength-result'),
+
+                init: function( pass1, pass2, submit ) {
+                
+                        wp.passwords.pass1 = $( pass1 );
+                        wp.passwords.pass2 = $( pass2 );
+                        wp.passwords.submit = $( submit );
+
+                        wp.passwords.pass2.val('').keyup( wp.passwords.check_strength() );
+                        
+                        // Handle user entering password
+                        wp.passwords.pass1.val('').on( 'keyup', function() {
+                                wp.passwords.check_strength();
+                                // Ensure fireld type is password
+                                if ( 'text' === wp.passwords.pass1.attr( 'type' ) ) {
+                                        wp.passwords.pass1.attr( 'type', 'password' );
+                                }
+                                if ( 'text' === wp.passwords.pass2.attr( 'type' ) ) {
+                                        wp.passwords.pass2.attr( 'type', 'password' );
+                                }
+                        });
+
+                        // Handle the Generate Password button
+                        $( submit ).on('click', function() {
+
+                                wp.passwords.generate();
+
+                        });
+
+                },
+
+                generate: function() {
+
+                        // Send an ajax request to the server to get a new password
+                        $.post( ajaxurl, { action: 'generate_password' }, function(response) {
+                                wp.passwords.pass1.val( response ).trigger( 'keyup' );
+                                wp.passwords.pass2.val( response );
+                                wp.passwords.check_strength();
+                                wp.passwords.pass1.attr( 'type', 'text' );
+                                wp.passwords.pass2.attr( 'type', 'text' );
+                                wp.passwords.pass1.focus().select();
+                        });
+
+                },
+
+                check_strength: function() {
+
+                        var pass1 = wp.passwords.pass1.val(), pass2 = wp.passwords.pass2.val(), strength;
+
+                        wp.passwords.results.removeClass('short bad good strong');
+                        if ( ! pass1 ) {
+                                wp.passwords.results.html( pwsL10n.empty );
+                                return;
+                        }
+
+                        strength = wp.passwordStrength.meter( pass1, wp.passwordStrength.userInputBlacklist(), pass2 );
+
+                        switch ( strength ) {
+                                case 2:
+                                        wp.passwords.results.addClass('bad').html( pwsL10n.bad );
+                                        break;
+                                case 3:
+                                        wp.passwords.results.addClass('good').html( pwsL10n.good );
+                                        break;
+                                case 4:
+                                        wp.passwords.results.addClass('strong').html( pwsL10n.strong );
+                                        break;
+                                case 5:
+                                        wp.passwords.results.addClass('short').html( pwsL10n.mismatch );
+                                        break;
+                                default:
+                                        wp.passwords.results.addClass('short').html( pwsL10n['short'] );
+                        }
+
+                        wp.passwords.results.show();
+
+                }
+
+        };
+
 }(jQuery));