Changeset 8722

Timestamp:

08/24/08 14:35:46 (3 months ago)

Author:

azaozz

Message:

Few small improvements to the password strength meter.

Files:

• trunk/wp-admin/js/password-strength-meter.js (modified) (1 diff)
• trunk/wp-admin/user-edit.php (modified) (2 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

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

@@ -4 +4 @@
-// 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
+var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4, score = 0, d, s, u, l;
-
-    //password < 4
-
+;
-
-    //password == username
-
+;
-
-    //password length
-
-
-
-
-
+;
+;
+;
+;
+;
-
-
-
+
+
+
+
+
+
+
-
-    //password has 2 sybols
-password.match(/(.*[!,@,#,$,%,^,&,*,?,_,~].*[!,@,#,$,%,^,&,*,?,_,~])/)) score += 5
+ s && s.length > 1 ) score += 10;
-
-    //password has Upper and Lower chars
-password.match(/([a-z].*[A-Z])|([A-Z].*[a-z])/))  score += 10
+ u && l ) score += 10;
-
-    //password has number and chars
-password.match(/([a-zA-Z])/) && password.match(/([0-9])/))  score += 15
+ u && l && d ) score += 15;
-    //
-    //password has number and symbol
-password.match(/([!,@,#,$,%,^,&,*,?,_,~])/) && password.match(/([0-9])/))  score += 15
+ s && d ) score += 15;
-
-
-password.match(/([!,@,#,$,%,^,&,*,?,_,~])/) && password.match(/([a-zA-Z])/))  score += 15
+Upper 
+ u && s ) score += 15;
-
-    //password is just a nubers or chars
-password.match(/^\w+$/) || password.match(/^\d+$/) )  score -= 10
+ ! s )  score -= 10;
-
-    //verifing 0 < score < 100
-
-
+;
+;
-
-score < 34 )  return badPass
-score < 68 )  return goodPass
-
+ score < 34 ) return badPass;
+ score < 68 || password.length < 7 ) return goodPass;
+;
-}
-

trunk/wp-admin/user-edit.php

@@ -24 +24 @@
-?>
-<script type="text/javascript">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        var strength = passwordStrength(pass, user);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        $('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
-    } );
-
-    jQuery(document).ready( function() {
-        jQuery('#pass1,#pass2').attr('autocomplete','off');
-        jQuery('#nickname').blur(update_nickname);
-    });
+})(jQuery);
-</script>
-<?php
@@ -350 +343 @@
-        <?php if ( $is_profile_page ): ?>
-        <p><strong><?php _e('Password Strength'); ?></strong></p>
-
+
+
-        <?php endif; ?>
-    </td>

trunk/wp-includes/script-loader.php

@@ -117 +117 @@
-        $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists'), '20071031' );
-        $scripts->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20070823' );
-70405
+80824
-        $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
-
-
-
+
+
+
+
-            'strong' => __('Strong')
-        ) );