diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 3ebef87d5f..f8e6351183 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -593,11 +593,10 @@ input.delete:hover { #login { position: relative; - background: url('images/login-bkg-tile.gif') no-repeat top center #fbfbfb; + background: url('images/login-bkg-tile.gif') no-repeat top center; color: #fff; - /* height: 430px; */ margin: 5em auto; - padding: 45px 50px 0; + padding: 20px 50px 0; width: 325px; } @@ -611,6 +610,11 @@ input.delete:hover { text-align: center; } +#login #login_error a { + color: #ebcd4e; + border-color: #ebcd4e; +} + #login #send { color: #fff; text-align: left; @@ -618,18 +622,25 @@ input.delete:hover { font-size: 1.1em; } -#login h1 { +#login h1 a { margin: 0 auto; - padding-bottom: 10px; - left: 137px; - height: 75px; - width: 75px; + height: 88px; + width: 320px; + display: block; + border-bottom: none; } -#login h1 a { - display: block; - text-indent: -9999px; - border-bottom: none; +#login .hide { + display: none; +} + +#login .message { + font-size: 10pt; + text-align: center; +} + +#login .register { + font-size: 20px; } #login input { @@ -640,21 +651,21 @@ input.delete:hover { background: url('images/login-bkg-bottom.gif') no-repeat bottom center; list-style: none; margin: 0 -50px; - padding: 0 50px 5px; + padding: 10px 50px 25px;; } #login ul:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } #login ul li { float: left; - font-size: 11px; - padding: 15px 0; + font-size: 12px; + padding: 5px 0; text-align: center; } @@ -673,7 +684,7 @@ input.delete:hover { color: #fff; } -#login #log, #pwd, #user_login, #email { +#login .input { font-size: 1.8em; margin-top: 3px; width: 97%; @@ -685,7 +696,11 @@ input.delete:hover { #login #submit { margin: 0; - font-size: 1.2em; + font-size: 15px; +} + +#login .fullwidth { + width: 320px; } #searchform { diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 17f2114248..063407e543 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -40,7 +40,7 @@ function wp_register( $before = '
  • ', $after = '
    • ' ) { if ( ! is_user_logged_in() ) { if ( get_option('users_can_register') ) - $link = $before . '' . __('Register') . '' . $after; + $link = $before . '' . __('Register') . '' . $after; else $link = ''; } else { diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 353d24aa71..6766d2acd7 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -178,7 +178,7 @@ function wp_login($username, $password, $already_md5 = false) { return false; if ( '' == $password ) { - $error = __('Error: The password field is empty.'); + $error = __('ERROR: The password field is empty.'); return false; } @@ -186,7 +186,7 @@ function wp_login($username, $password, $already_md5 = false) { //$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'"); if (!$login) { - $error = __('Error: Wrong username.'); + $error = __('ERROR: Invalid username.'); return false; } else { // If the password is already_md5, it has been double hashed. @@ -194,7 +194,7 @@ function wp_login($username, $password, $already_md5 = false) { if ( ($already_md5 && md5($login->user_pass) == $password) || ($login->user_login == $username && $login->user_pass == md5($password)) ) { return true; } else { - $error = __('Error: Incorrect password.'); + $error = __('ERROR: Incorrect password.'); $pwd = ''; return false; } diff --git a/wp-login.php b/wp-login.php index 9f355d4f22..68e4baadeb 100644 --- a/wp-login.php +++ b/wp-login.php @@ -2,7 +2,7 @@ require( dirname(__FILE__) . '/wp-config.php' ); $action = $_REQUEST['action']; -$error = ''; +$errors = array(); if ( isset($_GET['key']) ) $action = 'resetpass'; @@ -20,16 +20,61 @@ if ( defined('RELOCATE') ) { // Move flag is set update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); } -switch($action) { -case 'logout': +// Rather than duplicating this HTML all over the place, we'll stick it in function +function login_header($title = 'Login', $message = '') { + global $errors, $error; + + ?> + + + + <?php bloginfo('name'); ?> › <?php echo $title; ?> + + + + + + + + +
    +

    +\n"; + $errors = $newerrors; + } + + echo '
    ' . apply_filters('login_errors', $errors) . "
    \n"; + } +} // End of login_header() + + +switch ($action) { + +case 'logout' : wp_clearcookie(); do_action('wp_logout'); - nocache_headers(); - $redirect_to = 'wp-login.php'; - if ( isset($_REQUEST['redirect_to']) ) + $redirect_to = 'wp-login.php?loggedout=true'; + if ( isset( $_REQUEST['redirect_to'] ) ) $redirect_to = $_REQUEST['redirect_to']; wp_redirect($redirect_to); @@ -37,53 +82,78 @@ case 'logout': break; -case 'lostpassword': -do_action('lost_password'); -?> - - - - WordPress » <?php _e('Lost Password') ?> - - - - - - -
    -

    WordPress

    -

    -$error
    "; + + if ( 'invalidkey' == $_GET['error'] ) $errors['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 recieve a new password via e-mail.') . '

    '); ?> -
    -

    - -

    -


    -

    -

    + +

    + +

    +

    + +

    + +

    @@ -91,93 +161,132 @@ if ($error) user_login; - $user_email = $user_data->user_email; - - if (!$user_email || $user_email != $_POST['email']) - wp_die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? Try again.'), 'wp-login.php?action=lostpassword')); - -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"; - - $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message); - - if ($m == false) { - echo '

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

    "; - die(); - } else { - echo '

    ' . sprintf(__("The e-mail was sent successfully to %s's e-mail address."), $user_login) . '
    '; - echo "" . __('Click here to login!') . '

    '; - die(); - } - -break; - case 'resetpass' : case 'rp' : - // Generate something random for a password... md5'ing current time with a rand salt $key = preg_replace('/a-z0-9/i', '', $_GET['key']); - if ( empty($key) ) - wp_die( __('Sorry, that key does not appear to be valid.') ); + if ( empty( $key ) ) { + wp_redirect('wp-login.php?action=lostpassword&error=invalidkey'); + exit(); + } + $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'"); - if ( !$user ) - wp_die( __('Sorry, that key does not appear to be valid.') ); + if ( empty( $user ) ) { + wp_redirect('wp-login.php?action=lostpassword&error=invalidkey'); + 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'"); + $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"; - $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message); - - if ($m == false) { - echo '

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

    '; - die(); + 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 { - echo '

    ' . sprintf(__('Your new password is in the mail.'), $user_login) . '
    '; - echo "" . __('Click here to login!') . '

    '; // send a copy of password change notification to the admin $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); - die(); + + wp_redirect('wp-login.php?checkemail=newpass'); + exit(); } break; +case 'register' : + if ( FALSE == get_option('users_can_register') ) { + wp_redirect('wp-login.php?registration=disabled'); + exit(); + } + + if ( $_POST ) { + require_once( ABSPATH . WPINC . '/registration.php'); + + $user_login = sanitize_user( $_POST['user_login'] ); + $user_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'); + + 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(); + } + } + } + + login_header(__('Registration Form'), '

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

    '); +?> + +
    +

    + +

    +

    + +

    + +

    +

    +
    + + + + +Error: The password field is empty.'); } -?> - - - - WordPress › <?php _e('Login') ?> - - - - - + + if ( $_POST && empty( $user_login ) ) + $errors['user_login'] = __('ERROR: The username field is empty.'); + if ( $_POST && empty( $user_pass ) ) + $errors['user_pass'] = __('ERROR: The password field is empty.'); -
    -

    WordPress

    -$error
    "; + // Some parts of this script use the main login form to display a message + if ( TRUE == $_GET['loggedout'] ) $errors['loggedout'] = __('Successfully logged you out.'); + elseif ( 'disabled' == $_GET['registration'] ) $errors['registerdiabled'] = __('User registration is currently not allowed.'); + elseif ( 'confirm' == $_GET['checkemail'] ) $errors['confirm'] = __('Check your e-mail for the confirmation link.'); + elseif ( 'newpass' == $_GET['checkemail'] ) $errors['newpass'] = __('Check your e-mail for your new password.'); + elseif ( 'registered' == $_GET['checkemail'] ) $errors['registered'] = __('Registration complete. Please check your e-mail.'); + + login_header(__('Login')); ?>
    -

    -

    -

    -

    -

    - - -

    +

    + +

    +

    + +

    + +

    +

    + + +

    diff --git a/wp-register.php b/wp-register.php index 726c40036b..b223acba37 100644 --- a/wp-register.php +++ b/wp-register.php @@ -1,159 +1,10 @@ ERROR: Please enter a username.'); - - /* checking e-mail address */ - if ($user_email == '') { - $errors['user_email'] = __('ERROR: Please type your e-mail address.'); - } else if (!is_email($user_email)) { - $errors['user_email'] = __('ERROR: The email address isn’t correct.'); - $user_email = ''; - } - - if ( ! validate_username($user_login) ) { - $errors['user_login'] = __('ERROR: This username is invalid. Please enter a valid username.'); - $user_login = ''; - } - - if ( username_exists( $user_login ) ) - $errors['user_login'] = __('ERROR: This username is already registered, please choose another one.'); - - if ( email_exists( $user_email ) ) - $errors['user_email'] = __('ERROR: This email is already registered, please choose another one.'); - - if ( 0 == count($errors) ) { - $password = substr( md5( uniqid( microtime() ) ), 0, 7); - - $user_id = wp_create_user( $user_login, $password, $user_email ); - if ( !$user_id ) - $errors['user_id'] = sprintf(__('ERROR: Couldn’t register you... please contact the webmaster !'), get_option('admin_email')); - else - wp_new_user_notification($user_id, $password); - } - - if ( 0 == count($errors) ) { - - ?> - - - - WordPress » <?php _e('Registration Complete') ?> - - - - - - -
    -

    -

    " . wp_specialchars($user_login) . "") ?>
    - ' . __('emailed to you') . '') ?>
    - " . wp_specialchars($user_email) . "") ?>

    -

    -
    - - - - - - - - WordPress » <?php _e('Registration Form') ?> - - - - - - -
    -

    WordPress

    -

    - -
    -

    - "; - ?> -

    -
    - -
    -

    -

    -


    -

    -

    -
    - -
    - - - - - - - - WordPress » <?php _e('Registration Currently Disabled') ?> - - - - - - -
    -

    -


    - -

    -
    - - - - - +?> \ No newline at end of file