WordPress.org
Get WordPress

Make WordPress Core

Changeset 19757


Ignore:
Timestamp:
01/25/2012 11:27:13 PM (14 years ago)
Author:
nacin
Message:

Formatting and i18n cleanup of repair.php. props zeo for initial patch. fixes #18770.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/maint/repair.php

    r19596 r19757  
    11<?php
    2 
     2/**
     3 * Database Repair and Optimization Script.
     4 *
     5 * @package WordPress
     6 * @subpackage Database
     7 */
    38define('WP_REPAIRING', true);
    49
    … …  
    1116<head>
    1217        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    13         <title><?php _e('WordPress &rsaquo; Database Repair'); ?></title>
     18        <title><?php _e( 'WordPress &rsaquo; Database Repair' ); ?></title>
    1419        <?php wp_admin_css( 'install', true ); ?>
    1520</head>
    … …  
    1924<?php
    2025
    21 if ( !defined('WP_ALLOW_REPAIR') ) {
    22         echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
    23 } elseif ( isset($_GET['repair']) ) {
    24         check_admin_referer('repair_db');
     26if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
     27        echo '<p>' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . "</p><code>define('WP_ALLOW_REPAIR', true);</code>";
     28} elseif ( isset( $_GET['repair'] ) ) {
     29        check_admin_referer( 'repair_db' );
    2530
    26         if ( 2 == $_GET['repair'] )
    27                 $optimize = true;
    28         else
    29                 $optimize = false;
    30 
     31        $optimize = 2 == $_GET['repair'];
    3132        $okay = true;
    3233        $problems = array();
    … …  
    4243        // Loop over the tables, checking and repairing as needed.
    4344        foreach ( $tables as $table ) {
    44                 $check = $wpdb->get_row("CHECK TABLE $table");
     45                $check = $wpdb->get_row( "CHECK TABLE $table" );
    4546
    4647                echo '<p>';
    4748                if ( 'OK' == $check->Msg_text ) {
    4849                        /* translators: %s: table name */
    49                         printf( __( 'The %s table is okay.' ), $table );
     50                        printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
    5051                } else {
    5152                        /* translators: 1: table name, 2: error message, */
    52                         printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" );
     53                        printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , "<code>$table</code>", "<code>$check->Msg_text</code>" );
    5354
    54                         $repair = $wpdb->get_row("REPAIR TABLE $table");
     55                        $repair = $wpdb->get_row( "REPAIR TABLE $table" );
    5556
    5657                        echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
    5758                        if ( 'OK' == $check->Msg_text ) {
    5859                                /* translators: %s: table name */
    59                                 printf( __( 'Successfully repaired the %s table.' ), $table );
     60                                printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
    6061                        } else {
    6162                                /* translators: 1: table name, 2: error message, */
    62                                 echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ) . '<br />';
     63                                echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />';
    6364                                $problems[$table] = $check->Msg_text;
    6465                                $okay = false;
    … …  
    6768
    6869                if ( $okay && $optimize ) {
    69                         $check = $wpdb->get_row("ANALYZE TABLE $table");
     70                        $check = $wpdb->get_row( "ANALYZE TABLE $table" );
    7071
    71                         echo '<br />&nbsp;&nbsp;&nbsp;&nbsp';
     72                        echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
    7273                        if ( 'Table is already up to date' == $check->Msg_text )  {
    7374                                /* translators: %s: table name */
    74                                 printf( __( 'The %s table is already optimized.' ), $table );
     75                                printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
    7576                        } else {
    76                                 $check = $wpdb->get_row("OPTIMIZE TABLE $table");
     77                                $check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
    7778
    78                                 echo '<br />&nbsp;&nbsp;&nbsp;&nbsp';
     79                                echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
    7980                                if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) {
    8081                                        /* translators: %s: table name */
    81                                         printf( __( 'Successfully optimized the %s table.' ), $table );
     82                                        printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" );
    8283                                } else {
    8384                                        /* translators: 1: table name, 2: error message, */
    84                                         printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" );
     85                                        printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
    8586                                }
    8687                        }
    … …  
    8990        }
    9091
    91         if ( !empty($problems) ) {
    92                 printf('<p>'.__('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.').'</p>', 'http://wordpress.org/support/forum/3');
    93                 $problem_output = array();
     92        if ( $problems ) {
     93                printf( '<p>' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.') . '</p>', __( 'http://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
     94                $problem_output = '';
    9495                foreach ( $problems as $table => $problem )
    95                         $problem_output[] = "$table: $problem";
    96                 echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>';
     96                        $problem_output .= "$table: $problem\n";
     97                echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
    9798        } else {
    98                 echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
     99                echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><code>define('WP_ALLOW_REPAIR', true);</code>";
    99100        }
    100101} else {
    101         if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] )
    102                 _e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.');
     102        if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
     103                echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
    103104        else
    104                 _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.')
     105                echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
    105106?>
    106         <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p>
    107         <?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
    108         <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
     107        <p class="step"><a class="button" href="<?php echo wp_nonce_url( 'repair.php?repair=1', 'repair_db' ); ?>"><?php _e( 'Repair Database' ); ?></a></p>
     108        <p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
     109        <p class="step"><a class="button" href="<?php echo wp_nonce_url( 'repair.php?repair=2', 'repair_db' ); ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
    109110<?php
    110111}
Note: See TracChangeset for help on using the changeset viewer.