X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4f9d63e13cd8c6e275797c75b401b074b82937bc..refs/tags/wordpress-3.1-scripts:/wp-login.php diff --git a/wp-login.php b/wp-login.php index c97edd93..ab9cff55 100644 --- a/wp-login.php +++ b/wp-login.php @@ -79,13 +79,14 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { + do_action( 'login_enqueue_scripts' ); + do_action( 'login_head' ); ?> -

+

-

+

' . apply_filters('login_messages', $messages) . "

\n"; } } // End of login_header() + +/** + * Outputs the footer for the login page. + * + * @param string $input_id Which input to auto-focus + */ +function login_footer($input_id = '') { + echo "
\n"; + + if ( !empty($input_id) ) { +?> + + +

+ + + +update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login)); } - $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; + $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n"; $message .= network_site_url() . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; - $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; - $message .= network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n"; + $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n"; + $message .= __('To reset your password, visit the following address:') . "\r\n\r\n"; + $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n"; if ( is_multisite() ) $blogname = $GLOBALS['current_site']->site_name; @@ -211,14 +238,16 @@ function retrieve_password() { } /** - * Handles resetting the user's password. + * Retrieves a user row based on password reset key and login * * @uses $wpdb WordPress Database object * * @param string $key Hash to validate sending user's password - * @return bool|WP_Error + * @param string $login The user login + * + * @return object|WP_Error */ -function reset_password($key, $login) { +function check_password_reset_key($key, $login) { global $wpdb; $key = preg_replace('/[^a-z0-9]/i', '', $key); @@ -230,38 +259,26 @@ function reset_password($key, $login) { return new WP_Error('invalid_key', __('Invalid key')); $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login)); + if ( empty( $user ) ) return new WP_Error('invalid_key', __('Invalid key')); - // Generate something random for a password... - $new_pass = wp_generate_password(); + return $user; +} +/** + * Handles resetting the user's password. + * + * @uses $wpdb WordPress Database object + * + * @param string $key Hash to validate sending user's password + */ +function reset_password($user, $new_pass) { do_action('password_reset', $user, $new_pass); wp_set_password($new_pass, $user->ID); - update_user_option($user->ID, 'default_password_nag', true, true); //Set up the Password change nag. - $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n"; - $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n"; - $message .= site_url('wp-login.php', 'login') . "\r\n"; - - if ( is_multisite() ) - $blogname = $GLOBALS['current_site']->site_name; - else - // The blogname option is escaped with esc_html on the way into the database in sanitize_option - // we want to reverse this for the plain text arena of emails. - $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); - - $title = sprintf( __('[%s] Your new password'), $blogname ); - - $title = apply_filters('password_reset_title', $title); - $message = apply_filters('password_reset_message', $message, $new_pass); - - if ( $message && !wp_mail($user->user_email, $title, $message) ) - wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') ); wp_password_change_notification($user); - - return true; } /** @@ -304,7 +321,7 @@ function register_new_user( $user_login, $user_email ) { if ( $errors->get_error_code() ) return $errors; - $user_pass = wp_generate_password(); + $user_pass = wp_generate_password( 12, false); $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email ); if ( ! $user_id ) { $errors->add( 'registerfail', sprintf( __( 'ERROR: Couldn’t register you... please contact the webmaster !' ), get_option( 'admin_email' ) ) ); @@ -368,6 +385,7 @@ break; case 'lostpassword' : case 'retrievepassword' : + if ( $http_post ) { $errors = retrieve_password(); if ( !is_wp_error($errors) ) { @@ -381,7 +399,7 @@ case 'retrievepassword' : $redirect_to = apply_filters( 'lostpassword_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' ); do_action('lost_password'); - login_header(__('Lost Password'), '

' . __('Please enter your username or e-mail address. You will receive a new password via e-mail.') . '

', $errors); + login_header(__('Lost Password'), '

' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '

', $errors); $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : ''; @@ -398,58 +416,87 @@ case 'retrievepassword' : -
- -

- - - - ' . __('Your password has been reset.') . ' ' . __('Log in') . '

'); + login_footer(); + exit; + } + wp_enqueue_script('utils'); + wp_enqueue_script('user-profile'); + + login_header(__('Reset Password'), '

' . __('Enter your new password below.') . '

', $errors ); + +?> +
+ + +

+ +

+

+ +

+ +
+

+ +
+

+
+ + + +" title="">

-
- -

- - - - has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) - $redirect_to = admin_url('profile.php'); + + if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) { + // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile. + if ( is_multisite() && !get_active_blog_for_user($user->id) ) + $redirect_to = user_admin_url(); + elseif ( is_multisite() && !$user->has_cap('read') ) + $redirect_to = get_dashboard_url( $user->id ); + elseif ( !$user->has_cap('edit_posts') ) + $redirect_to = admin_url('profile.php'); + } wp_safe_redirect($redirect_to); exit(); } @@ -619,7 +664,7 @@ default:

-

+

@@ -629,11 +674,17 @@ function wp_attempt_focus(){ setTimeout( function(){ try{ d = document.getElementById('user_pass'); +d.value = ''; d = document.getElementById('user_login'); - +get_error_code() ) { ?> +if( d.value != '' ) d.value = ''; + d.focus(); +d.select(); } catch(e){} }, 200); } @@ -643,6 +694,7 @@ wp_attempt_focus(); if(typeof wpOnload=='function')wpOnload(); +