X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7688c6ba71852cd89123b62b2d57683535e4702a..11be8dc178e77d0b46189bbd8e33a216a9b90942:/wp-login.php
diff --git a/wp-login.php b/wp-login.php
index d77428f6..dab6324f 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -1,49 +1,58 @@
element.
+ * @param string $message Optional. Message to display in header.
+ * @param WP_Error $wp_error Optional. WordPress Error Object
+ */
+function login_header($title = 'Log In', $message = '', $wp_error = '') {
+ global $error;
+
+ if ( empty($wp_error) )
+ $wp_error = new WP_Error();
?>
>
›
-
-
-
-
+
@@ -51,30 +60,220 @@ function login_header($title = 'Login', $message = '') {
add('error', $error);
unset($error);
}
- if ( !empty( $errors ) ) {
- if ( is_array( $errors ) ) {
- $newerrors = "\n";
- foreach ( $errors as $error ) $newerrors .= ' ' . $error . "
\n";
- $errors = $newerrors;
+ if ( $wp_error->get_error_code() ) {
+ $errors = '';
+ $messages = '';
+ foreach ( $wp_error->get_error_codes() as $code ) {
+ $severity = $wp_error->get_error_data($code);
+ foreach ( $wp_error->get_error_messages($code) as $error ) {
+ if ( 'message' == $severity )
+ $messages .= ' ' . $error . "
\n";
+ else
+ $errors .= ' ' . $error . "
\n";
+ }
}
-
- echo '' . apply_filters('login_errors', $errors) . "
\n";
+ if ( !empty($errors) )
+ echo '' . apply_filters('login_errors', $errors) . "
\n";
+ if ( !empty($messages) )
+ echo '' . apply_filters('login_messages', $messages) . "
\n";
}
} // End of login_header()
+/**
+ * Handles sending password retrieval email to user.
+ *
+ * @uses $wpdb WordPress Database object
+ *
+ * @return bool|WP_Error True: when finish. WP_Error on error
+ */
+function retrieve_password() {
+ global $wpdb;
+
+ $errors = new WP_Error();
+
+ if ( empty( $_POST['user_login'] ) && empty( $_POST['user_email'] ) )
+ $errors->add('empty_username', __('ERROR: Enter a username or e-mail address.'));
+
+ if ( 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.'));
+ } else {
+ $login = trim($_POST['user_login']);
+ $user_data = get_userdatabylogin($login);
+ }
+
+ do_action('lostpassword_post');
+
+ if ( $errors->get_error_code() )
+ return $errors;
+
+ if ( !$user_data ) {
+ $errors->add('invalidcombo', __('ERROR: Invalid username or e-mail.'));
+ return $errors;
+ }
+
+ // redefining user_login ensures we return the right case in the email
+ $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);
+
+ 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->query($wpdb->prepare("UPDATE $wpdb->users SET user_activation_key = %s WHERE user_login = %s", $key, $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 .= 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";
+
+ if ( !wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message) )
+ 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.
+ *
+ * @uses $wpdb WordPress Database object
+ *
+ * @param string $key Hash to validate sending user's password
+ * @return bool|WP_Error
+ */
+function reset_password($key) {
+ global $wpdb;
+
+ $key = preg_replace('/[^a-z0-9]/i', '', $key);
+
+ if ( empty( $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( $user ) )
+ return new WP_Error('invalid_key', __('Invalid key'));
+
+ do_action('password_reset', $user);
+
+ // Generate something random for a password...
+ $new_pass = wp_generate_password();
+ 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 .= site_url('wp-login.php', 'login') . "\r\n";
+
+ if ( !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $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;
+}
+
+/**
+ * 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();
+
+ $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.'));
+
+ // 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', $user_login, $user_email, $errors);
+
+ $errors = apply_filters( 'registration_errors', $errors );
+
+ 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')));
+ return $errors;
+ }
+
+ wp_new_user_notification($user_id, $user_pass);
+
+ return $user_id;
+}
+
+//
+// Main
+//
+
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+$errors = new WP_Error();
+
+if ( isset($_GET['key']) )
+ $action = 'resetpass';
+
+nocache_headers();
+
+header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
+
+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://';
+ if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
+ update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
+}
+
+//Set a cookie now to see if they are supported by the browser.
+setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
+if ( SITECOOKIEPATH != COOKIEPATH )
+ setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
+$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
switch ($action) {
case 'logout' :
-
- wp_clearcookie();
- do_action('wp_logout');
+ check_admin_referer('log-out');
+ wp_logout();
$redirect_to = 'wp-login.php?loggedout=true';
if ( isset( $_REQUEST['redirect_to'] ) )
@@ -87,80 +286,48 @@ break;
case 'lostpassword' :
case 'retrievepassword' :
- $user_login = '';
- $user_pass = '';
-
- if ( $_POST ) {
- if ( empty( $_POST['user_login'] ) )
- $errors['user_login'] = __('ERROR: The username field is empty.');
- if ( empty( $_POST['user_email'] ) )
- $errors['user_email'] = __('ERROR: The e-mail field is empty.');
-
- do_action('lostpassword_post');
-
- if ( empty( $errors ) ) {
- $user_data = get_userdatabylogin(trim($_POST['user_login']));
- // redefining user_login ensures we return the right case in the email
- $user_login = $user_data->user_login;
- $user_email = $user_data->user_email;
-
- if (!$user_email || $user_email != $_POST['user_email']) {
- $errors['invalidcombo'] = __('ERROR: Invalid username / e-mail combination.');
- } else {
- do_action('retreive_password', $user_login); // Misspelled and deprecated
- do_action('retrieve_password', $user_login);
-
- // Generate something random for a password... md5'ing current time with a rand salt
- $key = substr( md5( uniqid( microtime() ) ), 0, 8);
- // Now insert the new pass md5'd into the db
- $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE 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 .= 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 .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
-
- if (FALSE == wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message)) {
- die('' . __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') . '
');
- } else {
- wp_redirect('wp-login.php?checkemail=confirm');
- exit();
- }
- }
+ if ( $http_post ) {
+ $errors = retrieve_password();
+ if ( !is_wp_error($errors) ) {
+ wp_redirect('wp-login.php?checkemail=confirm');
+ exit();
}
}
- if ( 'invalidkey' == $_GET['error'] ) $errors['invalidkey'] = __('Sorry, that key does not appear to be valid.');
+ if ( isset($_GET['error']) && 'invalidkey' == $_GET['error'] ) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.'));
do_action('lost_password');
- login_header(__('Lost Password'), '' . __('Please enter your username and e-mail address. You will receive a new password via e-mail.') . '
');
+ login_header(__('Lost Password'), '' . __('Please enter your username or e-mail address. You will receive a new password via e-mail.') . '
', $errors);
+
+ $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';
+
?>
-
-
-
+
+
+
+
+
+
get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'");
- if ( empty( $user ) ) {
- wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
+ if ( ! is_wp_error($errors) ) {
+ wp_redirect('wp-login.php?checkemail=newpass');
exit();
}
- do_action('password_reset');
-
- // Generate something random for a password... md5'ing current time with a rand salt
- $new_pass = substr( md5( uniqid( microtime() ) ), 0, 7);
- $wpdb->query("UPDATE $wpdb->users SET user_pass = MD5('$new_pass'), user_activation_key = '' WHERE user_login = '$user->user_login'");
- wp_cache_delete($user->ID, 'users');
- wp_cache_delete($user->user_login, 'userlogins');
- $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";
-
- if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message)) {
- die('' . __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') . '
');
- } else {
- // send a copy of password change notification to the admin
- // but check to see if it's the admin whose password we're changing, and skip this
- if ($user->user_email != get_option('admin_email')) {
- $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
- wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
- }
+ wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
+ exit();
- wp_redirect('wp-login.php?checkemail=newpass');
- exit();
- }
break;
case 'register' :
- if ( FALSE == get_option('users_can_register') ) {
+ if ( !get_option('users_can_register') ) {
wp_redirect('wp-login.php?registration=disabled');
exit();
}
- if ( $_POST ) {
+ $user_login = '';
+ $user_email = '';
+ if ( $http_post ) {
require_once( ABSPATH . WPINC . '/registration.php');
- $user_login = sanitize_user( $_POST['user_login'] );
- $user_email = apply_filters( 'user_registration_email', $_POST['user_email'] );
-
- // Check the username
- if ( $user_login == '' )
- $errors['user_login'] = __('ERROR: Please enter a username.');
- elseif ( !validate_username( $user_login ) ) {
- $errors['user_login'] = __('ERROR: This username is invalid. Please enter a valid username.');
- $user_login = '';
- } elseif ( username_exists( $user_login ) )
- $errors['user_login'] = __('ERROR: This username is already registered, please choose another one.');
-
- // Check the e-mail address
- if ($user_email == '') {
- $errors['user_email'] = __('ERROR: Please type your e-mail address.');
- } elseif ( !is_email( $user_email ) ) {
- $errors['user_email'] = __('ERROR: The email address isn’t correct.');
- $user_email = '';
- } elseif ( email_exists( $user_email ) )
- $errors['user_email'] = __('ERROR: This email is already registered, please choose another one.');
-
- do_action('register_post');
-
- $errors = apply_filters( 'registration_errors', $errors );
-
- if ( empty( $errors ) ) {
- $user_pass = substr( md5( uniqid( microtime() ) ), 0, 7);
-
- $user_id = wp_create_user( $user_login, $user_pass, $user_email );
- if ( !$user_id )
- $errors['registerfail'] = sprintf(__('ERROR: Couldn’t register you... please contact the webmaster !'), get_option('admin_email'));
- else {
- wp_new_user_notification($user_id, $user_pass);
-
- wp_redirect('wp-login.php?checkemail=registered');
- exit();
- }
+ $user_login = $_POST['user_login'];
+ $user_email = $_POST['user_email'];
+ $errors = register_new_user($user_login, $user_email);
+ if ( !is_wp_error($errors) ) {
+ wp_redirect('wp-login.php?checkemail=registered');
+ exit();
}
}
- login_header(__('Registration Form'), '' . __('Register For This Site') . '
');
+ login_header(__('Registration Form'), '' . __('Register For This Site') . '
', $errors);
?>
-
+
+
+ |
+
+
+
-
+
+