--- a/web/wp-admin/install.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/install.php Mon Nov 19 18:26:13 2012 +0100
@@ -6,81 +6,144 @@
* @subpackage Administration
*/
+// Sanity check.
+if ( false ) {
+?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Error: PHP is not running</title>
+</head>
+<body>
+ <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png?ver=20120216" /></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>
+</html>
+<?php
+}
+
/**
* We are installing WordPress.
*
- * @since unknown
+ * @since 1.5.1
* @var bool
*/
-define('WP_INSTALLING', true);
+define( 'WP_INSTALLING', true );
/** Load WordPress Bootstrap */
-require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
/** Load WordPress Administration Upgrade API */
-require_once(dirname(__FILE__) . '/includes/upgrade.php');
+require_once( dirname( __FILE__ ) . '/includes/upgrade.php' );
-if (isset($_GET['step']))
- $step = $_GET['step'];
-else
- $step = 0;
+/** Load wpdb */
+require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php');
+
+$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
/**
* Display install header.
*
- * @since unknown
+ * @since 2.5.0
* @package WordPress
* @subpackage Installer
*/
function display_header() {
-header( 'Content-Type: text/html; charset=utf-8' );
+ header( 'Content-Type: text/html; charset=utf-8' );
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title><?php _e('WordPress › Installation'); ?></title>
+ <title><?php _e( 'WordPress › Installation' ); ?></title>
<?php wp_admin_css( 'install', true ); ?>
</head>
-<body>
-<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
+<body<?php if ( is_rtl() ) echo ' class="rtl"'; ?>>
+<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png?ver=20120216" /></h1>
<?php
-}//end function display_header();
+} // end display_header()
+/**
+ * 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 );
+
// Ensure that Blogs appear in search engines by default
$blog_public = 1;
- if ( isset($_POST) && !empty($_POST) ) {
- $blog_public = isset($_POST['blog_public']);
- }
+ if ( ! empty( $_POST ) )
+ $blog_public = isset( $_POST['blog_public'] );
+
+ $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_email = isset( $_POST['admin_email'] ) ? trim( stripslashes( $_POST['admin_email'] ) ) : '';
if ( ! is_null( $error ) ) {
?>
-<p><?php printf( __('<strong>ERROR</strong>: %s'), $error); ?></p>
+<p class="message"><?php printf( __( '<strong>ERROR</strong>: %s' ), $error ); ?></p>
<?php } ?>
<form id="setup" method="post" action="install.php?step=2">
<table class="form-table">
<tr>
- <th scope="row"><label for="weblog_title"><?php _e('Blog Title'); ?></label></th>
- <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>
- </tr>
- <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 ( isset($_POST['admin_email']) ? esc_attr($_POST['admin_email']) : '' ); ?>" /><br />
- <?php _e('Double-check your email address before continuing.'); ?></td>
+ <th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th>
+ <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
</tr>
<tr>
- <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked($blog_public); ?> /> <?php _e('Allow my blog to appear in search engines like Google and Technorati.'); ?></label></td>
+ <th scope="row"><label for="user_name"><?php _e('Username'); ?></label></th>
+ <td>
+ <?php
+ if ( $user_table ) {
+ _e('User(s) already exists.');
+ } 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>
+ <?php
+ } ?>
+ </td>
+ </tr>
+ <?php if ( ! $user_table ) : ?>
+ <tr>
+ <th scope="row">
+ <label for="admin_password"><?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>
+ </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 ); ?>" />
+ <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>
</tr>
</table>
- <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e('Install WordPress'); ?>" class="button" /></p>
+ <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
</form>
<?php
-}
+} // end display_setup_form()
// 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></body></html>');}
+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">' . __('Log In') . '</a></p></body></html>' );
+}
$php_version = phpversion();
$mysql_version = $wpdb->db_version();
@@ -88,80 +151,97 @@
$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 WordPress %1$s 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="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 );
elseif ( !$php_compat )
- $compat = sprintf( __('You cannot install because WordPress %1$s 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="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 );
elseif ( !$mysql_compat )
- $compat = sprintf( __('You cannot install because WordPress %1$s 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="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 );
if ( !$mysql_compat || !$php_compat ) {
display_header();
- die('<h1>' . __('Insufficient Requirements') . '</h1><p>' . $compat . '</p></body></html>');
+ die( '<h1>' . __( 'Insufficient Requirements' ) . '</h1><p>' . $compat . '</p></body></html>' );
+}
+
+if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
+ display_header();
+ 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>' );
}
switch($step) {
- case 0:
- case 1: // in case people are directly linking to this
+ case 0: // Step 1
+ case 1: // Step 1, direct link.
display_header();
?>
-<h1><?php _e('Welcome'); ?></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>
-<!--<h2 class="step"><a href="install.php?step=1"><?php _e('First Step'); ?></a></h2>-->
+<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>
-<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>
-
-
+<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>
<?php
display_setup_form();
break;
case 2:
- if ( !empty($wpdb->error) )
- wp_die($wpdb->error->get_error_message());
+ if ( ! empty( $wpdb->error ) )
+ wp_die( $wpdb->error->get_error_message() );
display_header();
// Fill in the data we gathered
- $weblog_title = isset($_POST['weblog_title']) ? stripslashes($_POST['weblog_title']) : '';
- $admin_email = isset($_POST['admin_email']) ? stripslashes($_POST['admin_email']) : '';
- $public = isset($_POST['blog_public']) ? (int) $_POST['blog_public'] : 0;
+ $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']) ? $_POST['admin_password'] : '';
+ $admin_password_check = isset($_POST['admin_password2']) ? $_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
$error = false;
- if (empty($admin_email)) {
+ if ( empty( $user_name ) ) {
// TODO: poka-yoke
- display_setup_form( __('you must provide an e-mail address.') );
+ display_setup_form( __('you must provide a valid username.') );
+ $error = true;
+ } elseif ( $user_name != sanitize_user( $user_name, true ) ) {
+ display_setup_form( __('the username you provided has invalid characters.') );
$error = true;
- } else if (!is_email($admin_email)) {
+ } 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( __('that isn’t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>') );
+ display_setup_form( __( 'you must provide an e-mail address.' ) );
+ $error = true;
+ } elseif ( ! is_email( $admin_email ) ) {
+ // TODO: poka-yoke
+ display_setup_form( __( 'that isn’t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );
$error = true;
}
if ( $error === false ) {
$wpdb->show_errors();
- $result = wp_install($weblog_title, 'admin', $admin_email, $public);
- extract($result, EXTR_SKIP);
+ $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password);
+ extract( $result, EXTR_SKIP );
?>
-<h1><?php _e('Success!'); ?></h1>
+<h1><?php _e( 'Success!' ); ?></h1>
-<p><?php printf(__('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'), ''); ?></p>
+<p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p>
-<table class="form-table">
+<table class="form-table install-success">
<tr>
- <th><?php _e('Username'); ?></th>
- <td><code>admin</code></td>
+ <th><?php _e( 'Username' ); ?></th>
+ <td><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></td>
</tr>
<tr>
- <th><?php _e('Password'); ?></th>
- <td><?php if ( !empty( $password ) ) {
- echo '<code>'. $password .'</code><br />';
- }
- echo '<p>'. $password_message .'</p>'; ?></td>
+ <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>"; ?>
+ </td>
</tr>
</table>
-<p class="step"><a href="../wp-login.php" class="button"><?php _e('Log In'); ?></a></p>
+<p class="step"><a href="../wp-login.php" class="button"><?php _e( 'Log In' ); ?></a></p>
<?php
}
@@ -169,5 +249,6 @@
}
?>
<script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
+<?php wp_print_scripts( 'user-profile' ); ?>
</body>
</html>