WordPress.org

Make WordPress Core

Ticket #18200: 18200.diff

File 18200.diff, 15.1 KB (added by nacin, 10 years ago)
  • wp-admin/setup-config.php

     
    3535 * the database class while being wp-content/db.php aware.
    3636 * @ignore
    3737 */
    38 define('ABSPATH', dirname(dirname(__FILE__)).'/');
    39 define('WPINC', 'wp-includes');
    40 define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
    41 define('WP_DEBUG', false);
     38define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
     39define( 'WPINC', 'wp-includes' );
     40define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
     41define( 'WP_DEBUG', false );
    4242/**#@-*/
    4343
    44 require_once(ABSPATH . WPINC . '/load.php');
    45 require_once(ABSPATH . WPINC . '/version.php');
     44require_once( ABSPATH . WPINC . '/load.php' );
     45require_once( ABSPATH . WPINC . '/version.php' );
    4646wp_check_php_mysql_versions();
    4747
    48 require_once(ABSPATH . WPINC . '/compat.php');
    49 require_once(ABSPATH . WPINC . '/functions.php');
    50 require_once(ABSPATH . WPINC . '/class-wp-error.php');
     48require_once( ABSPATH . WPINC . '/compat.php' );
     49require_once( ABSPATH . WPINC . '/functions.php' );
     50require_once( ABSPATH . WPINC . '/class-wp-error.php' );
    5151
    52 if (!file_exists(ABSPATH . 'wp-config-sample.php'))
    53         wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
     52if ( ! file_exists( ABSPATH . 'wp-config-sample.php' ) )
     53        wp_die( /*WP_I18N_SETUP_NO_SAMPLE*/'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'/*/WP_I18N_SETUP_NO_SAMPLE*/ );
    5454
    55 $configFile = file(ABSPATH . 'wp-config-sample.php');
     55$configFile = file( ABSPATH . 'wp-config-sample.php' );
    5656
    5757// Check if wp-config.php has been created
    58 if (file_exists(ABSPATH . 'wp-config.php'))
    59         wp_die("<p>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='install.php'>installing now</a>.</p>");
     58if ( file_exists( ABSPATH . 'wp-config.php' ) )
     59        wp_die( '<p>' . /*WP_I18N_SETUP_CONFIG_EXISTS*/"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='install.php'>installing now</a>."/*/WP_I18N_SETUP_CONFIG_EXISTS*/ . '</p>' );
    6060
    6161// Check if wp-config.php exists above the root directory but is not part of another install
    62 if (file_exists(ABSPATH . '../wp-config.php') && ! file_exists(ABSPATH . '../wp-settings.php'))
    63         wp_die("<p>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>.</p>");
     62if ( file_exists( ABSPATH . '../wp-config.php') && ! file_exists( ABSPATH . '../wp-settings.php' ) )
     63        wp_die( '<p>' . /*WP_I18N_SETUP_CONFIG_EXISTS_UP*/"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>."/*/WP_I18N_SETUP_CONFIG_EXISTS_UP*/ . '</p>' );
    6464
    65 if (isset($_GET['step']))
     65if ( isset( $_GET['step'] ) )
    6666        $step = $_GET['step'];
    6767else
    6868        $step = 0;
     
    8282<html xmlns="http://www.w3.org/1999/xhtml">
    8383<head>
    8484<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    85 <title>WordPress &rsaquo; Setup Configuration File</title>
     85<title><?php echo /*WP_I18N_SETUP_TITLE*/'WordPress &rsaquo; Setup Configuration File'/*WP_I18N_SETUP_CONFIG_EXISTS*/; ?></title>
    8686<link rel="stylesheet" href="css/install.css" type="text/css" />
    8787
    8888</head>
     
    9696                display_header();
    9797?>
    9898
    99 <p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
     99<p><?php echo /*WP_I18N_SETUP_WELCOME*/'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.'/*/WP_I18N_SETUP_WELCOME*/; ?></p>
    100100<ol>
    101         <li>Database name</li>
    102         <li>Database username</li>
    103         <li>Database password</li>
    104         <li>Database host</li>
    105         <li>Table prefix (if you want to run more than one WordPress in a single database) </li>
     101        <li><?php echo /*WP_I18N_SETUP_WELCOME_DB*/'Database name'/*/WP_I18N_SETUP_WELCOME_DB*/; ?></li>
     102        <li><?php echo /*WP_I18N_SETUP_WELCOME_USER*/'Database username'/*/WP_I18N_SETUP_WELCOME_USER*/; ?></li>
     103        <li><?php echo /*WP_I18N_SETUP_WELCOME_PASS*/'Database password'/*/WP_I18N_SETUP_WELCOME_PASS*/; ?></li>
     104        <li><?php echo /*WP_I18N_SETUP_WELCOME_HOST*/'Database host'/*/WP_I18N_SETUP_WELCOME_HOST*/; ?></li>
     105        <li><?php echo /*WP_I18N_SETUP_WELCOME_PREFIX*/'Table prefix (if you want to run more than one WordPress in a single database)'/*/WP_I18N_SETUP_WELCOME_PREFIX*/; ?></li>
    106106</ol>
    107 <p><strong>If for any reason this automatic file creation doesn't work, don'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>
    108 <p>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>
     107<p><strong><?php echo /*WP_I18N_SETUP_NO_WORRIES*/"If for any reason this automatic file creation doesn't work, don'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>."/*/WP_I18N_SETUP_NO_WORRIES*/; ?></strong></p>
     108<p><?php echo /*WP_I18N_SETUP_SUPPLIES*/'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;'/*/WP_I18N_SETUP_SUPPLIES*/; ?></p>
    109109
    110 <p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button">Let&#8217;s go!</a></p>
     110<p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button"><?php echo /*WP_I18N_SETUP_LETS_GO*/'Let&#8217;s go!'/*/WP_I18N_SETUP_LETS_GO*/; ?></a></p>
    111111<?php
    112112        break;
    113113
     
    115115                display_header();
    116116        ?>
    117117<form method="post" action="setup-config.php?step=2">
    118         <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
     118        <p><?php echo /*WP_I18N_ENTER_DETAILS*/"Below you should enter your database connection details. If you're not sure about these, contact your host."/*/WP_I18N_ENTER_DETAILS*/; ?></p>
    119119        <table class="form-table">
    120120                <tr>
    121                         <th scope="row"><label for="dbname">Database Name</label></th>
     121                        <th scope="row"><label for="dbname"><?php echo /*WP_I18N_SETUP_DBNAME*/'Database Name'/*/WP_I18N_SETUP_DBNAME*/; ?></label></th>
    122122                        <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
    123                         <td>The name of the database you want to run WP in. </td>
     123                        <td><?php echo /*WP_I18N_SETUP_DBNAME_INFO*/'The name of the database you want to run WP in.'/*/WP_I18N_SETUP_DBNAME_INFO*/; ?></td>
    124124                </tr>
    125125                <tr>
    126                         <th scope="row"><label for="uname">User Name</label></th>
     126                        <th scope="row"><label for="uname"><?php echo /*WP_I18N_SETUP_USER*/'User Name'/*/WP_I18N_SETUP_USER*/; ?></label></th>
    127127                        <td><input name="uname" id="uname" type="text" size="25" value="username" /></td>
    128                         <td>Your MySQL username</td>
     128                        <td><?php echo /*WP_I18N_SETUP_USER_INFO*/'Your MySQL username'/*/WP_I18N_SETUP_USER_INFO*/; ?></td>
    129129                </tr>
    130130                <tr>
    131                         <th scope="row"><label for="pwd">Password</label></th>
     131                        <th scope="row"><label for="pwd"><?php echo /*WP_I18N_SETUP_PASSWORD*/'Password'/*/WP_I18N_SETUP_PASSWORD*/; ?></label></th>
    132132                        <td><input name="pwd" id="pwd" type="text" size="25" value="password" /></td>
    133                         <td>...and MySQL password.</td>
     133                        <td><?php echo /*WP_I18N_SETUP_PASSWORD_INFO*/'...and MySQL password.'/*/WP_I18N_SETUP_PASSWORD_INFO*/; ?></td>
    134134                </tr>
    135135                <tr>
    136                         <th scope="row"><label for="dbhost">Database Host</label></th>
     136                        <th scope="row"><label for="dbhost"><?php echo /*WP_I18N_SETUP_HOST*/'Database Host'/*/WP_I18N_SETUP_HOST*/; ?></label></th>
    137137                        <td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
    138                         <td>You should be able to get this info from your web host, if <code>localhost</code> does not work.</td>
     138                        <td><?php echo /*WP_I18N_SETUP_HOST_INFO*/'You should be able to get this info from your web host, if <code>localhost</code> does not work.'/*/WP_I18N_SETUP_HOST_INFO*/; ?></td>
    139139                </tr>
    140140                <tr>
    141                         <th scope="row"><label for="prefix">Table Prefix</label></th>
     141                        <th scope="row"><label for="prefix"><?php echo /*WP_I18N_SETUP_PREFIX*/'Table Prefix'/*/WP_I18N_SETUP_PREFIX*/; ?></label></th>
    142142                        <td><input name="prefix" id="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
    143                         <td>If you want to run multiple WordPress installations in a single database, change this.</td>
     143                        <td><?php echo /*WP_I18N_SETUP_PREFIX_INFO*/'If you want to run multiple WordPress installations in a single database, change this.'/*/WP_I18N_SETUP_PREFIX_INFO*/; ?></td>
    144144                </tr>
    145145        </table>
    146146        <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="true" /><?php } ?>
    147         <p class="step"><input name="submit" type="submit" value="Submit" class="button" /></p>
     147        <p class="step"><input name="submit" type="submit" value="<?php echo /*WP_I18N_SETUP_SUBMIT*/'Submit'/*/WP_I18N_SETUP_SUBMIT*/; ?>" class="button" /></p>
    148148</form>
    149149<?php
    150150        break;
    151151
    152152        case 2:
    153         $dbname  = trim($_POST['dbname']);
    154         $uname   = trim($_POST['uname']);
    155         $passwrd = trim($_POST['pwd']);
    156         $dbhost  = trim($_POST['dbhost']);
    157         $prefix  = trim($_POST['prefix']);
    158         if ( empty($prefix) )
     153        $dbname  = trim( $_POST['dbname'] );
     154        $uname   = trim( $_POST['uname'] );
     155        $passwrd = trim( $_POST['pwd'] );
     156        $dbhost  = trim( $_POST['dbhost'] );
     157        $prefix  = trim( $_POST['prefix'] );
     158        if ( empty( $prefix ) )
    159159                $prefix = 'wp_';
    160160
    161161        // Validate $prefix: it can only contain letters, numbers and underscores
     
    166166        /**#@+
    167167         * @ignore
    168168         */
    169         define('DB_NAME', $dbname);
    170         define('DB_USER', $uname);
    171         define('DB_PASSWORD', $passwrd);
    172         define('DB_HOST', $dbhost);
     169        define( 'DB_NAME', $dbname );
     170        define( 'DB_USER', $uname );
     171        define( 'DB_PASSWORD', $passwrd );
     172        define( 'DB_HOST', $dbhost );
    173173        /**#@-*/
    174174
    175175        // We'll fail here if the values are no good.
    176176        require_wp_db();
    177177        if ( ! empty( $wpdb->error ) ) {
    178                 $back = '<p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">Try Again</a></p>';
     178                $back = '<p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">' . /*WP_I18N_SETUP_TRY_AGAIN*/'Try Again'/*/WP_I18N_SETUP_TRY_AGAIN*/ . '</a></p>';
    179179                wp_die( $wpdb->error->get_error_message() . $back );
    180180        }
    181181
     
    207207        } else {
    208208                $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
    209209                foreach ( $secret_keys as $k => $v ) {
    210                         $secret_keys[$k] = substr( $v, 28, 64 );
     210                        $secret_keys[ $k ] = substr( $v, 28, 64 );
    211211                }
    212212        }
    213213        $key = 0;
    214214
    215         foreach ($configFile as $line_num => $line) {
    216                 switch (substr($line,0,16)) {
     215        foreach ( $configFile as $line_num => $line ) {
     216                switch ( substr( $line, 0, 16 ) ) {
    217217                        case "define('DB_NAME'":
    218                                 $configFile[$line_num] = str_replace("database_name_here", $dbname, $line);
     218                                $configFile[ $line_num ] = str_replace( "database_name_here", $dbname, $line );
    219219                                break;
    220220                        case "define('DB_USER'":
    221                                 $configFile[$line_num] = str_replace("'username_here'", "'$uname'", $line);
     221                                $configFile[ $line_num ] = str_replace( "'username_here'", "'$uname'", $line );
    222222                                break;
    223223                        case "define('DB_PASSW":
    224                                 $configFile[$line_num] = str_replace("'password_here'", "'$passwrd'", $line);
     224                                $configFile[ $line_num ] = str_replace( "'password_here'", "'$passwrd'", $line );
    225225                                break;
    226226                        case "define('DB_HOST'":
    227                                 $configFile[$line_num] = str_replace("localhost", $dbhost, $line);
     227                                $configFile[ $line_num ] = str_replace( "localhost", $dbhost, $line );
    228228                                break;
    229229                        case '$table_prefix  =':
    230                                 $configFile[$line_num] = str_replace('wp_', $prefix, $line);
     230                                $configFile[ $line_num ] = str_replace( 'wp_', $prefix, $line );
    231231                                break;
    232232                        case "define('AUTH_KEY":
    233233                        case "define('SECURE_A":
     
    237237                        case "define('SECURE_A":
    238238                        case "define('LOGGED_I":
    239239                        case "define('NONCE_SA":
    240                                 $configFile[$line_num] = str_replace('put your unique phrase here', $secret_keys[$key++], $line );
     240                                $configFile[ $line_num ] = str_replace( 'put your unique phrase here', $secret_keys[ $key++ ], $line );
    241241                                break;
    242242                }
    243243        }
    244         if ( ! is_writable(ABSPATH) ) :
     244        if ( ! is_writable( ABSPATH ) ) :
    245245                display_header();
    246246?>
    247 <p>Sorry, but I can't write the <code>wp-config.php</code> file.</p>
    248 <p>You can create the <code>wp-config.php</code> manually and paste the following text into it.</p>
     247<p><?php echo /*WP_I18N_SETUP_NO_INK*/"Sorry, but I can't write the <code>wp-config.php</code> file."/*/WP_I18N_SETUP_NO_INK*/; ?></p>
     248<p><?php echo /*WP_I18N_SETUP_PASTE*/'You can create the <code>wp-config.php</code> manually and paste the following text into it.'/*/WP_I18N_SETUP_PASTE*/; ?></p>
    249249<textarea cols="98" rows="15" class="code"><?php
    250                 foreach( $configFile as $line ) {
    251                         echo htmlentities($line, ENT_COMPAT, 'UTF-8');
     250                foreach ( $configFile as $line ) {
     251                        echo htmlentities( $line, ENT_COMPAT, 'UTF-8' );
    252252                }
    253253?></textarea>
    254 <p>After you've done that, click "Run the install."</p>
    255 <p class="step"><a href="install.php" class="button">Run the install</a></p>
     254<p><?php echo /*WP_I18N_SETUP_CLICK_RUN*/'After you\'ve done that, click "Run the install."'/*/WP_I18N_SETUP_CLICK_RUN*/; ?></p>
     255<p class="step"><a href="install.php" class="button"><?php echo /*WP_I18N_SETUP_RUN*/'Run the install'/*/WP_I18N_SETUP_RUN*/; ?></a></p>
    256256<?php
    257257        else :
    258                 $handle = fopen(ABSPATH . 'wp-config.php', 'w');
    259                 foreach( $configFile as $line ) {
    260                         fwrite($handle, $line);
     258                $handle = fopen( ABSPATH . 'wp-config.php', 'w' );
     259                foreach ( $configFile as $line ) {
     260                        fwrite( $handle, $line );
    261261                }
    262                 fclose($handle);
    263                 chmod(ABSPATH . 'wp-config.php', 0666);
     262                fclose( $handle );
     263                chmod( ABSPATH . 'wp-config.php', 0666 );
    264264                display_header();
    265265?>
    266 <p>All right sparky! You'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>
     266<p><?php echo /*WP_I18N_SETUP_SPARKY*/"All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;"/*/WP_I18N_SETUP_SPARKY*/; ?></p>
    267267
    268 <p class="step"><a href="install.php" class="button">Run the install</a></p>
     268<p class="step"><a href="install.php" class="button"><?php echo /*WP_I18N_SETUP_RUN*/'Run the install'/*/WP_I18N_SETUP_RUN*/; ?></a></p>
    269269<?php
    270270        endif;
    271271        break;