vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not display user specified password during install. Fixes #12479. See #10396 for feedback

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13592 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse
2010-03-05 12:25:30 +00:00
parent 2343b09500
commit 7f001d5aa2
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/install.php
+13 -5
View File
@@ -100,11 +100,14 @@ function display_setup_form( $error = null ) {
</tr>
<?php if ( ! $user_table ) : ?>
<tr>
<th scope="row"><label for="admin_password"><?php _e('Password'); ?></label></th>
<th scope="row">
<p><label for="admin_password"><?php _e('Password'); ?></label></p>
<p><label for="admin_password2"><?php _e('Re-enter Password'); ?></label></p></th>
<td>
<input name="admin_password" type="password" id="pass1" size="25" value="<?php echo esc_attr( $admin_password ); ?>" />
<br /><?php _e('A password will be automatically generated for you if you leave this field blank.'); ?>
<br /><div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p><input name="admin_password" type="password" id="pass1" size="25" value="" /></p>
<p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
<p><?php _e('A password will be automatically generated for you if you leave this field blank.'); ?></p>
<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
</td>
</tr>
@@ -169,6 +172,7 @@ switch($step) {
$weblog_title = isset( $_POST['weblog_title'] ) ? trim( stripslashes( $_POST['weblog_title'] ) ) : '';
$user_name = isset($_POST['user_name']) ? trim( stripslashes( $_POST['user_name'] ) ) : 'admin';
$admin_password = isset($_POST['admin_password']) ? trim( stripslashes( $_POST['admin_password'] ) ) : '';
$admin_password_check = isset($_POST['admin_password2']) ? trim( stripslashes( $_POST['admin_password2'] ) ) : '';
$admin_email = isset( $_POST['admin_email'] ) ?trim( stripslashes( $_POST['admin_email'] ) ) : '';
$public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
// check e-mail address
@@ -177,6 +181,10 @@ switch($step) {
// TODO: poka-yoke
display_setup_form( __('you must provide a valid user name.') );
$error = true;
} elseif ( $admin_password != $admin_password_check ) {
// TODO: poka-yoke
display_setup_form( __( 'your passwords do not match. Please try again' ) );
$error = true;
} else if ( empty( $admin_email ) ) {
// TODO: poka-yoke
display_setup_form( __( 'you must provide an e-mail address.' ) );
@@ -205,7 +213,7 @@ switch($step) {
<tr>
<th><?php _e( 'Password' ); ?></th>
<td><?php
if ( ! empty( $password ) )
if ( ! empty( $password ) && empty($admin_password_check) )
echo '<code>'. esc_html($password) .'</code><br />';
echo "<p>$password_message</p>"; ?>
</td>