WordPress 4.1.2-scripts

[autoinstalls/wordpress.git] / wp-admin / setup-config.php

diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 82d06e99dc6ad959a6d40d8e87e8792e4dbe9015..5f71f53e6749877e87b5b14655f7767b6595ae37 100644 (file)
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -13,8 +13,6 @@
 
 /**
  * We are installing.
 
 /**
  * We are installing.

- *
- * @package WordPress

  */
 define('WP_INSTALLING', true);
 
  */
 define('WP_INSTALLING', true);
 


@@ -26,47 +24,30 @@ define('WP_SETUP_CONFIG', true);
 /**
  * Disable error reporting
  *
 /**
  * Disable error reporting
  *

- * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
+ * Set this to error_reporting( -1 ) for debugging

  */
 error_reporting(0);
 
  */
 error_reporting(0);
 

-/**#@+
- * These three defines are required to allow us to use require_wp_db() to load
- * the database class while being wp-content/db.php aware.
- * @ignore
- */
-define('ABSPATH', dirname(dirname(__FILE__)).'/');
-define('WPINC', 'wp-includes');
-define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
-define('WP_DEBUG', false);
-/**#@-*/
-
-require(ABSPATH . WPINC . '/load.php');
-require(ABSPATH . WPINC . '/version.php');
+define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );

 
 

-// Check for the required PHP version and for the MySQL extension or a database drop-in.
-wp_check_php_mysql_versions();
+require( ABSPATH . 'wp-settings.php' );

 
 

-require_once(ABSPATH . WPINC . '/functions.php');
+/** Load WordPress Administration Upgrade API */
+require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );

 
 

-// Also loads plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)
-wp_load_translations_early();
+/** Load WordPress Translation Install API */
+require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );

 
 

-// Turn register_globals off.
-wp_unregister_GLOBALS();
+nocache_headers();

 
 

-require_once(ABSPATH . WPINC . '/compat.php');
-require_once(ABSPATH . WPINC . '/class-wp-error.php');
-require_once(ABSPATH . WPINC . '/formatting.php');
-
-// Add magic quotes and set up $_REQUEST ( $_GET + $_POST )
-wp_magic_quotes();
-
-if ( ! file_exists( ABSPATH . 'wp-config-sample.php' ) )
+// Support wp-config-sample.php one level up, for the develop repo.
+if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+       $config_file = file( ABSPATH . 'wp-config-sample.php' );
+elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
+       $config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
+else

        wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.' ) );
 
        wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.' ) );
 

-$config_file = file(ABSPATH . 'wp-config-sample.php');
-

 // Check if wp-config.php has been created
 if ( file_exists( ABSPATH . 'wp-config.php' ) )
        wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ), 'install.php' ) . '</p>' );
 // Check if wp-config.php has been created
 if ( file_exists( ABSPATH . 'wp-config.php' ) )
        wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ), 'install.php' ) . '</p>' );


@@ -75,38 +56,73 @@ if ( file_exists( ABSPATH . 'wp-config.php' ) )
 if ( file_exists(ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '../wp-settings.php' ) )
        wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>."), 'install.php' ) . '</p>' );
 
 if ( file_exists(ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '../wp-settings.php' ) )
        wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>."), 'install.php' ) . '</p>' );
 

-$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
+$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;

 
 /**
  * Display setup wp-config.php file header.
  *
  * @ignore
  * @since 2.3.0
 
 /**
  * Display setup wp-config.php file header.
  *
  * @ignore
  * @since 2.3.0

- * @package WordPress
- * @subpackage Installer_WP_Config

  */
  */

