Make WordPress Core

Ticket #10396: 10396_h.diff

File 10396_h.diff, 13.0 KB (added by dancole, 12 years ago)

Rebuilt after bring nuked by r13124

  • wp-admin/includes/upgrade.php

     
    3333 * @param null $deprecated Optional. Not used.
    3434 * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
    3535 */
    36 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '' ) {
     36function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
    3737        global $wp_rewrite;
    3838
    3939        if ( !empty( $deprecated ) )
     
    6060        // Create default user.  If the user already exists, the user tables are
    6161        // being shared among blogs.  Just set the role in that case.
    6262        $user_id = username_exists($user_name);
    63         if ( !$user_id ) {
    64                 $random_password = wp_generate_password();
     63        if ( !$user_id && $user_password == '' ) {
     64                $user_password = wp_generate_password();
    6565                $message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
    66                 $user_id = wp_create_user($user_name, $random_password, $user_email);
    67                 update_user_option($user_id, 'default_password_nag', true, true);
     66                $user_id = wp_create_user($user_name, $user_password, $user_email);
     67                update_usermeta($user_id, 'default_password_nag', true);
     68        } else if ( !$user_id ) {
     69                $message = __('<strong><em>Note that password</em></strong> carefully!');
     70                $user_id = wp_create_user($user_name, $user_password, $user_email);
    6871        } else {
    69                 $random_password = '';
    7072                $message =  __('User already exists.  Password inherited.');
    7173        }
    7274
     
    7779
    7880        $wp_rewrite->flush_rules();
    7981
    80         wp_new_blog_notification($blog_title, $guessurl, $user_id, $random_password);
     82        wp_new_blog_notification($blog_title, $guessurl, $user_id, $user_password);
    8183
    8284        wp_cache_flush();
    8385
    84         return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $random_password, 'password_message' => $message);
     86        return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
    8587}
    8688endif;
    8789
  • wp-admin/css/install.css

     
    1 html{background:#f7f7f7;}body{background:#fff;color:#333;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;margin:2em auto 0 auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li{padding-bottom:2px;font-size:12px;line-height:18px;}code{font-size:13px;}ul,ol{padding:5px 5px 5px 22px;}#logo{margin:6px 0 14px 0;border-bottom:none;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:110px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code{font-family:Consolas,Monaco,Courier,monospace;}
    2  No newline at end of file
     1html{background:#f7f7f7;}body{background:#fff;color:#333;font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;margin:2em auto 0 auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li{padding-bottom:2px;font-size:12px;line-height:18px;}code{font-size:13px;}ul,ol{padding:5px 5px 5px 22px;}#logo{margin:6px 0 14px 0;border-bottom:none;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:110px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code{font-family:Consolas,Monaco,Courier,monospace;}#pass-strength-result {background-color: #EEEEEE;border-color: #DDDDDD !important;border-style: solid;border-width: 1px;float: left;margin: 12px 5px 5px 1px;padding: 5px;text-align: center;width: 200px;}#pass-strength-result.bad {background-color: #FFB78C;border-color: #FF853C !important;}#pass-strength-result.good {background-color: #FFEC8B;border-color: #FFCC00 !important;}#pass-strength-result.short {background-color: #FFA0A0;border-color: #F04040 !important;}#pass-strength-result.strong {background-color: #C3FF88;border-color: #8DFF1C !important;}
  • wp-admin/css/install.dev.css

     
    131131}
    132132
    133133#error-page code { font-family: Consolas, Monaco, Courier, monospace; }
     134
     135#pass-strength-result {
     136        background-color: #EEEEEE;
     137        border-color: #DDDDDD !important;
     138        border-style: solid;
     139        border-width: 1px;
     140        float: left;
     141        margin: 12px 5px 5px 1px;
     142        padding: 5px;
     143        text-align: center;
     144        width: 200px;
     145}
     146
     147#pass-strength-result.bad {
     148        background-color: #FFB78C;
     149        border-color: #FF853C !important;
     150}
     151
     152#pass-strength-result.good {
     153        background-color: #FFEC8B;
     154        border-color: #FFCC00 !important;
     155}
     156
     157#pass-strength-result.short {
     158        background-color: #FFA0A0;
     159        border-color: #F04040 !important;
     160}
     161
     162#pass-strength-result.strong {
     163        background-color: #C3FF88;
     164        border-color: #8DFF1C !important;
     165}
  • wp-admin/install.php

     
    2020/** Load WordPress Administration Upgrade API */
    2121require_once( dirname( __FILE__ ) . '/includes/upgrade.php' );
    2222
     23/** Load wpdb */
     24require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php');
     25
    2326$step = isset( $_GET['step'] ) ? $_GET['step'] : 0;
    2427
    2528/**
     
    5356 * @subpackage Installer
    5457 */
    5558function display_setup_form( $error = null ) {
     59        global $wpdb;
     60        $user_table = ( $wpdb->get_var("SHOW TABLES LIKE '$table_name'") != null ) ? true : false;
     61
    5662        // Ensure that Blogs appear in search engines by default
    5763        $blog_public = 1;
    5864        if ( isset( $_POST ) && ! empty( $_POST ) )
     
    6975                        <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo ( isset( $_POST['weblog_title'] ) ? esc_attr( $_POST['weblog_title'] ) : '' ); ?>" /></td>
    7076                </tr>
    7177                <tr>
     78                        <th scope="row"><label for="user_name"><?php _e('User Name'); ?></label></th>
     79                        <td>
     80                        <?php if ( $user_table ) { _e('User(s) already exists.'); } else { ?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo ( isset($_POST['user_name']) ? esc_attr($_POST['user_name']) : 'admin' ); ?>" /><?php } ?>
     81                        </td>
     82                </tr>
     83                <tr>
     84                        <th scope="row"><label for="admin_password"><?php _e('Password'); ?></label></th>
     85                        <td>
     86                                <?php if ( $user_table ) {
     87                                        _e('No user is being created, so no new password is needed.');
     88                                }
     89                                else {
     90                                        ?><input name="admin_password" type="password" id="pass1" size="25" value="<?php echo ( isset($_POST['admin_password']) ? esc_attr($_POST['admin_password']) : '' ); ?>" />
     91                                        <br /><?php _e('A password will be automatically generated for you if this field is blank.'); ?>
     92                                        <br /><div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
     93                                        <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><?php
     94                                } ?>
     95                        </td>
     96                </tr>
     97                <tr>
    7298                        <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
    7399                        <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo ( isset( $_POST['admin_email'] ) ? esc_attr( $_POST['admin_email'] ) : '' ); ?>" /><br />
    74100                        <?php _e( 'Double-check your email address before continuing.' ); ?></td>
     
    126152                display_header();
    127153                // Fill in the data we gathered
    128154                $weblog_title = isset( $_POST['weblog_title'] ) ? stripslashes( $_POST['weblog_title'] ) : '';
     155                $user_name = isset($_POST['user_name']) ? stripslashes($_POST['user_name']) : '';
     156                $admin_password = isset($_POST['admin_password']) ? stripslashes($_POST['admin_password']) : '';
    129157                $admin_email  = isset( $_POST['admin_email']  ) ? stripslashes( $_POST['admin_email'] ) : '';
    130158                $public       = isset( $_POST['blog_public']  ) ? (int) $_POST['blog_public'] : 0;
    131159                // check e-mail address
    132160                $error = false;
    133                 if ( empty( $admin_email ) ) {
     161                if ( empty( $user_name ) ) {
    134162                        // TODO: poka-yoke
     163                        display_setup_form( __('you must provide a valid user name.') );
     164                        $error = true;
     165                } else if ( empty( $admin_email ) ) {
     166                        // TODO: poka-yoke
    135167                        display_setup_form( __( 'you must provide an e-mail address.' ) );
    136168                        $error = true;
    137169                } elseif ( ! is_email( $admin_email ) ) {
     
    142174
    143175                if ( $error === false ) {
    144176                        $wpdb->show_errors();
    145                         $result = wp_install( $weblog_title, 'admin', $admin_email, $public );
     177                        $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password);
    146178                        extract( $result, EXTR_SKIP );
    147179?>
    148180
     
    153185<table class="form-table">
    154186        <tr>
    155187                <th><?php _e( 'Username' ); ?></th>
    156                 <td><code>admin</code></td>
     188                <td><code><?php echo esc_html($user_name); ?></code></td>
    157189        </tr>
    158190        <tr>
    159191                <th><?php _e( 'Password' ); ?></th>
    160192                <td><?php
    161193                if ( ! empty( $password ) )
    162                         echo "<code>$password</code><br />";
     194                        echo '<code>'. esc_html($password) .'</code><br />';
    163195                echo "<p>$password_message</p>"; ?>
    164196                </td>
    165197        </tr>
     
    173205}
    174206?>
    175207<script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
     208<script type="text/javascript" src="../wp-includes/js/jquery/jquery.js"></script>
     209<script type="text/javascript" src="js/password-strength-meter.js"></script>
     210<script type="text/javascript" src="js/user-profile.js"></script>
     211<script type="text/javascript" src="js/utils.js"></script>
     212<script type='text/javascript'>
     213/* <![CDATA[ */
     214try{convertEntities(commonL10n);}catch(e){};
     215var pwsL10n = {
     216 empty: "Strength indicator",
     217 short: "Very weak",
     218 bad: "Weak",
     219 good: "Medium",
     220 strong: "Strong"
     221};
     222try{convertEntities(pwsL10n);}catch(e){};
     223/* ]]> */
     224</script>
    176225</body>
    177226</html>