WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wp_set_password(). see #2394 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6396 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-12-17 06:02:45 +00:00
parent 26df2b24d1
commit 9572687394
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-includes/pluggable.php
View File

@ -304,24 +304,21 @@ function wp_login($username, $password, $deprecated = false) {
return false;
}
$login = get_userdatabylogin($username);
$user = get_userdatabylogin($username);
if ( !$login || ($login->user_login != $username) ) {
if ( !$user || ($user->user_login != $username) ) {
$error = __('<strong>ERROR</strong>: Invalid username.');
return false;
}
if ( !wp_check_password($password, $login->user_pass) ) {
if ( !wp_check_password($password, $user->user_pass) ) {
$error = __('<strong>ERROR</strong>: Incorrect password.');
return false;
}
// If using old md5 password, rehash.
if ( strlen($login->user_pass) <= 32 ) {
$hash = wp_hash_password($password);
$wpdb->query("UPDATE $wpdb->users SET user_pass = '$hash', user_activation_key = '' WHERE ID = '$login->ID'");
wp_cache_delete($login->ID, 'users');
}
if ( strlen($user->user_pass) <= 32 )
wp_set_password($password, $user->ID);
return true;
}
@ -770,6 +767,17 @@ function wp_generate_password() {
}
endif;
if ( !function_exists('wp_set_password') ) :
function wp_set_password( $password, $user_id ) {
global $wpdb;
$hash = wp_hash_password($password);
$query = $wpdb->prepare("UPDATE $wpdb->users SET user_pass = %s, user_activation_key = '' WHERE ID = %d", $hash, $user_id);
$wpdb->query($query);
wp_cache_delete($user_id, 'users');
}
endif;
// Deprecated. Use wp_set_auth_cookie()
if ( !function_exists('wp_setcookie') ) :
function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {

4
wp-login.php
View File

@ -184,9 +184,7 @@ case 'rp' :
// Generate something random for a password...
$new_pass = wp_generate_password();
$new_hash = wp_hash_password($new_pass);
$wpdb->query("UPDATE $wpdb->users SET user_pass = '$new_hash', user_activation_key = '' WHERE ID = '$user->ID'");
wp_cache_delete($user->ID, 'users');
wp_set_password($new_pass, $user->ID);
$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
$message .= get_option('siteurl') . "/wp-login.php\r\n";