Ticket #4470: password-strength-meter2.diff

wp-admin/js/passwordStrengthMeter.js

@@ +1 @@
+// 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 = 'Too short'
+var badPass = 'Bad'
+var goodPass = 'Good'
+var strongPass = 'Strong'
+
+
+
+function passwordStrength(password,username)
+{
+    score = 0 
+    
+    //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
+    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
+}

wp-admin/profile.php

@@ -1 +1 @@
 <?php
 require_once('admin.php');
 
+function profile_js ( ) {
+?>
+<script type="text/javascript">
+        function check_pass_strength ( ) {
+
+                var pass = jQuery('#pass1').val();
+                var user = jQuery('#user_login').val();
+
+                // get the result as an object, i'm tired of typing it
+                var res = jQuery('#pass-strength-result');
+
+                var strength = passwordStrength(pass, user);
+
+                jQuery(res).removeClass('short bad good strong');
+
+                if ( strength == 'Bad' ) {
+                        jQuery(res).addClass('bad');
+                        jQuery(res).html( pwsL10n.bad );
+                }
+                else if ( strength == 'Good' ) {
+                        jQuery(res).addClass('good');
+                        jQuery(res).html( pwsL10n.good );
+                }
+                else if ( strength == 'Strong' ) {
+                        jQuery(res).addClass('strong');
+                        jQuery(res).html( pwsL10n.strong );
+                }
+                else {
+                        // this catches 'Too short' and the off chance anything else comes along
+                        jQuery(res).addClass('short');
+                        jQuery(res).html( pwsL10n.short );
+                }
+
+        }
+
+        jQuery(document).ready( function() { jQuery('#pass1').keyup( check_pass_strength ) } );
+</script>
+<?php
+}
+
+add_action('admin_head', 'profile_js');
+
+wp_enqueue_script('jquery');
+wp_enqueue_script('password-strength-meter');
+
 $title = __('Profile');
 
 if ( current_user_can('edit_users') )
@@ -42 +87 @@
 <fieldset id="information">
 <legend><?php _e('Name'); ?></legend>
 <p><label><?php _e('Username: (no editing)'); ?><br />
-<input type="text" name="user_login" value="<?php echo $profileuser->user_login; ?>" disabled="disabled" />
+<input type="text" name="user_login" id="user_login" value="<?php echo $profileuser->user_login; ?>" disabled="disabled" />
 </label></p>
 
 <p><label><?php _e('First name:') ?><br />
@@ -114 +159 @@
 <p><label><?php _e('Type it one more time:'); ?><br />
 <input type="password" name="pass2" id="pass2" size="16" value="" />
 </label></p>
+<p><strong><?php _e('Password Strength:'); ?></strong></p>
+<div id="pass-strength-result"><?php _e('Too short'); ?></div>
+<!--[if IE 6]><div id="pass-strength-iesucks"><?php _e("If you weren&#8217;t using this sucky IE6, there would be pretty colors... and cookies!"); ?></div><![endif]-->
+<p><?php _e('Hint: Use upper and lower case characters, numbers and symbols like !"£$%^&( in your password.'); ?></p>
 </fieldset>
 <?php endif; ?>
 

wp-admin/wp-admin.css

@@ -1355 +1355 @@
 }
 #update-nag a:link, .plugin-update a:link {
         color: #036;
-}
- No newline at end of file
+}
+
+#pass-strength-result { 
+        padding: 3px 5px 3px 5px;
+        margin-top: 3px;
+        text-align: center; 
+        background-color: #e3e3e3;
+        border: 1px solid #000000;
+}
+
+#pass-strength-result.short { 
+        background-color: #e3e3e3;
+        border: 1px solid #000000; 
+} 
+
+#pass-strength-result.bad { 
+        background-color: #ffeff7;
+        border: 1px solid #cc6699; 
+} 
+
+#pass-strength-result.good { 
+        background-color: #effff4;
+        border: 1px solid #66cc87; 
+} 
+
+#pass-strength-result.strong { 
+        background-color: #59ef86;
+        border: 1px solid #319f52;
+} 
+
+#pass-strength-iesucks { 
+        font-size: 8pt; 
+        text-align: center; 
+} 
+ No newline at end of file

wp-includes/script-loader.php

@@ -117 +117 @@
                         ) );
                         $this->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20071031' );
                         $this->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20070823' );
+                        $this->add( 'password-strength-meter', '/wp-admin/js/passwordStrengthMeter.js', array('jquery'), '20070405' ); 
+                        $this->localize( 'password-strength-meter', 'pwsL10n', array( 
+                                'short' => __('Too short'), 
+                                'bad' => __('Bad'), 
+                                'good' => __('Good'), 
+                                'strong' => __('Strong') 
+                        ) );
                         $this->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists'), '20071104' );
                         $this->add( 'admin-posts', '/wp-admin/js/edit-posts.js', array('wp-lists'), '20071023' );
                         $this->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20070823' );