X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/5964d2279dc52bdfe105f9bfa17e04337d47a3fa..48ab98cb1779cf2088c1351ac3dd3d0da6fb31d3:/wp-admin/install.php diff --git a/wp-admin/install.php b/wp-admin/install.php index 2ff4f172..72916e4b 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -16,7 +16,7 @@ if ( false ) {
WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.
@@ -36,10 +36,15 @@ define( 'WP_INSTALLING', true ); require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); /** Load WordPress Administration Upgrade API */ -require_once( dirname( __FILE__ ) . '/includes/upgrade.php' ); +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(dirname(dirname(__FILE__)) . '/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 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; * 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; + } ?> > +' . __( 'Your wp-config.php
file has an empty database table prefix, which is not supported.' ) . '
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' ); ?>
+ @@ -184,44 +222,51 @@ switch($step) { 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() ); 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 + $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']) ? 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. $error = false; if ( empty( $user_name ) ) { // TODO: poka-yoke - display_setup_form( __('you must provide a valid username.') ); + display_setup_form( __( 'Please provide a valid username.' ) ); $error = true; } elseif ( $user_name != sanitize_user( $user_name, true ) ) { - display_setup_form( __('the username you provided has invalid characters.') ); + 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' ) ); + 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.' ) ); + display_setup_form( __( 'You must provide an email 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
' ) );
+ display_setup_form( __( 'Sorry, that isn’t a valid email address. Email 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 );
+ $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
?>
@@ -236,9 +281,10 @@ switch($step) {
$password_message
"; ?> + if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?> +