X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..refs/tags/wordpress-3.1.4-scripts:/wp-login.php diff --git a/wp-login.php b/wp-login.php index 62898123..0f471b0d 100644 --- a/wp-login.php +++ b/wp-login.php @@ -39,40 +39,56 @@ if ( force_ssl_admin() && !is_ssl() ) { * @param WP_Error $wp_error Optional. WordPress Error Object */ function login_header($title = 'Log In', $message = '', $wp_error = '') { - global $error, $is_iphone; + global $error, $is_iphone, $interim_login, $current_site; // Don't index any of these forms - add_filter( 'pre_option_blog_public', create_function( '$a', 'return 0;' ) ); + add_filter( 'pre_option_blog_public', '__return_zero' ); add_action( 'login_head', 'noindex' ); if ( empty($wp_error) ) $wp_error = new WP_Error(); + + // Shake it! + $shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' ); + $shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes ); + + if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) + add_action( 'login_head', 'wp_shake_js', 12 ); + ?> > <?php bloginfo('name'); ?> › <?php echo $title; ?> - - - - + + + do_action( 'login_enqueue_scripts' ); + do_action( 'login_head' ); ?> + +

+ +

+

-\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 .= get_option('siteurl') . "\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 .= site_url("wp-login.php?action=rp&key=$key", '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; + 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] Password Reset'), get_option('blogname')); + $title = sprintf( __('[%s] Password Reset'), $blogname ); $title = apply_filters('retrieve_password_title', $title); $message = apply_filters('retrieve_password_message', $message, $key); if ( $message && !wp_mail($user_email, $title, $message) ) - die('

' . __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') . '

'); + wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') ); return true; } /** - * 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) { +function check_password_reset_key($key, $login) { global $wpdb; $key = preg_replace('/[^a-z0-9]/i', '', $key); - if ( empty( $key ) ) + if ( empty( $key ) || !is_string( $key ) ) return new WP_Error('invalid_key', __('Invalid key')); - $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s", $key)); + if ( empty($login) || !is_string($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_usermeta($user->ID, 'default_password_nag', 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"; - - $title = sprintf(__('[%s] Your new password'), get_option('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) ) - 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; } /** @@ -225,45 +288,49 @@ function reset_password($key) { * @param string $user_email User's email address to send password and add * @return int|WP_Error Either user's ID or error on failure. */ -function register_new_user($user_login, $user_email) { +function register_new_user( $user_login, $user_email ) { $errors = new WP_Error(); - $user_login = sanitize_user( $user_login ); + $sanitized_user_login = sanitize_user( $user_login ); $user_email = apply_filters( 'user_registration_email', $user_email ); // Check the username - if ( $user_login == '' ) - $errors->add('empty_username', __('ERROR: Please enter a username.')); - elseif ( !validate_username( $user_login ) ) { - $errors->add('invalid_username', __('ERROR: This username is invalid. Please enter a valid username.')); - $user_login = ''; - } elseif ( username_exists( $user_login ) ) - $errors->add('username_exists', __('ERROR: This username is already registered, please choose another one.')); + if ( $sanitized_user_login == '' ) { + $errors->add( 'empty_username', __( 'ERROR: Please enter a username.' ) ); + } elseif ( ! validate_username( $user_login ) ) { + $errors->add( 'invalid_username', __( 'ERROR: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); + $sanitized_user_login = ''; + } elseif ( username_exists( $sanitized_user_login ) ) { + $errors->add( 'username_exists', __( 'ERROR: This username is already registered, please choose another one.' ) ); + } // Check the e-mail address - if ($user_email == '') { - $errors->add('empty_email', __('ERROR: Please type your e-mail address.')); - } elseif ( !is_email( $user_email ) ) { - $errors->add('invalid_email', __('ERROR: The email address isn’t correct.')); + if ( $user_email == '' ) { + $errors->add( 'empty_email', __( 'ERROR: Please type your e-mail address.' ) ); + } elseif ( ! is_email( $user_email ) ) { + $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ) ); $user_email = ''; - } elseif ( email_exists( $user_email ) ) - $errors->add('email_exists', __('ERROR: This email is already registered, please choose another one.')); + } elseif ( email_exists( $user_email ) ) { + $errors->add( 'email_exists', __( 'ERROR: This email is already registered, please choose another one.' ) ); + } - do_action('register_post', $user_login, $user_email, $errors); + do_action( 'register_post', $sanitized_user_login, $user_email, $errors ); - $errors = apply_filters( 'registration_errors', $errors ); + $errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email ); if ( $errors->get_error_code() ) return $errors; - $user_pass = wp_generate_password(); - $user_id = wp_create_user( $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'))); + $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' ) ) ); return $errors; } - wp_new_user_notification($user_id, $user_pass); + update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag. + + wp_new_user_notification( $user_id, $user_pass ); return $user_id; } @@ -279,7 +346,7 @@ if ( isset($_GET['key']) ) $action = 'resetpass'; // validate action so as to default to the login screen -if ( !in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action) ) +if ( !in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login'), true) && false === has_filter('login_form_' . $action) ) $action = 'login'; nocache_headers(); @@ -290,7 +357,7 @@ if ( defined('RELOCATE') ) { // Move flag is set if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] ); - $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; + $schema = is_ssl() ? 'https://' : 'http://'; if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') ) update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); } @@ -301,7 +368,8 @@ if ( SITECOOKIEPATH != COOKIEPATH ) setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN); // allow plugins to override the default actions, and to add extra actions if they want -do_action('login_form_' . $action); +do_action( 'login_init' ); +do_action( 'login_form_' . $action ); $http_post = ('POST' == $_SERVER['REQUEST_METHOD']); switch ($action) { @@ -310,29 +378,29 @@ case 'logout' : check_admin_referer('log-out'); wp_logout(); - $redirect_to = 'wp-login.php?loggedout=true'; - if ( isset( $_REQUEST['redirect_to'] ) ) - $redirect_to = $_REQUEST['redirect_to']; - - wp_safe_redirect($redirect_to); + $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true'; + wp_safe_redirect( $redirect_to ); exit(); break; case 'lostpassword' : case 'retrievepassword' : + if ( $http_post ) { $errors = retrieve_password(); if ( !is_wp_error($errors) ) { - wp_redirect('wp-login.php?checkemail=confirm'); + $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm'; + wp_safe_redirect( $redirect_to ); exit(); } } if ( isset($_GET['error']) && 'invalidkey' == $_GET['error'] ) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.')); + $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']) : ''; @@ -344,64 +412,103 @@ 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 ); + +?> +
+ + +

+ +

+

+ +

+
+

+ +
+

+
+ + + +' . __('Register For This Site') . '

', $errors); ?> @@ -417,7 +524,8 @@ case 'register' :


-

+ +

-
- -

- - - - has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) - $redirect_to = admin_url('profile.php'); + if ( !is_wp_error($user) && !$reauth ) { + if ( $interim_login ) { + $message = '

' . __('You have logged in successfully.') . '

'; + login_header( '', $message ); ?> + +

+

+ +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(); } $errors = $user; // Clear errors if loggedout is set. - if ( !empty($_GET['loggedout']) ) + if ( !empty($_GET['loggedout']) || $reauth ) $errors = new WP_Error(); // If cookies are disabled we can't log in even with a valid user+pass @@ -486,19 +608,30 @@ default: $errors->add('test_cookie', __("ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.")); // Some parts of this script use the main login form to display a message - if ( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] ) $errors->add('loggedout', __('You are now logged out.'), 'message'); - elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) $errors->add('registerdisabled', __('User registration is currently not allowed.')); - elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message'); - elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); - elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); + if ( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] ) + $errors->add('loggedout', __('You are now logged out.'), 'message'); + elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) + $errors->add('registerdisabled', __('User registration is currently not allowed.')); + elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) + $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message'); + elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) + $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); + elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) + $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); + elseif ( $interim_login ) + $errors->add('expired', __('Your session has expired. Please log-in again.'), 'message'); + + // Clear any stale cookies. + if ( $reauth ) + wp_clear_auth_cookie(); login_header(__('Log In'), '', $errors); if ( isset($_POST['log']) ) $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(stripslashes($_POST['log'])) : ''; + $rememberme = ! empty( $_POST['rememberme'] ); ?> -

-

+

- + + + + +

- + - - -

+

+ + + +