X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fa11948979fd6a4ea5705dc613b239699a459db3..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-login.php
diff --git a/wp-login.php b/wp-login.php
index 042f29a8..57b2a2ef 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -25,13 +25,13 @@ if ( force_ssl_admin() && ! is_ssl() ) {
/**
* Output the login page header.
*
- * @param string $title Optional. WordPress Log In Page title to display in
-
+
get_error_codes() as $code ) {
- $severity = $wp_error->get_error_data($code);
- foreach ( $wp_error->get_error_messages($code) as $error ) {
+ $severity = $wp_error->get_error_data( $code );
+ foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
if ( 'message' == $severity )
- $messages .= ' ' . $error . "
\n";
+ $messages .= ' ' . $error_message . "
\n";
else
- $errors .= ' ' . $error . "
\n";
+ $errors .= ' ' . $error_message . "
\n";
}
}
if ( ! empty( $errors ) ) {
@@ -234,6 +241,9 @@ function login_footer($input_id = '') {
@@ -257,18 +270,19 @@ function wp_login_viewport_meta() {
/**
* Handles sending password retrieval email to user.
*
- * @uses $wpdb WordPress Database object
+ * @global wpdb $wpdb WordPress database abstraction object.
+ * @global PasswordHash $wp_hasher Portable PHP password hashing framework.
*
* @return bool|WP_Error True: when finish. WP_Error on error
*/
function retrieve_password() {
- global $wpdb, $current_site, $wp_hasher;
+ global $wpdb, $wp_hasher;
$errors = new WP_Error();
if ( empty( $_POST['user_login'] ) ) {
$errors->add('empty_username', __('
ERROR: Enter a username or e-mail address.'));
- } else if ( strpos( $_POST['user_login'], '@' ) ) {
+ } elseif ( strpos( $_POST['user_login'], '@' ) ) {
$user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
if ( empty( $user_data ) )
$errors->add('invalid_email', __('
ERROR: There is no user registered with that email address.'));
@@ -292,23 +306,24 @@ function retrieve_password() {
return $errors;
}
- // redefining user_login ensures we return the right case in the email
+ // Redefining user_login ensures we return the right case in the email.
$user_login = $user_data->user_login;
$user_email = $user_data->user_email;
/**
* Fires before a new password is retrieved.
*
- * @since 1.5.2
- * @deprecated 1.5.2 Misspelled. Use 'retrieve_password' hook instead.
+ * @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.2
+ * @since 1.5.1
*
* @param string $user_login The user login name.
*/
@@ -324,10 +339,11 @@ function retrieve_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) )
+ if ( ! $allow ) {
+ return new WP_Error( 'no_password_reset', __('Password reset is not allowed for this user') );
+ } elseif ( is_wp_error( $allow ) ) {
return $allow;
+ }
// Generate something random for a password reset key.
$key = wp_generate_password( 20, false );
@@ -344,10 +360,10 @@ function retrieve_password() {
// Now insert the key, hashed, into the DB.
if ( empty( $wp_hasher ) ) {
- require_once ABSPATH . 'wp-includes/class-phpass.php';
+ require_once ABSPATH . WPINC . '/class-phpass.php';
$wp_hasher = new PasswordHash( 8, true );
}
- $hashed = $wp_hasher->HashPassword( $key );
+ $hashed = time() . ':' . $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";
@@ -360,8 +376,10 @@ function retrieve_password() {
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.
+ /*
+ * 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'), $blogname );
@@ -374,17 +392,21 @@ function retrieve_password() {
* @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
+ * @since 4.1.0 Added `$user_login` and `$user_data` parameters.
*
- * @param string $message Default mail message.
- * @param string $key The activation key.
+ * @param string $message Default mail message.
+ * @param string $key The activation key.
+ * @param string $user_login The username for the user.
+ * @param WP_User $user_data WP_User object.
*/
- $message = apply_filters( 'retrieve_password_message', $message, $key );
+ $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
- if ( $message && !wp_mail($user_email, $title, $message) )
+ 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;
@@ -418,9 +440,10 @@ if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set
}
//Set a cookie now to see if they are supported by the browser.
-setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
+$secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) && 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
+setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
if ( SITECOOKIEPATH != COOKIEPATH )
- setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
+ setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
/**
* Fires when the login form is initialized.
@@ -431,7 +454,7 @@ do_action( 'login_init' );
/**
* Fires before a specified login form action.
*
- * The dynamic portion of the hook name, $action, refers to the 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.
*
@@ -445,7 +468,7 @@ $interim_login = isset($_REQUEST['interim-login']);
switch ($action) {
case 'postpass' :
- require_once ABSPATH . 'wp-includes/class-phpass.php';
+ require_once ABSPATH . WPINC . '/class-phpass.php';
$hasher = new PasswordHash( 8, true );
/**
@@ -459,23 +482,39 @@ case 'postpass' :
* @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 );
+ $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
+ setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
wp_safe_redirect( wp_get_referer() );
exit();
-break;
-
case 'logout' :
check_admin_referer('log-out');
+
+ $user = wp_get_current_user();
+
wp_logout();
- $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true';
+ if ( ! empty( $_REQUEST['redirect_to'] ) ) {
+ $redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
+ } else {
+ $redirect_to = 'wp-login.php?loggedout=true';
+ $requested_redirect_to = '';
+ }
+
+ /**
+ * Filter the log out redirect URL.
+ *
+ * @since 4.2.0
+ *
+ * @param string $redirect_to The redirect destination URL.
+ * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.
+ * @param WP_User $user The WP_User object for the user that's logging out.
+ */
+ $redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user );
wp_safe_redirect( $redirect_to );
exit();
-break;
-
case 'lostpassword' :
case 'retrievepassword' :
@@ -489,10 +528,11 @@ case 'retrievepassword' :
}
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.' ) );
+ if ( 'invalidkey' == $_GET['error'] ) {
+ $errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) );
+ } elseif ( 'expiredkey' == $_GET['error'] ) {
+ $errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) );
+ }
}
$lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
@@ -508,7 +548,7 @@ case 'retrievepassword' :
/**
* Fires before the lost password form.
*
- * @since 1.5.2
+ * @since 1.5.1
*/
do_action( 'lost_password' );
@@ -518,14 +558,14 @@ case 'retrievepassword' :
?>
-
@@ -619,7 +688,8 @@ case 'rp' :
%s', esc_url( wp_registration_url() ), __( 'Register' ) );
- /** This filter is documented in wp-login.php */
+
+ /** This filter is documented in wp-includes/general-template.php */
echo ' | ' . apply_filters( 'register', $registration_url );
endif;
?>
@@ -631,7 +701,6 @@ break;
case 'register' :
if ( is_multisite() ) {
- $sign_up_url = network_site_url( 'wp-signup.php' );
/**
* Filter the Multisite sign up URL.
*
@@ -639,7 +708,7 @@ case 'register' :
*
* @param string $sign_up_url The sign up URL.
*/
- wp_redirect( apply_filters( 'wp_signup_location', $sign_up_url ) );
+ wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
exit;
}
@@ -673,14 +742,14 @@ case 'register' :
login_header(__('Registration Form'), '
' . __('Register For This Site') . '
', $errors);
?>
-