Index: C:/workspace/WP/wp-admin/js/password-strength-meter.js
===================================================================
--- C:/workspace/WP/wp-admin/js/password-strength-meter.js	(revision 8071)
+++ C:/workspace/WP/wp-admin/js/password-strength-meter.js	(working copy)
@@ -1,80 +1,26 @@
 // Password strength meter
-// This jQuery plugin is written by firas kassem [2007.04.05]
-// Firas Kassem  phiras.wordpress.com || phiras at gmail {dot} com
-// for more information : http://phiras.wordpress.com/2007/04/08/password-strength-meter-a-jquery-plugin/
 
 var shortPass = pwsL10n.short
 var badPass = pwsL10n.bad
 var goodPass = pwsL10n.good
 var strongPass = pwsL10n.strong
 
-
 function passwordStrength(password,username) {
-    score = 0
-
-    //password < 4
+	//password < 4
     if (password.length < 4 ) { return shortPass }
 
     //password == username
     if (password.toLowerCase()==username.toLowerCase()) return badPass
-
-    //password length
-    score += password.length * 4
-    score += ( checkRepetition(1,password).length - password.length ) * 1
-    score += ( checkRepetition(2,password).length - password.length ) * 1
-    score += ( checkRepetition(3,password).length - password.length ) * 1
-    score += ( checkRepetition(4,password).length - password.length ) * 1
-
-    //password has 3 numbers
-    if (password.match(/(.*[0-9].*[0-9].*[0-9])/))  score += 5
-
-    //password has 2 sybols
-    if (password.match(/(.*[!,@,#,$,%,^,&,*,?,_,~].*[!,@,#,$,%,^,&,*,?,_,~])/)) score += 5
-
-    //password has Upper and Lower chars
-    if (password.match(/([a-z].*[A-Z])|([A-Z].*[a-z])/))  score += 10
-
-    //password has number and chars
-    if (password.match(/([a-zA-Z])/) && password.match(/([0-9])/))  score += 15
-    //
-    //password has number and symbol
-    if (password.match(/([!,@,#,$,%,^,&,*,?,_,~])/) && password.match(/([0-9])/))  score += 15
-
-    //password has char and symbol
-    if (password.match(/([!,@,#,$,%,^,&,*,?,_,~])/) && password.match(/([a-zA-Z])/))  score += 15
-
-    //password is just a nubers or chars
-    if (password.match(/^\w+$/) || password.match(/^\d+$/) )  score -= 10
-
-    //verifing 0 < score < 100
-    if ( score < 0 )  score = 0
-    if ( score > 100 )  score = 100
-
-    if (score < 34 )  return badPass
-    if (score < 68 )  return goodPass
+    
+	var symbolSize = 0;
+	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;
+	
+	var natLog = Math.log( Math.pow(symbolSize,password.length) );
+	var score = natLog / Math.LN2;
+    if (score < 40 )  return badPass
+    if (score < 56 )  return goodPass
     return strongPass
-}
-
-
-// checkRepetition(1,'aaaaaaabcbc')   = 'abcbc'
-// checkRepetition(2,'aaaaaaabcbc')   = 'aabc'
-// checkRepetition(2,'aaaaaaabcdbcd') = 'aabcd'
-
-function checkRepetition(pLen,str) {
-    res = ""
-    for ( i=0; i<str.length ; i++ ) {
-        repeated=true
-        for (j=0;j < pLen && (j+i+pLen) < str.length;j++)
-            repeated=repeated && (str.charAt(j+i)==str.charAt(j+i+pLen))
-        if (j<pLen) repeated=false
-        if (repeated) {
-            i+=pLen-1
-            repeated=false
-        }
-        else {
-            res+=str.charAt(i)
-        }
-    }
-    return res
-}
-
+}
\ No newline at end of file