Ticket #10396: js_pass_check_a.diff

wp-includes/script-loader.php

@@ -260 +260 @@
                         /* translators: password strength */
                         'good' => _x('Medium', 'password strength'),
                         'strong' => __('Strong'),
+                        'mismatch' => __('Mismatch'),
                         'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
                 ) );
 

wp-admin/js/password-strength-meter.dev.js

@@ -1 +1 @@
 // Password strength meter
-function passwordStrength(password,username) {
-    var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4, symbolSize = 0, natLog, score;
+function passwordStrength(password1,username,password2) {
+        var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4, mismatch = 5, symbolSize = 0, natLog, score;
 
+        // password 1 != password 2
+        if ( (password1 != password2) && password2.length > 0) { return mismatch };
         //password < 4
-    if (password.length < 4 ) { return shortPass };
+        if (password1.length < 4 ) { return shortPass };
 
-    //password == username
-    if (password.toLowerCase()==username.toLowerCase()) return badPass;
+        //password1 == username
+        if (password1.toLowerCase()==username.toLowerCase()) return badPass;
 
-        if (password.match(/[0-9]/)) symbolSize +=10;
-        if (password.match(/[a-z]/)) symbolSize +=26;
-        if (password.match(/[A-Z]/)) symbolSize +=26;
-        if (password.match(/[^a-zA-Z0-9]/)) symbolSize +=31;
+        if (password1.match(/[0-9]/)) symbolSize +=10;
+        if (password1.match(/[a-z]/)) symbolSize +=26;
+        if (password1.match(/[A-Z]/)) symbolSize +=26;
+        if (password1.match(/[^a-zA-Z0-9]/)) symbolSize +=31;
 
-        natLog = Math.log( Math.pow(symbolSize,password.length) );
+        natLog = Math.log( Math.pow(symbolSize,password1.length) );
         score = natLog / Math.LN2;
         if (score < 40 )  return badPass
         if (score < 56 )  return goodPass

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

@@ -1 +1 @@
 (function($){
 
         function check_pass_strength() {
-                var pass = $('#pass1').val(), user = $('#user_login').val(), strength;
+                var pass1 = $('#pass1').val(), user = $('#user_login').val(), pass2 = $('#pass2').val(), strength;
 
                 $('#pass-strength-result').removeClass('short bad good strong');
-                if ( ! pass ) {
+                if ( ! pass1 ) {
                         $('#pass-strength-result').html( pwsL10n.empty );
                         return;
                 }
 
-                strength = passwordStrength(pass, user);
+                strength = passwordStrength(pass1, user, pass2);
 
                 switch ( strength ) {
                         case 2:
@@ -21 +21 @@
                         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'] );
                 }
@@ -28 +31 @@
 
         $(document).ready( function() {
                 $('#pass1').val('').keyup( check_pass_strength );
+                $('#pass2').val('').keyup( check_pass_strength );
                 $('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
                 $('#nickname').blur(function(){
                         var str = $(this).val() || $('#user_login').val();

wp-admin/install.php

@@ -239 +239 @@
  short: "<?php echo esc_js( __( 'Very weak' ) ); ?>",
  bad: "<?php echo esc_js( __( 'Weak' ) ); ?>",
  good: "<?php echo esc_js( __( 'Medium' ) ); ?>",
- strong: "<?php echo esc_js( __( 'Strong' ) ); ?>"
+ strong: "<?php echo esc_js( __( 'Strong' ) ); ?>",
+ mismatch: "<?php echo esc_js( __( 'Mismatch' ) ); ?>"
 };
 try{convertEntities(pwsL10n);}catch(e){};
 /* ]]> */