From 8b38f2ff2f0e1dd565d990abc6802d6d2af99712 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 25 Jan 2012 23:27:13 +0000 Subject: [PATCH] Formatting and i18n cleanup of repair.php. props zeo for initial patch. fixes #18770. git-svn-id: https://develop.svn.wordpress.org/trunk@19757 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/maint/repair.php | 73 ++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/wp-admin/maint/repair.php b/wp-admin/maint/repair.php index ba43e2df89..33bb5e8412 100644 --- a/wp-admin/maint/repair.php +++ b/wp-admin/maint/repair.php @@ -1,5 +1,10 @@ > - <?php _e('WordPress › Database Repair'); ?> + <?php _e( 'WordPress › Database Repair' ); ?> @@ -18,16 +23,12 @@ header( 'Content-Type: text/html; charset=utf-8' ); '.__('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.')."

define('WP_ALLOW_REPAIR', true);"; -} elseif ( isset($_GET['repair']) ) { - check_admin_referer('repair_db'); - - if ( 2 == $_GET['repair'] ) - $optimize = true; - else - $optimize = false; +if ( ! defined( 'WP_ALLOW_REPAIR' ) ) { + echo '

' . __( '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.' ) . "

define('WP_ALLOW_REPAIR', true);"; +} elseif ( isset( $_GET['repair'] ) ) { + check_admin_referer( 'repair_db' ); + $optimize = 2 == $_GET['repair']; $okay = true; $problems = array(); @@ -41,71 +42,71 @@ if ( !defined('WP_ALLOW_REPAIR') ) { // Loop over the tables, checking and repairing as needed. foreach ( $tables as $table ) { - $check = $wpdb->get_row("CHECK TABLE $table"); + $check = $wpdb->get_row( "CHECK TABLE $table" ); echo '

'; if ( 'OK' == $check->Msg_text ) { /* translators: %s: table name */ - printf( __( 'The %s table is okay.' ), $table ); + printf( __( 'The %s table is okay.' ), "$table" ); } else { /* translators: 1: table name, 2: error message, */ - printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table…' ) , $table, "$check->Msg_text" ); + printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table…' ) , "$table", "$check->Msg_text" ); - $repair = $wpdb->get_row("REPAIR TABLE $table"); + $repair = $wpdb->get_row( "REPAIR TABLE $table" ); echo '
    '; if ( 'OK' == $check->Msg_text ) { /* translators: %s: table name */ - printf( __( 'Successfully repaired the %s table.' ), $table ); + printf( __( 'Successfully repaired the %s table.' ), "$table" ); } else { /* translators: 1: table name, 2: error message, */ - echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), $table, "$check->Msg_text" ) . '
'; + echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "$table", "$check->Msg_text" ) . '
'; $problems[$table] = $check->Msg_text; $okay = false; } } if ( $okay && $optimize ) { - $check = $wpdb->get_row("ANALYZE TABLE $table"); + $check = $wpdb->get_row( "ANALYZE TABLE $table" ); - echo '
    '; + echo '
    '; if ( 'Table is already up to date' == $check->Msg_text ) { /* translators: %s: table name */ - printf( __( 'The %s table is already optimized.' ), $table ); + printf( __( 'The %s table is already optimized.' ), "$table" ); } else { - $check = $wpdb->get_row("OPTIMIZE TABLE $table"); + $check = $wpdb->get_row( "OPTIMIZE TABLE $table" ); - echo '
    '; + echo '
    '; if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) { /* translators: %s: table name */ - printf( __( 'Successfully optimized the %s table.' ), $table ); + printf( __( 'Successfully optimized the %s table.' ), "$table" ); } else { /* translators: 1: table name, 2: error message, */ - printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), $table, "$check->Msg_text" ); + printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "$table", "$check->Msg_text" ); } } } echo '

'; } - if ( !empty($problems) ) { - printf('

'.__('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance.').'

', 'http://wordpress.org/support/forum/3'); - $problem_output = array(); + if ( $problems ) { + printf( '

' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance.') . '

', __( 'http://wordpress.org/support/forum/how-to-and-troubleshooting' ) ); + $problem_output = ''; foreach ( $problems as $table => $problem ) - $problem_output[] = "$table: $problem"; - echo ''; + $problem_output .= "$table: $problem\n"; + echo '

'; } else { - echo '

'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."

define('WP_ALLOW_REPAIR', true);"; + echo '

' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "

define('WP_ALLOW_REPAIR', true);"; } } else { - if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] ) - _e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.'); + if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) + echo '

' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.' ) . '

'; else - _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.') + echo '

' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '

'; ?> -

- -

+

+

+