--- a/wp/wp-admin/install.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/install.php Tue Jun 09 03:35:32 2015 +0200
@@ -16,7 +16,7 @@
<title>Error: PHP is not running</title>
</head>
<body class="wp-core-ui">
- <h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1>
+ <h1 id="logo"><a href="https://wordpress.org/">WordPress</a></h1>
<h2>Error: PHP is not running</h2>
<p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
</body>
@@ -38,8 +38,13 @@
/** Load WordPress Administration Upgrade API */
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+/** Load WordPress Translation Install API */
+require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+
/** Load wpdb */
-require_once( ABSPATH . 'wp-includes/wp-db.php' );
+require_once( ABSPATH . WPINC . '/wp-db.php' );
+
+nocache_headers();
$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
@@ -47,23 +52,28 @@
* Display install header.
*
* @since 2.5.0
- * @package WordPress
- * @subpackage Installer
*/
-function display_header() {
+function display_header( $body_classes = '' ) {
header( 'Content-Type: text/html; charset=utf-8' );
+ if ( is_rtl() ) {
+ $body_classes .= 'rtl';
+ }
+ if ( $body_classes ) {
+ $body_classes = ' ' . $body_classes;
+ }
?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
<head>
+ <meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php _e( 'WordPress › Installation' ); ?></title>
<?php
wp_admin_css( 'install', true );
?>
</head>
-<body class="wp-core-ui<?php if ( is_rtl() ) echo ' rtl'; ?>">
-<h1 id="logo"><a href="<?php echo esc_url( __( 'http://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></h1>
+<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>
<?php
} // end display_header()
@@ -72,28 +82,28 @@
* Display installer setup form.
*
* @since 2.8.0
- * @package WordPress
- * @subpackage Installer
*/
function display_setup_form( $error = null ) {
global $wpdb;
- $user_table = ( $wpdb->get_var("SHOW TABLES LIKE '$wpdb->users'") != null );
+
+ $sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) );
+ $user_table = ( $wpdb->get_var( $sql ) != null );
- // Ensure that Blogs appear in search engines by default
+ // Ensure that Blogs appear in search engines by default.
$blog_public = 1;
- if ( ! empty( $_POST ) )
+ if ( isset( $_POST['weblog_title'] ) ) {
$blog_public = isset( $_POST['blog_public'] );
+ }
$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
- $admin_password = isset($_POST['admin_password']) ? trim( wp_unslash( $_POST['admin_password'] ) ) : '';
$admin_email = isset( $_POST['admin_email'] ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
if ( ! is_null( $error ) ) {
?>
<p class="message"><?php echo $error; ?></p>
<?php } ?>
-<form id="setup" method="post" action="install.php?step=2">
+<form id="setup" method="post" action="install.php?step=2" novalidate="novalidate">
<table class="form-table">
<tr>
<th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th>
@@ -105,9 +115,10 @@
<?php
if ( $user_table ) {
_e('User(s) already exists.');
+ echo '<input name="user_name" type="hidden" value="admin" />';
} else {
?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
- <p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p>
+ <p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
<?php
} ?>
</td>
@@ -115,28 +126,29 @@
<?php if ( ! $user_table ) : ?>
<tr>
<th scope="row">
- <label for="admin_password"><?php _e('Password, twice'); ?></label>
+ <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>
</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 _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 ! " ? $ % ^ & ).'); ?></p>
+ <p><?php echo wp_get_password_hint(); ?></p>
</td>
</tr>
<?php endif; ?>
<tr>
<th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
- <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
+ <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"><label for="blog_public"><?php _e( 'Privacy' ); ?></label></th>
- <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow search engines to index this site.' ); ?></label></td>
+ <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>
</tr>
</table>
<p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button button-large" /></p>
+ <input type="hidden" name="language" value="<?php echo isset( $_REQUEST['language'] ) ? esc_attr( $_REQUEST['language'] ) : ''; ?>" />
</form>
<?php
} // end display_setup_form()
@@ -147,17 +159,19 @@
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>' );
}
+global $wp_version, $required_php_version, $required_mysql_version;
+
$php_version = phpversion();
$mysql_version = $wpdb->db_version();
$php_compat = version_compare( $php_version, $required_php_version, '>=' );
$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
if ( !$mysql_compat && !$php_compat )
- $compat = sprintf( __( 'You cannot install because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
+ $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
elseif ( !$php_compat )
- $compat = sprintf( __( 'You cannot install because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
+ $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
elseif ( !$mysql_compat )
- $compat = sprintf( __( 'You cannot install because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
+ $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
if ( !$mysql_compat || !$php_compat ) {
display_header();
@@ -169,13 +183,39 @@
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>' );
}
+$language = '';
+if ( ! empty( $_REQUEST['language'] ) ) {
+ $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
+} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
+ $language = $GLOBALS['wp_local_package'];
+}
+
switch($step) {
- case 0: // Step 1
- case 1: // Step 1, direct link.
- display_header();
+ case 0: // Step 0
+
+ if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+ display_header( 'language-chooser' );
+ echo '<form id="setup" method="post" action="?step=1">';
+ wp_install_language_form( $languages );
+ echo '</form>';
+ break;
+ }
+
+ // Deliberately fall through if we can't reach the translations API.
+
+ case 1: // Step 1, direct link or from language chooser.
+ if ( ! empty( $language ) ) {
+ $loaded_language = wp_download_language_pack( $language );
+ if ( $loaded_language ) {
+ load_default_textdomain( $loaded_language );
+ $GLOBALS['wp_locale'] = new WP_Locale();
+ }
+ }
+
+ display_header();
?>
<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
-<p><?php printf( __( 'Welcome to the famous five minute WordPress installation process! You may want to browse the <a href="%s">ReadMe documentation</a> at your leisure. Otherwise, just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ), '../readme.html' ); ?></p>
+<p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you’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>
<p><?php _e( 'Please provide the following information. Don’t worry, you can always change these settings later.' ); ?></p>
@@ -184,6 +224,13 @@
display_setup_form();
break;
case 2:
+ if ( ! empty( $language ) && load_default_textdomain( $language ) ) {
+ $loaded_language = $language;
+ $GLOBALS['wp_locale'] = new WP_Locale();
+ } else {
+ $loaded_language = 'en_US';
+ }
+
if ( ! empty( $wpdb->error ) )
wp_die( $wpdb->error->get_error_message() );
@@ -193,9 +240,10 @@
$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
$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;
- // check e-mail address
+ $admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
+ $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
+
+ // Check e-mail address.
$error = false;
if ( empty( $user_name ) ) {
// TODO: poka-yoke
@@ -208,7 +256,7 @@
// TODO: poka-yoke
display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
$error = true;
- } else if ( empty( $admin_email ) ) {
+ } elseif ( empty( $admin_email ) ) {
// TODO: poka-yoke
display_setup_form( __( 'You must provide an email address.' ) );
$error = true;
@@ -220,8 +268,7 @@
if ( $error === false ) {
$wpdb->show_errors();
- $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password);
- extract( $result, EXTR_SKIP );
+ $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
?>
<h1><?php _e( 'Success!' ); ?></h1>
@@ -236,9 +283,10 @@
<tr>
<th><?php _e( 'Password' ); ?></th>
<td><?php
- if ( ! empty( $password ) && empty($admin_password_check) )
- echo '<code>'. esc_html($password) .'</code><br />';
- echo "<p>$password_message</p>"; ?>
+ if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?>
+ <code><?php echo esc_html( $result['password'] ) ?></code><br />
+ <?php endif ?>
+ <p><?php echo $result['password_message'] ?></p>
</td>
</tr>
</table>
@@ -249,8 +297,11 @@
}
break;
}
+if ( !wp_is_mobile() ) {
?>
<script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
+<?php } ?>
<?php wp_print_scripts( 'user-profile' ); ?>
+<?php wp_print_scripts( 'language-chooser' ); ?>
</body>
</html>