From 08e984e5e880511cfbd40c02cc5501defdb7e7dd Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 12 Oct 2010 20:29:19 +0000
Subject: [PATCH] move password-strength-meter.js into user-profile.js. See
 #5919

git-svn-id: http://svn.automattic.com/wordpress/trunk@15780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/install.php                       |  1 -
 wp-admin/js/password-strength-meter.dev.js | 36 ----------------------
 wp-admin/js/password-strength-meter.js     |  1 -
 wp-admin/js/user-profile.dev.js            | 36 ++++++++++++++++++++++
 wp-admin/js/user-profile.js                |  2 +-
 wp-admin/user-edit.php                     |  1 -
 wp-admin/user-new.php                      |  1 -
 wp-includes/script-loader.php              |  9 ++----
 wp-login.php                               | 30 ++++++++++++++++++
 9 files changed, 70 insertions(+), 47 deletions(-)
 delete mode 100644 wp-admin/js/password-strength-meter.dev.js
 delete mode 100644 wp-admin/js/password-strength-meter.js

diff --git a/wp-admin/install.php b/wp-admin/install.php
index d23073b65..840ebb605 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -244,7 +244,6 @@ switch($step) {
 ?>
 <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
 <script type="text/javascript" src="../wp-includes/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="js/password-strength-meter.js"></script>
 <script type="text/javascript" src="js/user-profile.js"></script>
 <script type="text/javascript" src="js/utils.js"></script>
 <script type='text/javascript'>
diff --git a/wp-admin/js/password-strength-meter.dev.js b/wp-admin/js/password-strength-meter.dev.js
deleted file mode 100644
index 0f07a9378..000000000
--- a/wp-admin/js/password-strength-meter.dev.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Password strength meter
-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 ( password1.length < 4 )
-		return shortPass
-
-	//password1 == username
-	if ( password1.toLowerCase() == username.toLowerCase() )
-		return badPass;
-
-	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, password1.length) );
-	score = natLog / Math.LN2;
-
-	if (score < 40 )
-		return badPass
-
-	if (score < 56 )
-		return goodPass
-
-    return strongPass;
-}
diff --git a/wp-admin/js/password-strength-meter.js b/wp-admin/js/password-strength-meter.js
deleted file mode 100644
index 957d454a6..000000000
--- a/wp-admin/js/password-strength-meter.js
+++ /dev/null
@@ -1 +0,0 @@
-function passwordStrength(f,i,d){var k=1,h=2,b=3,a=4,c=5,g=0,j,e;if((f!=d)&&d.length>0){return c}if(f.length<4){return k}if(f.toLowerCase()==i.toLowerCase()){return h}if(f.match(/[0-9]/)){g+=10}if(f.match(/[a-z]/)){g+=26}if(f.match(/[A-Z]/)){g+=26}if(f.match(/[^a-zA-Z0-9]/)){g+=31}j=Math.log(Math.pow(g,f.length));e=j/Math.LN2;if(e<40){return h}if(e<56){return b}return a};
\ No newline at end of file
diff --git a/wp-admin/js/user-profile.dev.js b/wp-admin/js/user-profile.dev.js
index 4a2f39d61..39b73f39a 100644
--- a/wp-admin/js/user-profile.dev.js
+++ b/wp-admin/js/user-profile.dev.js
@@ -1,5 +1,41 @@
 (function($){
 
+	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 ( password1.length < 4 )
+			return shortPass
+
+		//password1 == username
+		if ( password1.toLowerCase() == username.toLowerCase() )
+			return badPass;
+
+		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, password1.length) );
+		score = natLog / Math.LN2;
+
+		if (score < 40 )
+			return badPass
+
+		if (score < 56 )
+			return goodPass
+
+		return strongPass;
+	}
+
 	function check_pass_strength() {
 		var pass1 = $('#pass1').val(), user = $('#user_login').val(), pass2 = $('#pass2').val(), strength;
 
diff --git a/wp-admin/js/user-profile.js b/wp-admin/js/user-profile.js
index 34c8231c5..1550ad3a7 100644
--- a/wp-admin/js/user-profile.js
+++ b/wp-admin/js/user-profile.js
@@ -1 +1 @@
-(function($){function check_pass_strength(){var pass1=$("#pass1").val(),user=$("#user_login").val(),pass2=$("#pass2").val(),strength;$("#pass-strength-result").removeClass("short bad good strong");if(!pass1){$("#pass-strength-result").html(pwsL10n.empty);return}strength=passwordStrength(pass1,user,pass2);switch(strength){case 2:$("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:$("#pass-strength-result").addClass("good").html(pwsL10n.good);break;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"])}}$(document).ready(function(){$("#pass1").val("").keyup(check_pass_strength);$("#pass2").val("").keyup(check_pass_strength);$("#pass-strength-result").show();$(".color-palette").click(function(){$(this).siblings("input[name=admin_color]").attr("checked","checked")});$("#nickname").blur(function(){var str=$(this).val()||$("#user_login").val();var select=$("#display_name");var sel=select.children("option:selected").attr("id");select.children("#display_nickname").remove();if(!select.children("option[value="+str+"]").length){select.append('<option id="display_nickname" value="'+str+'">'+str+"</option>")}$("#"+sel).attr("selected","selected")});$("#first_name, #last_name").blur(function(){var select=$("#display_name");var first=$("#first_name").val(),last=$("#last_name").val();var sel=select.children("option:selected").attr("id");$("#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst").remove();if(first&&!select.children("option[value="+first+"]").length){select.append('<option id="display_firstname" value="'+first+'">'+first+"</option>")}if(last&&!select.children("option[value="+last+"]").length){select.append('<option id="display_lastname" value="'+last+'">'+last+"</option>")}if(first&&last){if(!select.children("option[value="+first+" "+last+"]").length){select.append('<option id="display_firstlast" value="'+first+" "+last+'">'+first+" "+last+"</option>")}if(!select.children("option[value="+last+" "+first+"]").length){select.append('<option id="display_lastfirst" value="'+last+" "+first+'">'+last+" "+first+"</option>")}}$("#"+sel).attr("selected","selected")})})})(jQuery);
\ No newline at end of file
+(function(b){function a(i,l,g){var n=1,k=2,e=3,d=4,f=5,j=0,m,h;if((i!=g)&&g.length>0){return f}if(i.length<4){return n}if(i.toLowerCase()==l.toLowerCase()){return k}if(i.match(/[0-9]/)){j+=10}if(i.match(/[a-z]/)){j+=26}if(i.match(/[A-Z]/)){j+=26}if(i.match(/[^a-zA-Z0-9]/)){j+=31}m=Math.log(Math.pow(j,i.length));h=m/Math.LN2;if(h<40){return k}if(h<56){return e}return d}function c(){var f=b("#pass1").val(),e=b("#user_login").val(),d=b("#pass2").val(),g;b("#pass-strength-result").removeClass("short bad good strong");if(!f){b("#pass-strength-result").html(pwsL10n.empty);return}g=a(f,e,d);switch(g){case 2:b("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:b("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:b("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;case 5:b("#pass-strength-result").addClass("short").html(pwsL10n.mismatch);break;default:b("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}b(document).ready(function(){b("#pass1").val("").keyup(c);b("#pass2").val("").keyup(c);b("#pass-strength-result").show();b(".color-palette").click(function(){b(this).siblings("input[name=admin_color]").attr("checked","checked")});b("#nickname").blur(function(){var f=b(this).val()||b("#user_login").val();var d=b("#display_name");var e=d.children("option:selected").attr("id");d.children("#display_nickname").remove();if(!d.children("option[value="+f+"]").length){d.append('<option id="display_nickname" value="'+f+'">'+f+"</option>")}b("#"+e).attr("selected","selected")});b("#first_name, #last_name").blur(function(){var d=b("#display_name");var g=b("#first_name").val(),e=b("#last_name").val();var f=d.children("option:selected").attr("id");b("#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst").remove();if(g&&!d.children("option[value="+g+"]").length){d.append('<option id="display_firstname" value="'+g+'">'+g+"</option>")}if(e&&!d.children("option[value="+e+"]").length){d.append('<option id="display_lastname" value="'+e+'">'+e+"</option>")}if(g&&e){if(!d.children("option[value="+g+" "+e+"]").length){d.append('<option id="display_firstlast" value="'+g+" "+e+'">'+g+" "+e+"</option>")}if(!d.children("option[value="+e+" "+g+"]").length){d.append('<option id="display_lastfirst" value="'+e+" "+g+'">'+e+" "+g+"</option>")}}b("#"+f).attr("selected","selected")})})})(jQuery);
\ No newline at end of file
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index c10803980..896d01a31 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -24,7 +24,6 @@ elseif ( ! get_userdata( $user_id ) )
 	wp_die( __('Invalid user ID.') );
 
 wp_enqueue_script('user-profile');
-wp_enqueue_script('password-strength-meter');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
 if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index d28e81715..332b79985 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -128,7 +128,6 @@ add_contextual_help($current_screen,
 
 wp_enqueue_script('wp-ajax-response');
 wp_enqueue_script('user-profile');
-wp_enqueue_script('password-strength-meter');
 
 require_once ('admin-header.php');
 
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 012b0f64d..46cee3449 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -261,9 +261,9 @@ function wp_default_scripts( &$scripts ) {
 		$scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20090106' );
 		$scripts->add_data( 'admin-custom-fields', 'group', 1 );
 
-		$scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20100331' );
-		$scripts->add_data( 'password-strength-meter', 'group', 1 );
-		$scripts->localize( 'password-strength-meter', 'pwsL10n', array(
+		$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20101012' );
+		$scripts->add_data( 'user-profile', 'group', 1 );
+		$scripts->localize( 'user-profile', 'pwsL10n', array(
 			'empty' => __('Strength indicator'),
 			'short' => __('Very weak'),
 			'bad' => __('Weak'),
@@ -274,9 +274,6 @@ function wp_default_scripts( &$scripts ) {
 			'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
 		) );
 
-		$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20100925' );
-		$scripts->add_data( 'user-profile', 'group', 1 );
-
 		$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'list-table', 'jquery-ui-resizable', 'quicktags'), '20100818' );
 		$scripts->add_data( 'admin-comments', 'group', 1 );
 		$scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
diff --git a/wp-login.php b/wp-login.php
index 7013a932c..59c4551f8 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -334,6 +334,28 @@ function register_new_user( $user_login, $user_email ) {
 	return $user_id;
 }
 
+// TODO: Eliminate duplicated code from wp_default_scripts()
+function load_password_strength_meter() {
+	if ( !$guessurl = site_url() )
+		$guessurl = wp_guess_url();
+
+	$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
+
+	wp_enqueue_script( 'password-strength-meter', $guessurl . "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20100331' );
+	wp_localize_script( 'password-strength-meter', 'pwsL10n', array(
+		'empty' => __('Strength indicator'),
+		'short' => __('Very weak'),
+		'bad' => __('Weak'),
+		/* translators: password strength */
+		'good' => _x('Medium', 'password strength'),
+		'strong' => __('Strong'),
+		'mismatch' => __('Mismatch'),
+		'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
+	) );
+
+	wp_print_scripts( array('password-strength-meter') );
+}
+
 //
 // Main
 //
@@ -384,6 +406,7 @@ break;
 
 case 'lostpassword' :
 case 'retrievepassword' :
+
 	if ( $http_post ) {
 		$errors = retrieve_password();
 		if ( !is_wp_error($errors) ) {
@@ -445,6 +468,9 @@ case 'rp' :
 	}
 
 	login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Reset your password') . '</p>', $errors );
+
+	load_password_strength_meter();
+
 ?>
 <form name="resetpassform" id="resetpassform" action="<?php echo site_url('wp-login.php?action=resetpass&key=' . urlencode($_GET['key']) . '&login=' . urlencode($_GET['login']), 'login_post') ?>" method="post">
 	<p>
@@ -455,6 +481,10 @@ case 'rp' :
 		<label><?php _e('New Password Again') ?><br />
 		<input type="password" name="pass2" id="user_pass" class="input" size="20" value="" autocomplete="off" /></label>
 	</p>
+
+	<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
+	<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
+
 	<br class="clear" />
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Reset Password'); ?>" tabindex="100" /></p>
 </form>