X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/baca9ce86a38dc54c4574890ee2d352fd81f78b2..245e789b234afa4525862e7a6e5e3c2e7a52ef20:/wp-login.php?ds=sidebyside
diff --git a/wp-login.php b/wp-login.php
index 209341fa..0197167f 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -23,75 +23,126 @@ if ( force_ssl_admin() && ! is_ssl() ) {
}
/**
- * Outputs the header for the login page.
+ * Output the login page header.
*
- * @uses do_action() Calls the 'login_head' for outputting HTML in the Log In
- * header.
- * @uses apply_filters() Calls 'login_headerurl' for the top login link.
- * @uses apply_filters() Calls 'login_headertitle' for the top login title.
- * @uses apply_filters() Calls 'login_message' on the message to display in the
- * header.
- * @uses $error The error global, which is checked for displaying errors.
- *
- * @param string $title Optional. WordPress Log In Page title to display in
- * element.
- * @param string $message Optional. Message to display in header.
+ * @param string $title Optional. WordPress Log In Page title to display in element. Default 'Log In'.
+ * @param string $message Optional. Message to display in header. Default empty.
+ * @param string $wp_error Optional. The error to pass. Default empty.
* @param WP_Error $wp_error Optional. WordPress Error Object
*/
-function login_header($title = 'Log In', $message = '', $wp_error = '') {
- global $error, $interim_login, $current_site, $action;
+function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
+ global $error, $interim_login, $action;
// Don't index any of these forms
add_action( 'login_head', 'wp_no_robots' );
+ if ( wp_is_mobile() )
+ add_action( 'login_head', 'wp_login_viewport_meta' );
+
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' );
+ /**
+ * Filter the error codes array for shaking the login form.
+ *
+ * @since 3.0.0
+ *
+ * @param array $shake_error_codes Error codes that shake the login form.
+ */
$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; ?>
- get_error_code() ) {
+ ?>
+
+ site_name;
+ $login_header_title = get_current_site()->site_name;
} else {
- $login_header_url = __( 'http://wordpress.org/' );
+ $login_header_url = __( 'https://wordpress.org/' );
$login_header_title = __( 'Powered by WordPress' );
}
- $login_header_url = apply_filters( 'login_headerurl', $login_header_url );
+ /**
+ * Filter link URL of the header logo above login form.
+ *
+ * @since 2.1.0
+ *
+ * @param string $login_header_url Login header logo URL.
+ */
+ $login_header_url = apply_filters( 'login_headerurl', $login_header_url );
+ /**
+ * Filter the title attribute of the header logo above login form.
+ *
+ * @since 2.1.0
+ *
+ * @param string $login_header_title Login header logo title attribute.
+ */
$login_header_title = apply_filters( 'login_headertitle', $login_header_title );
- // Don't allow interim logins to navigate away from the page.
- if ( $interim_login )
- $login_header_url = '#';
-
$classes = array( 'login-action-' . $action, 'wp-core-ui' );
if ( wp_is_mobile() )
$classes[] = 'mobile';
if ( is_rtl() )
$classes[] = 'rtl';
+ if ( $interim_login ) {
+ $classes[] = 'interim-login';
+ ?>
+
+
@@ -101,7 +152,14 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') {
unset( $login_header_url, $login_header_title );
- $message = apply_filters('login_message', $message);
+ /**
+ * Filter the message to display above the login form.
+ *
+ * @since 2.1.0
+ *
+ * @param string $message Login message text.
+ */
+ $message = apply_filters( 'login_message', $message );
if ( !empty( $message ) )
echo $message . "\n";
@@ -123,10 +181,26 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') {
$errors .= ' ' . $error . "
\n";
}
}
- if ( !empty($errors) )
- echo '' . apply_filters('login_errors', $errors) . "
\n";
- if ( !empty($messages) )
- echo '' . apply_filters('login_messages', $messages) . "
\n";
+ if ( ! empty( $errors ) ) {
+ /**
+ * Filter the error messages displayed above the login form.
+ *
+ * @since 2.1.0
+ *
+ * @param string $errors Login error message.
+ */
+ echo '' . apply_filters( 'login_errors', $errors ) . "
\n";
+ }
+ if ( ! empty( $messages ) ) {
+ /**
+ * Filter instructional messages displayed above the login form.
+ *
+ * @since 2.5.0
+ *
+ * @param string $messages Login messages.
+ */
+ echo '' . apply_filters( 'login_messages', $messages ) . "
\n";
+ }
}
} // End of login_header()
@@ -152,7 +226,13 @@ function login_footer($input_id = '') {
-
+
@@ -173,6 +253,12 @@ addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p.
+
+ get_error_code() )
return $errors;
@@ -210,24 +301,60 @@ function retrieve_password() {
$user_login = $user_data->user_login;
$user_email = $user_data->user_email;
- do_action('retreive_password', $user_login); // Misspelled and deprecated
- do_action('retrieve_password', $user_login);
-
- $allow = apply_filters('allow_password_reset', true, $user_data->ID);
+ /**
+ * Fires before a new password is retrieved.
+ *
+ * @since 1.5.0
+ * @deprecated 1.5.1 Misspelled. Use 'retrieve_password' hook instead.
+ *
+ * @param string $user_login The user login name.
+ */
+ do_action( 'retreive_password', $user_login );
+ /**
+ * Fires before a new password is retrieved.
+ *
+ * @since 1.5.1
+ *
+ * @param string $user_login The user login name.
+ */
+ do_action( 'retrieve_password', $user_login );
+
+ /**
+ * Filter whether to allow a password to be reset.
+ *
+ * @since 2.7.0
+ *
+ * @param bool true Whether to allow the password to be reset. Default true.
+ * @param int $user_data->ID The ID of the user attempting to reset a password.
+ */
+ $allow = apply_filters( 'allow_password_reset', true, $user_data->ID );
if ( ! $allow )
return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
else if ( is_wp_error($allow) )
return $allow;
- $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
- if ( empty($key) ) {
- // Generate something random for a key...
- $key = wp_generate_password(20, false);
- do_action('retrieve_password_key', $user_login, $key);
- // Now insert the new md5 key into the db
- $wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
+ // Generate something random for a password reset key.
+ $key = wp_generate_password( 20, false );
+
+ /**
+ * Fires when a password reset key is generated.
+ *
+ * @since 2.5.0
+ *
+ * @param string $user_login The username for the user.
+ * @param string $key The generated password reset key.
+ */
+ do_action( 'retrieve_password_key', $user_login, $key );
+
+ // Now insert the key, hashed, into the DB.
+ if ( empty( $wp_hasher ) ) {
+ require_once ABSPATH . 'wp-includes/class-phpass.php';
+ $wp_hasher = new PasswordHash( 8, true );
}
+ $hashed = $wp_hasher->HashPassword( $key );
+ $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user_login ) );
+
$message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n";
$message .= network_home_url( '/' ) . "\r\n\r\n";
$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
@@ -244,111 +371,30 @@ function retrieve_password() {
$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) )
- wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') );
+ /**
+ * Filter the subject of the password reset email.
+ *
+ * @since 2.8.0
+ *
+ * @param string $title Default email title.
+ */
+ $title = apply_filters( 'retrieve_password_title', $title );
+ /**
+ * Filter the message body of the password reset mail.
+ *
+ * @since 2.8.0
+ *
+ * @param string $message Default mail message.
+ * @param string $key The activation key.
+ */
+ $message = apply_filters( 'retrieve_password_message', $message, $key );
+
+ if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
+ wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function.') );
return true;
}
-/**
- * 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
- * @param string $login The user login
- * @return object|WP_Error User's database row on success, error object for invalid keys
- */
-function check_password_reset_key($key, $login) {
- global $wpdb;
-
- $key = preg_replace('/[^a-z0-9]/i', '', $key);
-
- if ( empty( $key ) || !is_string( $key ) )
- return new WP_Error('invalid_key', __('Invalid 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'));
-
- return $user;
-}
-
-/**
- * Handles resetting the user's password.
- *
- * @param object $user The user
- * @param string $new_pass New password for the user in plaintext
- */
-function reset_password($user, $new_pass) {
- do_action('password_reset', $user, $new_pass);
-
- wp_set_password($new_pass, $user->ID);
-
- wp_password_change_notification($user);
-}
-
-/**
- * Handles registering a new user.
- *
- * @param string $user_login User's username for logging in
- * @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 ) {
- $errors = new WP_Error();
-
- $sanitized_user_login = sanitize_user( $user_login );
- $user_email = apply_filters( 'user_registration_email', $user_email );
-
- // Check the username
- 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.' ) );
- $user_email = '';
- } elseif ( email_exists( $user_email ) ) {
- $errors->add( 'email_exists', __( 'ERROR: This email is already registered, please choose another one.' ) );
- }
-
- do_action( 'register_post', $sanitized_user_login, $user_email, $errors );
-
- $errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
-
- if ( $errors->get_error_code() )
- return $errors;
-
- $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;
- }
-
- 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;
-}
-
//
// Main
//
@@ -381,19 +427,44 @@ setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
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
+/**
+ * Fires when the login form is initialized.
+ *
+ * @since 3.2.0
+ */
do_action( 'login_init' );
+/**
+ * Fires before a specified login form action.
+ *
+ * The dynamic portion of the hook name, $action, refers to the action
+ * that brought the visitor to the login form. Actions include 'postpass',
+ * 'logout', 'lostpassword', etc.
+ *
+ * @since 2.8.0
+ */
do_action( 'login_form_' . $action );
$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
+$interim_login = isset($_REQUEST['interim-login']);
+
switch ($action) {
case 'postpass' :
require_once ABSPATH . 'wp-includes/class-phpass.php';
$hasher = new PasswordHash( 8, true );
- // 10 days
- setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( stripslashes( $_POST['post_password'] ) ), time() + 10 * DAY_IN_SECONDS, COOKIEPATH );
+ /**
+ * Filter the life span of the post password cookie.
+ *
+ * By default, the cookie expires 10 days from creation. To turn this
+ * into a session cookie, return 0.
+ *
+ * @since 3.7.0
+ *
+ * @param int $expires The expiry time, as passed to setcookie().
+ */
+ $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
+ setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH );
wp_safe_redirect( wp_get_referer() );
exit();
@@ -422,13 +493,33 @@ case 'retrievepassword' :
}
}
- 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'] : '' );
+ if ( isset( $_GET['error'] ) ) {
+ if ( 'invalidkey' == $_GET['error'] )
+ $errors->add( 'invalidkey', __( 'Sorry, that key does not appear to be valid.' ) );
+ elseif ( 'expiredkey' == $_GET['error'] )
+ $errors->add( 'expiredkey', __( 'Sorry, that key has expired. Please try again.' ) );
+ }
+
+ $lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+ /**
+ * Filter the URL redirected to after submitting the lostpassword/retrievepassword form.
+ *
+ * @since 3.0.0
+ *
+ * @param string $lostpassword_redirect The redirect destination URL.
+ */
+ $redirect_to = apply_filters( 'lostpassword_redirect', $lostpassword_redirect );
+
+ /**
+ * Fires before the lost password form.
+ *
+ * @since 1.5.1
+ */
+ do_action( 'lost_password' );
- do_action('lost_password');
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']) : '';
+ $user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
?>
@@ -437,16 +528,32 @@ case 'retrievepassword' :
-
+ tags, before the hidden fields.
+ *
+ * @since 2.1.0
+ */
+ do_action( 'lostpassword_form' ); ?>
-
- |
-
+%s', esc_url( wp_registration_url() ), __( 'Register' ) );
+ /**
+ * Filter the registration URL below the login form.
+ *
+ * @since 1.5.0
+ *
+ * @param string $registration_url Registration URL.
+ */
+ echo ' | ' . apply_filters( 'register', $registration_url );
+endif;
+?>
get_error_code() === 'expired_key' )
+ wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
+ else
+ wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
exit;
}
@@ -467,10 +592,19 @@ case 'rp' :
if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] )
$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+ /**
+ * Fires before the password reset procedure is validated.
+ *
+ * @since 3.5.0
+ *
+ * @param object $errors WP Error object.
+ * @param WP_User|WP_Error $user WP_User object if the login and reset key match. WP_Error object otherwise.
+ */
do_action( 'validate_password_reset', $errors, $user );
if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
reset_password($user, $_POST['pass1']);
+ setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
login_header( __( 'Password Reset' ), '' . __( 'Your password has been reset.' ) . ' ' . __( 'Log in' ) . '
' );
login_footer();
exit;
@@ -482,8 +616,8 @@ case 'rp' :
login_header(__('Reset Password'), '' . __('Enter your new password below.') . '
', $errors );
?>
-
-
- |
-
+%s', esc_url( wp_registration_url() ), __( 'Register' ) );
+ /** This filter is documented in wp-login.php */
+ echo ' | ' . apply_filters( 'register', $registration_url );
+endif;
+?>
' . __('Register For This Site') . '', $errors);
?>
-
+
-
-
- |
-
-
-
+%s', esc_url( wp_registration_url() ), __( 'Register' ) );
+ /** This filter is documented in wp-login.php */
+ echo apply_filters( 'register', $registration_url ) . ' | ';
+ endif;
+ ?>
+
@@ -735,6 +941,17 @@ d.select();
wp_attempt_focus();
if(typeof wpOnload=='function')wpOnload();
+
+(function(){
+try {
+ var i, links = document.getElementsByTagName('a');
+ for ( i in links ) {
+ if ( links[i].href )
+ links[i].target = '_blank';
+ }
+} catch(e){}
+}());
+