Wordpress 3.0

[autoinstalls/wordpress.git] / wp-admin / js / password-strength-meter.dev.js

diff --git a/wp-admin/js/password-strength-meter.dev.js b/wp-admin/js/password-strength-meter.dev.js
index 0adb4ecc9b1e03e7e3c884205c85eaf097d68376..0f07a93785dbf34daba8af50f40dab0930b6e2a8 100644 (file)
--- a/wp-admin/js/password-strength-meter.dev.js
+++ b/wp-admin/js/password-strength-meter.dev.js
@@ -1,21 +1,36 @@
 // 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
+
+       if (score < 40 )
+               return badPass
+
+       if (score < 56 )
+               return goodPass
+
     return strongPass;
 }