Index: wp-admin/install.php =================================================================== --- wp-admin/install.php (revision 15473) +++ wp-admin/install.php (working copy) @@ -43,6 +43,7 @@ $step = isset( $_GET['step'] ) ? $_GET['step'] : 0; +if ( !function_exists('display_header') ) : /** * Display install header. * @@ -61,12 +62,50 @@ -

WordPress

+

WordPress

' . __( 'Already Installed' ) . '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' . __('Log In') . '

' ); + } + + $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 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 ); + 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 ); + 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 ); + + if ( !$mysql_compat || !$php_compat ) { + display_header(); + die('

' . __('Insufficient Requirements') . '

' . $compat . '

'); + } +} // end check_requirements() +endif; + +if ( !function_exists('display_setup_form') ) : +/** * Display installer setup form. * * @since 2.8.0 @@ -137,34 +176,31 @@ ' . __( 'Already Installed' ) . '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' . __('Log In') . '

' ); -} +if ( !function_exists('step_0') ) : +/** + * Process install step 0 + * + * @since 3.1.0 + * @package WordPress + * @subpackage Installer +*/ +function step_0() { + step_1(); +}//end function step_0(); +endif; -$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 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 ); -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 ); -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 ); - -if ( !$mysql_compat || !$php_compat ) { +if ( !function_exists('step_1') ) : +/** + * Process install step 1 + * + * @since 3.1.0 + * @package WordPress + * @subpackage Installer +*/ +function step_1() { display_header(); - die('

' . __('Insufficient Requirements') . '

' . $compat . '

'); -} - -switch($step) { - case 0: // Step 1 - case 1: // Step 1, direct link. - display_header(); ?>

ReadMe documentation 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' ); ?>

@@ -173,47 +209,59 @@

error ) ) - wp_die( $wpdb->error->get_error_message() ); + display_setup_form(); +} // end step_1() +endif; - display_header(); - // Fill in the data we gathered - $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( $user_name ) ) { - // TODO: poka-yoke - 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; - } 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.' ) ); - $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: username@example.com' ) ); - $error = true; - } +if ( !function_exists('step_2') ) : +/** + * Process install step 2 + * + * @since 3.1.0 + * @package WordPress + * @subpackage Installer +*/ +function step_2() { + global $wpdb; + + if ( ! empty( $wpdb->error ) ) + wp_die( $wpdb->error->get_error_message() ); - if ( $error === false ) { - $wpdb->show_errors(); - $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password); - extract( $result, EXTR_SKIP ); + display_header(); + // Fill in the data we gathered + $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( $user_name ) ) { + // TODO: poka-yoke + 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; + } 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.' ) ); + $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: username@example.com' ) ); + $error = true; + } + + if ( $error === false ) { + $wpdb->show_errors(); + $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password); + extract( $result, EXTR_SKIP ); ?>

@@ -238,9 +286,19 @@

@@ -262,3 +320,23 @@ + \ No newline at end of file