WordPress.org
Get WordPress

Make WordPress Core

Ticket #11491: 11491.2.diff

File 11491.2.diff, 9.0 KB (added by nacin, 16 years ago)

New patch is whitespace and code cleanup only -- no back compat issues.

  • install.php

     
    99/**
    1010 * We are installing WordPress.
    1111 *
    12  * @since unknown
     12 * @since 1.5.1
    1313 * @var bool
    1414 */
    15 define('WP_INSTALLING', true);
     15define( 'WP_INSTALLING', true );
    1616
    1717/** Load WordPress Bootstrap */
    18 require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
     18require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
    1919
    2020/** Load WordPress Administration Upgrade API */
    21 require_once(dirname(__FILE__) . '/includes/upgrade.php');
     21require_once( dirname( __FILE__ ) . '/includes/upgrade.php' );
    2222
    23 if (isset($_GET['step']))
    24         $step = $_GET['step'];
    25 else
    26         $step = 0;
     23$step = isset( $_GET['step'] ) ? $_GET['step'] : 0;
    2724
    2825/**
    2926 * Display install header.
    3027 *
    31  * @since unknown
     28 * @since 2.5
    3229 * @package WordPress
    3330 * @subpackage Installer
    3431 */
    3532function display_header() {
    36 header( 'Content-Type: text/html; charset=utf-8' );
     33        header( 'Content-Type: text/html; charset=utf-8' );
    3734?>
    3835<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    3936<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
    4037<head>
    4138        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    42         <title><?php _e('WordPress &rsaquo; Installation'); ?></title>
     39        <title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
    4340        <?php wp_admin_css( 'install', true ); ?>
    4441</head>
    4542<body>
    4643<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
    4744
    4845<?php
    49 }//end function display_header();
     46} // end display_header()
    5047
     48/**
     49 * Display installer setup form.
     50 *
     51 * @since 2.8
     52 * @package WordPress
     53 * @subpackage Installer
     54 */
    5155function display_setup_form( $error = null ) {
    5256        // Ensure that Blogs appear in search engines by default
    5357        $blog_public = 1;
    54         if ( isset($_POST) && !empty($_POST) ) {
    55                 $blog_public = isset($_POST['blog_public']);
    56         }
     58        if ( isset( $_POST ) && ! empty( $_POST ) )
     59                $blog_public = isset( $_POST['blog_public'] );
    5760
    5861        if ( ! is_null( $error ) ) {
    5962?>
    60 <p><?php printf( __('<strong>ERROR</strong>: %s'), $error); ?></p>
     63<p><?php printf( __( '<strong>ERROR</strong>: %s' ), $error ); ?></p>
    6164<?php } ?>
    6265<form id="setup" method="post" action="install.php?step=2">
    6366        <table class="form-table">
    6467                <tr>
    65                         <th scope="row"><label for="weblog_title"><?php _e('Blog Title'); ?></label></th>
    66                         <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>
     68                        <th scope="row"><label for="weblog_title"><?php _e( 'Blog Title' ); ?></label></th>
     69                        <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>
    6770                </tr>
    6871                <tr>
    69                         <th scope="row"><label for="admin_email"><?php _e('Your E-mail'); ?></label></th>
    70                         <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 />
    71                         <?php _e('Double-check your email address before continuing.'); ?></td>
     72                        <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
     73                        <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 />
     74                        <?php _e( 'Double-check your email address before continuing.' ); ?></td>
    7275                </tr>
    7376                <tr>
    74                         <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>
     77                        <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>
    7578                </tr>
    7679        </table>
    77         <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e('Install WordPress'); ?>" class="button" /></p>
     80        <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
    7881</form>
    7982<?php
    80 }
     83} // end display_setup_form()
    8184
    8285// Let's check to make sure WP isn't already installed.
    83 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>');}
     86if ( is_blog_installed() ) {
     87        display_header();
     88        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>' );
     89}
    8490
    85 switch($step) {
     91switch ( $step ) {
    8692        case 0:
    87         case 1: // in case people are directly linking to this
     93        case 1:
    8894          display_header();
    8995?>
    90 <h1><?php _e('Welcome'); ?></h1>
    91 <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&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.'), '../readme.html'); ?></p>
    92 <!--<h2 class="step"><a href="install.php?step=1"><?php _e('First Step'); ?></a></h2>-->
     96<h1><?php _e( 'Welcome' ); ?></h1>
     97<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&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ), '../readme.html' ); ?></p>
    9398
    94 <h1><?php _e('Information needed'); ?></h1>
    95 <p><?php _e('Please provide the following information.  Don&#8217;t worry, you can always change these settings later.'); ?></p>
     99<h1><?php _e( 'Information needed' ); ?></h1>
     100<p><?php _e( 'Please provide the following information.  Don&#8217;t worry, you can always change these settings later.' ); ?></p>
    96101
    97 
    98 
    99102<?php
    100103                display_setup_form();
    101104                break;
    102105        case 2:
    103                 if ( !empty($wpdb->error) )
    104                         wp_die($wpdb->error->get_error_message());
     106                if ( ! empty( $wpdb->error ) )
     107                        wp_die( $wpdb->error->get_error_message() );
    105108
    106109                display_header();
    107110                // Fill in the data we gathered
    108                 $weblog_title = isset($_POST['weblog_title']) ? stripslashes($_POST['weblog_title']) : '';
    109                 $admin_email = isset($_POST['admin_email']) ? stripslashes($_POST['admin_email']) : '';
    110                 $public = isset($_POST['blog_public']) ? (int) $_POST['blog_public'] : 0;
     111                $weblog_title = isset( $_POST['weblog_title'] ) ? stripslashes( $_POST['weblog_title'] ) : '';
     112                $admin_email = isset( $_POST['admin_email'] ) ? stripslashes( $_POST['admin_email'] ) : '';
     113                $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
    111114                // check e-mail address
    112115                $error = false;
    113                 if (empty($admin_email)) {
     116                if ( empty( $admin_email ) ) {
    114117                        // TODO: poka-yoke
    115                         display_setup_form( __('you must provide an e-mail address.') );
     118                        display_setup_form( __( 'you must provide an e-mail address.' ) );
    116119                        $error = true;
    117                 } else if (!is_email($admin_email)) {
     120                } elseif ( ! is_email( $admin_email ) ) {
    118121                        // TODO: poka-yoke
    119                         display_setup_form( __('that isn&#8217;t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>') );
     122                        display_setup_form( __( 'that isn&#8217;t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>' ) );
    120123                        $error = true;
    121124                }
    122125
    123126                if ( $error === false ) {
    124127                        $wpdb->show_errors();
    125                         $result = wp_install($weblog_title, 'admin', $admin_email, $public);
    126                         extract($result, EXTR_SKIP);
     128                        $result = wp_install( $weblog_title, 'admin', $admin_email, $public );
     129                        extract( $result, EXTR_SKIP );
    127130?>
    128131
    129 <h1><?php _e('Success!'); ?></h1>
     132<h1><?php _e( 'Success!' ); ?></h1>
    130133
    131 <p><?php printf(__('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'), ''); ?></p>
     134<p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p>
    132135
    133136<table class="form-table">
    134137        <tr>
    135                 <th><?php _e('Username'); ?></th>
     138                <th><?php _e( 'Username' ); ?></th>
    136139                <td><code>admin</code></td>
    137140        </tr>
    138141        <tr>
    139                 <th><?php _e('Password'); ?></th>
    140                 <td><?php if ( !empty( $password ) ) {
    141                                                 echo '<code>'. $password .'</code><br />';
    142                                         }
    143                                         echo '<p>'. $password_message .'</p>'; ?></td>
     142                <th><?php _e( 'Password' ); ?></th>
     143                <td><?php
     144                if ( ! empty( $password ) )
     145                        echo "<code>$password</code><br />";
     146                echo "<p>$password_message</p>"; ?>
     147                </td>
    144148        </tr>
    145149</table>
    146150
    147 <p class="step"><a href="../wp-login.php" class="button"><?php _e('Log In'); ?></a></p>
     151<p class="step"><a href="../wp-login.php" class="button"><?php _e( 'Log In' ); ?></a></p>
    148152
    149153<?php
    150154                }