-function setup_config_display_header() {
+function setup_config_display_header( $body_classes = array() ) {

        global $wp_version;
        global $wp_version;

+       $body_classes = (array) $body_classes;
+       $body_classes[] = 'wp-core-ui';
+       if ( is_rtl() ) {
+               $body_classes[] = 'rtl';
+       }

 
        header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
 <head>
 
        header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
 <head>

-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
-<link rel="stylesheet" href="css/install.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
-<link rel="stylesheet" href="../wp-includes/css/buttons.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
-
+       <meta name="viewport" content="width=device-width" />
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
+       <?php wp_admin_css( 'install', true ); ?>

 </head>
 </head>

-<body class="wp-core-ui<?php if ( is_rtl() ) echo ' rtl'; ?>">
-<h1 id="logo"><a href="<?php esc_attr_e( 'http://wordpress.org/' ); ?>"><?php _e( 'WordPress' ); ?></a></h1>
+<body class="<?php echo implode( ' ', $body_classes ); ?>">
+<h1 id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>

 <?php
 } // end function setup_config_display_header();
 
 <?php
 } // end function setup_config_display_header();
 

+$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) {
 switch($step) {

+       case -1:
+               if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+                       setup_config_display_header( 'language-chooser' );
+                       echo '<form id="setup" method="post" action="?step=0">';
+                       wp_install_language_form( $languages );
+                       echo '</form>';
+                       break;
+               }
+
+               // Deliberately fall through if we can't reach the translations API.
+

        case 0:
        case 0:

+               if ( ! empty( $language ) ) {
+                       $loaded_language = wp_download_language_pack( $language );
+                       if ( $loaded_language ) {
+                               load_default_textdomain( $loaded_language );
+                               $GLOBALS['wp_locale'] = new WP_Locale();
+                       }
+               }
+

                setup_config_display_header();
                setup_config_display_header();

+               $step_1 = 'setup-config.php?step=1';
+               if ( isset( $_REQUEST['noapi'] ) ) {
+                       $step_1 .= '&amp;noapi';
+               }
+               if ( ! empty( $loaded_language ) ) {
+                       $step_1 .= '&amp;language=' . $loaded_language;
+               }

 ?>
 
 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
 ?>
 
 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>


@@ -117,14 +133,21 @@ switch($step) {
        <li><?php _e( 'Database host' ); ?></li>
        <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>
        <li><?php _e( 'Database host' ); ?></li>
        <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>

-<p><strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong></p>
+<p>
+       <?php _e( 'We&#8217;re going to use this information to create a <code>wp-config.php</code> file.' ); ?>
+       <strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong>
+       <?php _e( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?>
+</p>

 <p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;" ); ?></p>
 
 <p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;" ); ?></p>
 

-<p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
+<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>

 <?php
        break;
 
        case 1:
 <?php
        break;
 
        case 1:

+               load_default_textdomain( $language );
+               $GLOBALS['wp_locale'] = new WP_Locale();
+

                setup_config_display_header();
        ?>
 <form method="post" action="setup-config.php?step=2">
                setup_config_display_header();
        ?>
 <form method="post" action="setup-config.php?step=2">


@@ -142,7 +165,7 @@ switch($step) {
                </tr>
                <tr>
                        <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
                </tr>
                <tr>
                        <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>

-                       <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td>
+                       <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" /></td>

                        <td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
                </tr>
                <tr>
                        <td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
                </tr>
                <tr>


@@ -157,16 +180,36 @@ switch($step) {
                </tr>
        </table>
        <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
                </tr>
        </table>
        <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>

+       <input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />

        <p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
 <?php
        break;
 
        case 2:
        <p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
 <?php
        break;
 
        case 2:

-       foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key )
-               $$key = trim( wp_unslash( $_POST[ $key ] ) );
+       load_default_textdomain( $language );
+       $GLOBALS['wp_locale'] = new WP_Locale();
+
+       $dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
+       $uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
+       $pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
+       $dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
+       $prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
+
+       $step_1 = 'setup-config.php?step=1';
+       $install = 'install.php';
+       if ( isset( $_REQUEST['noapi'] ) ) {
+               $step_1 .= '&amp;noapi';
+       }
+
+       if ( ! empty( $language ) ) {
+               $step_1 .= '&amp;language=' . $language;
+               $install .= '?language=' . $language;
+       } else {
+               $install .= '?language=en_US';
+       }

 
 

-       $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+       $tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';

 
        if ( empty( $prefix ) )
                wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
 
        if ( empty( $prefix ) )
                wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );


@@ -185,30 +228,27 @@ switch($step) {
        define('DB_HOST', $dbhost);
        /**#@-*/
 
        define('DB_HOST', $dbhost);
        /**#@-*/
 

-       // We'll fail here if the values are no good.
+       // Re-construct $wpdb with these new values.
+       unset( $wpdb );

        require_wp_db();
        require_wp_db();

+
+       /*
+        * The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
+        * fire this manually. We'll fail here if the values are no good.
+        */
+       $wpdb->db_connect();
+

        if ( ! empty( $wpdb->error ) )
                wp_die( $wpdb->error->get_error_message() . $tryagain_link );
 
        // Fetch or generate keys and salts.
        $no_api = isset( $_POST['noapi'] );
        if ( ! $no_api ) {
        if ( ! empty( $wpdb->error ) )
                wp_die( $wpdb->error->get_error_message() . $tryagain_link );
 
        // Fetch or generate keys and salts.
        $no_api = isset( $_POST['noapi'] );
        if ( ! $no_api ) {

-               require_once( ABSPATH . WPINC . '/class-http.php' );
-               require_once( ABSPATH . WPINC . '/http.php' );
-               wp_fix_server_vars();
-               /**#@+
-                * @ignore
-                */
-               function get_bloginfo() {
-                       return ( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . str_replace( $_SERVER['PHP_SELF'], '/wp-admin/setup-config.php', '' ) );
-               }
-               /**#@-*/

                $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
        }
 
        if ( $no_api || is_wp_error( $secret_keys ) ) {
                $secret_keys = array();
                $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
        }
 
        if ( $no_api || is_wp_error( $secret_keys ) ) {
                $secret_keys = array();

-               require_once( ABSPATH . WPINC . '/pluggable.php' );

                for ( $i = 0; $i < 8; $i++ ) {
                        $secret_keys[] = wp_generate_password( 64, true, true );
                }
                for ( $i = 0; $i < 8; $i++ ) {
                        $secret_keys[] = wp_generate_password( 64, true, true );
                }


@@ -265,31 +305,43 @@ switch($step) {
                }
 ?></textarea>
 <p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the install.&#8221;' ); ?></p>
                }
 ?></textarea>
 <p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the install.&#8221;' ); ?></p>

-<p class="step"><a href="install.php" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>

 <script>
 (function(){
 <script>
 (function(){

-var el=document.getElementById('wp-config');
-el.focus();
-el.select();
+if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
+       var el = document.getElementById('wp-config');
+       el.focus();
+       el.select();
+}

 })();
 </script>
 <?php
        else :
 })();
 </script>
 <?php
        else :

-               $handle = fopen(ABSPATH . 'wp-config.php', 'w');
+               /*
+                * If this file doesn't exist, then we are using the wp-config-sample.php
+                * file one level up, which is for the develop repo.
+                */
+               if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+                       $path_to_wp_config = ABSPATH . 'wp-config.php';
+               else
+                       $path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+
+               $handle = fopen( $path_to_wp_config, 'w' );

                foreach( $config_file as $line ) {
                foreach( $config_file as $line ) {

-                       fwrite($handle, $line);
+                       fwrite( $handle, $line );

                }
                }

-               fclose($handle);
-               chmod(ABSPATH . 'wp-config.php', 0666);
+               fclose( $handle );
+               chmod( $path_to_wp_config, 0666 );

                setup_config_display_header();
 ?>
 <p><?php _e( "All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>
 
                setup_config_display_header();
 ?>
 <p><?php _e( "All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>
 

-<p class="step"><a href="install.php" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>

 <?php
        endif;
        break;
 }
 ?>
 <?php
        endif;
        break;
 }
 ?>

+<?php wp_print_scripts( 'language-chooser' ); ?>

 </body>
 </html>
 </body>
 </html>