WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change login noun to Username. http://mosquito.wordpress.org/view.php?id=1088 Props: Albert 

git-svn-id: http://svn.automattic.com/wordpress/trunk@2437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-03-13 17:06:18 +00:00
parent 8b36e6be3a
commit 5123086148
7 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/install.php
View File

@ -193,11 +193,11 @@ upgrade_all();
<p><em><?php _e('Finished!'); ?></em></p>
<p><?php printf(__('Now you can <a href="%1$s">log in</a> with the <strong>login</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $random_password); ?></p>
<p><?php printf(__('Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $random_password); ?></p>
<p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?>
</p>
<dl>
<dt><?php _e('Login'); ?></dt>
<dt><?php _e('Username'); ?></dt>
<dd><code>admin</code></dd>
<dt><?php _e('Password'); ?></dt>
<dd><code><?php echo $random_password; ?></code></dd>

4
wp-admin/profile.php
View File

@ -30,7 +30,7 @@ case 'update':
/* checking the nickname has been typed */
if (empty($_POST["newuser_nickname"])) {
die (__("<strong>ERROR</strong>: please enter your nickname (can be the same as your login)"));
die (__("<strong>ERROR</strong>: please enter your nickname (can be the same as your username)"));
return false;
}
@ -144,7 +144,7 @@ if (isset($updated)) { ?>
<table width="99%" border="0" cellspacing="2" cellpadding="3" class="editform">
<tr>
<th width="33%" scope="row"><?php _e('Login:') ?></th>
<th width="33%" scope="row"><?php _e('Username:') ?></th>
<td width="67%"><?php echo $profiledata->user_login; ?></td>
</tr>
<tr>

4
wp-admin/user-edit.php
View File

@ -30,7 +30,7 @@ if ($edituser->user_level >= $user_level) die( __('You do not have permission to
/* checking the nickname has been typed */
if (empty($_POST["new_nickname"])) {
die (__("<strong>ERROR</strong>: please enter your nickname (can be the same as your login)"));
die (__("<strong>ERROR</strong>: please enter your nickname (can be the same as your username)"));
return false;
}
@ -99,7 +99,7 @@ if ($edituser->user_level >= $user_level) die( __('You do not have permission to
<form name="edituser" id="edituser" action="user-edit.php" method="post">
<table width="99%" border="0" cellspacing="2" cellpadding="3">
<tr>
<th width="33%" scope="row"><?php _e('Login:') ?></th>
<th width="33%" scope="row"><?php _e('Username:') ?></th>
<td width="73%"><input type="text" name="new_user_login" id="new_user_login" value="<?php echo $edituser->user_login; ?>" /></td>
</tr>
<tr>

10
wp-admin/users.php
View File

@ -32,9 +32,9 @@ case 'adduser':
$user_lastname = wp_specialchars($_POST['lastname']);
$user_uri = wp_specialchars($_POST['uri']);
/* checking login has been typed */
/* checking that username has been typed */
if ($user_login == '')
die (__('<strong>ERROR</strong>: Please enter a login.'));
die (__('<strong>ERROR</strong>: Please enter a username.'));
/* checking the password has been typed twice */
do_action('check_passwords', array($user_login, &$pass1, &$pass2));
@ -47,10 +47,10 @@ case 'adduser':
$user_nickname = $user_login;
/* checking the login isn't already used by another user */
/* checking that the username isn't already used by another user */
$loginthere = $wpdb->get_var("SELECT user_login FROM $wpdb->users WHERE user_login = '$user_login'");
if ($loginthere)
die (__('<strong>ERROR</strong>: This login is already registered, please choose another one.'));
die (__('<strong>ERROR</strong>: This username is already registered, please choose another one.'));
/* checking e-mail address */
if (empty($_POST["email"])) {
@ -82,7 +82,7 @@ case 'adduser':
$user_login = stripslashes($user_login);
$message = 'New user registration on your blog ' . get_settings('blogname') . ":\r\n\r\n";
$message .= "Login: $user_login\r\n\r\nE-mail: $user_email";
$message .= "Username: $user_login\r\n\r\nE-mail: $user_email";
@wp_mail(get_settings('admin_email'), '[' . get_settings('blogname') . '] New User Registration', $message);
header('Location: users.php');

2
wp-includes/functions.php
View File

@ -1678,7 +1678,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 = __('<strong>Error</strong>: Wrong login.');
$error = __('<strong>Error</strong>: Wrong username.');
return false;
} else {
// If the password is already_md5, it has been double hashed.

17
wp-login.php
View File

@ -66,9 +66,9 @@ if ($error)
<form name="lostpass" action="wp-login.php" method="post" id="lostpass">
<p>
<input type="hidden" name="action" value="retrievepassword" />
<label><?php _e('Login') ?>:<br />
<label><?php _e('Username:') ?><br />
<input type="text" name="user_login" id="user_login" value="" size="20" tabindex="1" /></label></p>
<p><label><?php _e('E-mail') ?>:<br />
<p><label><?php _e('E-mail:') ?><br />
<input type="text" name="email" id="email" value="" size="25" tabindex="2" /></label><br />
</p>
<p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Retrieve Password'); ?> &raquo;" tabindex="3" /></p>
@ -101,8 +101,9 @@ case 'retrievepassword':
$key = substr( md5( uniqid( microtime() ) ), 0, 50);
// 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 a password for the login this site\n\n " . get_option('siteurl') ) . "\n\n";
$message .= __('Login') . ": $user_login\r\n\r\n";
$message .= __("Someone has asked to reset the password for the following site and username.\n\n");
$message .= get_option('siteurl') . "\n\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.\n\n");
$message .= get_settings('siteurl') . "/wp-login.php?action=resetpass&key=$key";
@ -132,8 +133,8 @@ case 'resetpass' :
$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'");
$message = __('Login') . ": $user->user_login\r\n";
$message .= __('Password') . ": $new_pass\r\n";
$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
$message .= get_settings('siteurl') . '/wp-login.php';
$m = wp_mail($user->user_email, sprintf(__("[%s] Your new password"), get_settings('blogname')), $message);
@ -222,8 +223,8 @@ if ( $error )
?>
<form name="loginform" id="loginform" action="wp-login.php" method="post">
<p><label><?php _e('Login') ?>:<br /><input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label></p>
<p><label><?php _e('Password') ?>:<br /> <input type="password" name="pwd" id="pwd" value="" size="20" tabindex="2" /></label></p>
<p><label><?php _e('Username:') ?><br /><input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label></p>
<p><label><?php _e('Password:') ?><br /> <input type="password" name="pwd" id="pwd" value="" size="20" tabindex="2" /></label></p>
<p class="submit">
<input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="3" />
<input type="hidden" name="redirect_to" value="<?php echo $redirect_to; ?>" />

26
wp-register.php
View File

@ -28,9 +28,9 @@ case 'register':
$user_login = $_POST['user_login'];
$user_email = $_POST['user_email'];
/* checking login has been typed */
/* checking that username has been typed */
if ($user_login == '') {
die (__('<strong>ERROR</strong>: Please enter a login.'));
die (__('<strong>ERROR</strong>: Please enter a username.'));
}
/* checking e-mail address */
@ -40,10 +40,10 @@ case 'register':
die (__('<strong>ERROR</strong>: The email address isn&#8217;t correct.'));
}
/* checking the login isn't already used by another user */
/* checking the username isn't already used by another user */
$result = $wpdb->get_results("SELECT user_login FROM $wpdb->users WHERE user_login = '$user_login'");
if (count($result) >= 1) {
die (__('<strong>ERROR</strong>: This login is already registered, please choose another one.'));
die (__('<strong>ERROR</strong>: This username is already registered, please choose another one.'));
}
$user_ip = $_SERVER['REMOTE_ADDR'] ;
@ -73,13 +73,13 @@ case 'register':
$stars .= '*';
}
$message = __('Login') . ": $user_login\r\n";
$message .= __('Password') . ": $password\r\n";
$message = sprintf(__('Username: %s'), $user_login) . "\r\n";
$message .= sprintf(__('Password: %s'), $password) . "\r\n";
$message .= get_settings('siteurl') . '/wp-login.php';
wp_mail($user_email, sprintf(__("[%s] Your login information"), get_settings('blogname')), $message);
wp_mail($user_email, sprintf(__("[%s] Your username and password"), get_settings('blogname')), $message);
$message = sprintf(__("New user registration on your blog %1\$s:\n\nLogin: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email);
$message = sprintf(__("New user registration on your blog %1\$s:\n\nUsername: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email);
@wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message);
@ -100,9 +100,9 @@ case 'register':
<div id="login">
<h2><?php _e('Registration Complete') ?></h2>
<p><?php _e('Login:') ?> <strong><?php echo $user_login; ?></strong><br />
<?php _e('Password:') ?> <strong>emailed to you</strong><br />
<?php _e('E-mail:') ?> <strong><?php echo $user_email; ?></strong></p>
<p><?php printf(__('Username: %s'), "<strong>$user_login</strong>") ?><br />
<?php printf(__('Password: %s'), '<strong>' . __('emailed to you') . '</strong>') ?> <br />
<?php printf(__('E-mail: %s'), "<strong>$user_email</strong>") ?></p>
<p class="submit"><a href="wp-login.php"><?php _e('Login'); ?> &raquo;</a></p>
</div>
</body>
@ -160,8 +160,8 @@ default:
<form method="post" action="wp-register.php" id="registerform">
<p><input type="hidden" name="action" value="register" />
<label for="user_login"><?php _e('Login:') ?></label><br /> <input type="text" name="user_login" id="user_login" size="20" maxlength="20" /><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" /></p>
<label for="user_login"><?php _e('Username:') ?></label><br /> <input type="text" name="user_login" id="user_login" size="20" maxlength="20" /><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" /></p>
<p>A password will be emailed to you.</p>
<p class="submit"><input type="submit" value="<?php _e('Register') ?> &raquo;" id="submit" name="submit" /></p>
</form>