Index: wp-login.php
===================================================================
--- wp-login.php (revision 6639)
+++ wp-login.php (working copy)
@@ -1,34 +1,12 @@
>
@@ -50,30 +28,182 @@
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 = "\n";
+ foreach ( $wp_error->get_error_messages() as $error )
+ $errors .= ' ' . $error . "
\n";
echo '' . apply_filters('login_errors', $errors) . "
\n";
}
} // End of login_header()
+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 ( strstr($_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);
+
+ // Generate something random for a key...
+ $key = wp_generate_password();
+ // Now insert the new md5 key 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 ( !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;
+}
+
+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("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'");
+ if ( empty( $user ) )
+ return new WP_Error('invalid_key', __('Invalid key'));
+
+ do_action('password_reset');
+
+ // 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 .= get_option('siteurl') . "/wp-login.php\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...') . '
');
+
+ // 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);
+ }
+
+ return true;
+}
+
+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');
+
+ $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 = $_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');
+ wp_logout();
$redirect_to = 'wp-login.php?loggedout=true';
if ( isset( $_REQUEST['redirect_to'] ) )
@@ -86,64 +216,25 @@
case 'lostpassword' :
case 'retrievepassword' :
- $user_login = '';
- $user_pass = '';
-
if ( $http_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 key...
- $key = substr( md5( uniqid( microtime() ) ), 0, 8);
- // Now insert the new md5 key 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();
- }
- }
+ $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 ( '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 and e-mail address. You will receive a new password via e-mail.') . '
', $errors);
?>