diff options
| -rw-r--r-- | wp-login.php | 4 | ||||
| -rw-r--r-- | wp-register.php | 159 |
2 files changed, 2 insertions, 161 deletions
diff --git a/wp-login.php b/wp-login.php index fed84e1..135d6b7 100644 --- a/wp-login.php +++ b/wp-login.php @@ -81,7 +81,7 @@ if ($error) <ul> <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">« <?php _e('Back to blog') ?></a></li> <?php if (get_settings('users_can_register')) : ?> - <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li> + <li><a href="<?php bloginfo('wpurl'); ?>/wp-signup.php"><?php _e('Register') ?></a></li> <?php endif; ?> <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li> </ul> @@ -252,7 +252,7 @@ if ( $error ) { <ul> <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">« <?php _e('Back to blog') ?></a></li> <?php if (get_settings('users_can_register')) : ?> - <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li> + <li><a href="<?php bloginfo('wpurl'); ?>/wp-signup.php"><?php _e('Register') ?></a></li> <?php endif; ?> <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li> </ul> diff --git a/wp-register.php b/wp-register.php deleted file mode 100644 index 7c8adb3..0000000 --- a/wp-register.php +++ /dev/null @@ -1,159 +0,0 @@ -<?php -require('./wp-config.php'); -require_once( ABSPATH . WPINC . '/registration.php'); - -$action = $_REQUEST['action']; -if ( !get_settings('users_can_register') ) - $action = 'disabled'; - -header( 'Content-Type: ' . get_bloginfo('html_type') . '; charset=' . get_bloginfo('charset') ); - -switch( $action ) { - -case 'register': - - $user_login = sanitize_user( $_POST['user_login'] ); - $user_email = $_POST['user_email']; - - $errors = array(); - - if ( $user_login == '' ) - $errors['user_login'] = __('<strong>ERROR</strong>: Please enter a username.'); - - /* checking e-mail address */ - if ($user_email == '') { - $errors['user_email'] = __('<strong>ERROR</strong>: Please type your e-mail address.'); - } else if (!is_email($user_email)) { - $errors['user_email'] = __('<strong>ERROR</strong>: The email address isn’t correct.'); - $user_email = ''; - } - - if ( ! validate_username($user_login) ) { - $errors['user_login'] = __('<strong>ERROR</strong>: This username is invalid. Please enter a valid username.'); - $user_login = ''; - } - - if ( username_exists( $user_login ) ) - $errors['user_login'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.'); - - if ( email_exists( $user_email ) ) - $errors['user_email'] = __('<strong>ERROR</strong>: 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(__('<strong>ERROR</strong>: Couldn’t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_settings('admin_email')); - else - wp_new_user_notification($user_id, $password); - } - - if ( 0 == count($errors) ) { - - ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>WordPress » <?php _e('Registration Complete') ?></title> - <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" /> - <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" /> - <style type="text/css"> - .submit { - font-size: 1.7em; - } - </style> -</head> -<body> - -<div id="login"> - <h2><?php _e('Registration Complete') ?></h2> - <p><?php printf(__('Username: %s'), "<strong>" . wp_specialchars($user_login) . "</strong>") ?><br /> - <?php printf(__('Password: %s'), '<strong>' . __('emailed to you') . '</strong>') ?> <br /> - <?php printf(__('E-mail: %s'), "<strong>" . wp_specialchars($user_email) . "</strong>") ?></p> - <p class="submit"><a href="wp-login.php"><?php _e('Login »'); ?></a></p> -</div> -</body> -</html> - - <?php - break; - } - -default: - -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>WordPress » <?php _e('Registration Form') ?></title> - <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" /> - <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" /> - <style type="text/css"> - #user_email, #user_login, #submit { - font-size: 1.7em; - } - </style> -</head> - -<body> -<div id="login"> -<h1><a href="http://wordpress.org/">WordPress</a></h1> -<h2><?php _e('Register for this blog') ?></h2> -<?php if ( isset($errors) ) : ?> -<div class="error"> - <p> - <?php - foreach($errors as $error) echo "$error<br />"; - ?> - </p> -</div> -<?php endif; ?> -<form method="post" action="wp-register.php" id="registerform"> - <p><input type="hidden" name="action" value="register" /> - <label for="user_login"><?php _e('Username:') ?></label><br /> <input type="text" name="user_login" id="user_login" size="20" maxlength="20" value="<?php echo wp_specialchars($user_login); ?>" /><br /></p> - <p><label for="user_email"><?php _e('E-mail:') ?></label><br /> <input type="text" name="user_email" id="user_email" size="25" maxlength="100" value="<?php echo wp_specialchars($user_email); ?>" /></p> - <p><?php _e('A password will be emailed to you.') ?></p> - <p class="submit"><input type="submit" value="<?php _e('Register »') ?>" id="submit" name="submit" /></p> -</form> -<ul> - <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">« <?php _e('Back to blog') ?></a></li> - <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li> - <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li> -</ul> -</div> - -</body> -</html> -<?php - -break; - -case 'disabled': - - ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>WordPress » <?php _e('Registration Currently Disabled') ?></title> - <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" /> - <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css"> -</head> - -<body> - -<div id="login"> - <h2><?php _e('Registration Disabled') ?></h2> - <p><?php _e('User registration is currently not allowed.') ?><br /> - <a href="<?php echo get_settings('home'); ?>/" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a> - </p> -</div> - -</body> -</html> - - <?php -break; - -} -?> |