WordPress 4.4
[autoinstalls/wordpress.git] / wp-admin / install.php
index 6f317cfbe52b9cdf736c65c65edc5f8221b9494a..0e30ec0c915008a1cc683b7a11ee341890837bec 100644 (file)
@@ -16,8 +16,8 @@ if ( false ) {
        <title>Error: PHP is not running</title>
 </head>
 <body class="wp-core-ui">
-       <h1 id="logo"><a href="https://wordpress.org/">WordPress</a></h1>
-       <h2>Error: PHP is not running</h2>
+       <p id="logo"><a href="https://wordpress.org/">WordPress</a></p>
+       <h1>Error: PHP is not running</h1>
        <p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
 </body>
 </html>
@@ -52,6 +52,8 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
  * Display install header.
  *
  * @since 2.5.0
+ *
+ * @param string $body_classes
  */
 function display_header( $body_classes = '' ) {
        header( 'Content-Type: text/html; charset=utf-8' );
@@ -67,13 +69,15 @@ function display_header( $body_classes = '' ) {
 <head>
        <meta name="viewport" content="width=device-width" />
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <meta name="robots" content="noindex,nofollow" />
        <title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
        <?php
-       wp_admin_css( 'install', true );
+               wp_admin_css( 'install', true );
+               wp_admin_css( 'dashicons', true );
        ?>
 </head>
 <body class="wp-core-ui<?php echo $body_classes ?>">
-<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
 
 <?php
 } // end display_header()
@@ -82,6 +86,8 @@ function display_header( $body_classes = '' ) {
  * Display installer setup form.
  *
  * @since 2.8.0
+ *
+ * @param string|null $error
  */
 function display_setup_form( $error = null ) {
        global $wpdb;
@@ -101,6 +107,7 @@ function display_setup_form( $error = null ) {
 
        if ( ! is_null( $error ) ) {
 ?>
+<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
 <p class="message"><?php echo $error; ?></p>
 <?php } ?>
 <form id="setup" method="post" action="install.php?step=2" novalidate="novalidate">
@@ -124,30 +131,78 @@ function display_setup_form( $error = null ) {
                        </td>
                </tr>
                <?php if ( ! $user_table ) : ?>
-               <tr>
+               <tr class="form-field form-required user-pass1-wrap">
                        <th scope="row">
-                               <label for="pass1"><?php _e('Password, twice'); ?></label>
-                               <p><?php _e('A password will be automatically generated for you if you leave this blank.'); ?></p>
+                               <label for="pass1">
+                                       <?php _e( 'Password' ); ?>
+                               </label>
                        </th>
                        <td>
-                               <input name="admin_password" type="password" id="pass1" size="25" value="" />
-                               <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
-                               <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
-                               <p><?php echo wp_get_password_hint(); ?></p>
+                               <div class="">
+                                       <?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
+                                       <input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
+                                       <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+                                               <span class="dashicons dashicons-hidden"></span>
+                                               <span class="text"><?php _e( 'Hide' ); ?></span>
+                                       </button>
+                                       <div id="pass-strength-result" aria-live="polite"></div>
+                               </div>
+                               <p><span class="description important hide-if-no-js">
+                               <strong><?php _e( 'Important:' ); ?></strong>
+                               <?php /* translators: The non-breaking space prevents 1Password from thinking the text "log in" should trigger a password save prompt. */ ?>
+                               <?php _e( 'You will need this password to log&nbsp;in. Please store it in a secure location.' ); ?></span></p>
+                       </td>
+               </tr>
+               <tr class="form-field form-required user-pass2-wrap hide-if-js">
+                       <th scope="row">
+                               <label for="pass2"><?php _e( 'Repeat Password' ); ?>
+                                       <span class="description"><?php _e( '(required)' ); ?></span>
+                               </label>
+                       </th>
+                       <td>
+                               <input name="admin_password2" type="password" id="pass2" autocomplete="off" />
+                       </td>
+               </tr>
+               <tr class="pw-weak">
+                       <th scope="row"><?php _e( 'Confirm Password' ); ?></th>
+                       <td>
+                               <label>
+                                       <input type="checkbox" name="pw_weak" class="pw-checkbox" />
+                                       <?php _e( 'Confirm use of weak password' ); ?>
+                               </label>
                        </td>
                </tr>
                <?php endif; ?>
                <tr>
-                       <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
+                       <th scope="row"><label for="admin_email"><?php _e( 'Your Email' ); ?></label></th>
                        <td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
                        <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
                </tr>
                <tr>
-                       <th scope="row"><?php _e( 'Privacy' ); ?></th>
-                       <td colspan="2"><label><input type="checkbox" name="blog_public" id="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow search engines to index this site.' ); ?></label></td>
+                       <th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?></th>
+                       <td>
+                               <fieldset>
+                                       <legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </span></legend>
+                                       <?php
+                                       if ( has_action( 'blog_privacy_selector' ) ) { ?>
+                                               <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( 1, $blog_public ); ?> />
+                                               <label for="blog-public"><?php _e( 'Allow search engines to index this site' );?></label><br/>
+                                               <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
+                                               <label for="blog-norobots"><?php _e( 'Discourage search engines from indexing this site' ); ?></label>
+                                               <p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
+                                               <?php
+                                               /** This action is documented in wp-admin/options-reading.php */
+                                               do_action( 'blog_privacy_selector' );
+                                        } else { ?>
+                                               <label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
+                                               <?php _e( 'Discourage search engines from indexing this site' ); ?></label>
+                                               <p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
+                                       <?php } ?>
+                               </fieldset>
+                       </td>
                </tr>
        </table>
-       <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button button-large" /></p>
+       <p class="step"><?php submit_button( __( 'Install WordPress' ), 'large', 'Submit', false, array( 'id' => 'submit' ) ); ?></p>
        <input type="hidden" name="language" value="<?php echo isset( $_REQUEST['language'] ) ? esc_attr( $_REQUEST['language'] ) : ''; ?>" />
 </form>
 <?php
@@ -156,9 +211,15 @@ function display_setup_form( $error = null ) {
 // Let's check to make sure WP isn't already installed.
 if ( is_blog_installed() ) {
        display_header();
-       die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="../wp-login.php" class="button button-large">' . __( 'Log In' ) . '</a></p></body></html>' );
+       die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="' . esc_url( wp_login_url() ) . '" class="button button-large">' . __( 'Log In' ) . '</a></p></body></html>' );
 }
 
+/**
+ * @global string $wp_version
+ * @global string $required_php_version
+ * @global string $required_mysql_version
+ * @global wpdb   $wpdb
+ */
 global $wp_version, $required_php_version, $required_mysql_version;
 
 $php_version    = phpversion();
@@ -183,6 +244,16 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
        die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' );
 }
 
+// Set error message if DO_NOT_UPGRADE_GLOBAL_TABLES isn't set as it will break install.
+if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+       display_header();
+       die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when installing WordPress.' ) . '</p></body></html>' );
+}
+
+/**
+ * @global string    $wp_local_package
+ * @global WP_Locale $wp_locale
+ */
 $language = '';
 if ( ! empty( $_REQUEST['language'] ) ) {
        $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
@@ -217,7 +288,7 @@ switch($step) {
 <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
 <p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
 
-<h1><?php _e( 'Information needed' ); ?></h1>
+<h2><?php _e( 'Information needed' ); ?></h2>
 <p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>
 
 <?php
@@ -241,9 +312,9 @@ switch($step) {
                $admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : '';
                $admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
                $admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
-               $public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
+               $public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 1;
 
-               // Check e-mail address.
+               // Check email address.
                $error = false;
                if ( empty( $user_name ) ) {
                        // TODO: poka-yoke
@@ -291,7 +362,7 @@ switch($step) {
        </tr>
 </table>
 
-<p class="step"><a href="../wp-login.php" class="button button-large"><?php _e( 'Log In' ); ?></a></p>
+<p class="step"><a href="<?php echo esc_url( wp_login_url() ); ?>" class="button button-large"><?php _e( 'Log In' ); ?></a></p>
 
 <?php
                }
@@ -303,5 +374,10 @@ if ( !wp_is_mobile() ) {
 <?php } ?>
 <?php wp_print_scripts( 'user-profile' ); ?>
 <?php wp_print_scripts( 'language-chooser' ); ?>
+<script type="text/javascript">
+jQuery( function( $ ) {
+       $( '.hide-if-no-js' ).removeClass( 'hide-if-no-js' );
+} );
+</script>
 </body>
 </html>