WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@19757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-01-25 23:27:13 +00:00
parent e05c96316f
commit 0c141a4721
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
wp-admin/maint/repair.php
View File

@ -1,5 +1,10 @@
<?php <?php
/**
* Database Repair and Optimization Script.
*
* @package WordPress
* @subpackage Database
*/
define('WP_REPAIRING', true); define('WP_REPAIRING', true);
require_once('../../wp-load.php'); require_once('../../wp-load.php');
@ -19,15 +24,11 @@ header( 'Content-Type: text/html; charset=utf-8' );
<?php <?php
if ( ! defined( 'WP_ALLOW_REPAIR' ) ) { if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
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>"; 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>";
} elseif ( isset( $_GET['repair'] ) ) { } elseif ( isset( $_GET['repair'] ) ) {
check_admin_referer( 'repair_db' ); check_admin_referer( 'repair_db' );
if ( 2 == $_GET['repair'] ) $optimize = 2 == $_GET['repair'];
$optimize = true;
else
$optimize = false;
$okay = true; $okay = true;
$problems = array(); $problems = array();
@ -46,20 +47,20 @@ if ( !defined('WP_ALLOW_REPAIR') ) {
echo '<p>'; echo '<p>';
if ( 'OK' == $check->Msg_text ) { if ( 'OK' == $check->Msg_text ) {
/* translators: %s: table name */ /* translators: %s: table name */
printf( __( 'The %s table is okay.' ), $table ); printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
} else { } else {
/* translators: 1: table name, 2: error message, */ /* 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&hellip;' ) , $table, "<code>$check->Msg_text</code>" ); 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>" );
$repair = $wpdb->get_row( "REPAIR TABLE $table" ); $repair = $wpdb->get_row( "REPAIR TABLE $table" );
echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;'; echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
if ( 'OK' == $check->Msg_text ) { if ( 'OK' == $check->Msg_text ) {
/* translators: %s: table name */ /* translators: %s: table name */
printf( __( 'Successfully repaired the %s table.' ), $table ); printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
} else { } else {
/* translators: 1: table name, 2: error message, */ /* translators: 1: table name, 2: error message, */
echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ) . '<br />'; echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />';
$problems[$table] = $check->Msg_text; $problems[$table] = $check->Msg_text;
$okay = false; $okay = false;
} }
@ -68,44 +69,44 @@ if ( !defined('WP_ALLOW_REPAIR') ) {
if ( $okay && $optimize ) { if ( $okay && $optimize ) {
$check = $wpdb->get_row( "ANALYZE TABLE $table" ); $check = $wpdb->get_row( "ANALYZE TABLE $table" );
echo '<br />&nbsp;&nbsp;&nbsp;&nbsp'; echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
if ( 'Table is already up to date' == $check->Msg_text ) { if ( 'Table is already up to date' == $check->Msg_text ) {
/* translators: %s: table name */ /* translators: %s: table name */
printf( __( 'The %s table is already optimized.' ), $table ); printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
} else { } else {
$check = $wpdb->get_row( "OPTIMIZE TABLE $table" ); $check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
echo '<br />&nbsp;&nbsp;&nbsp;&nbsp'; echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) { if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) {
/* translators: %s: table name */ /* translators: %s: table name */
printf( __( 'Successfully optimized the %s table.' ), $table ); printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" );
} else { } else {
/* translators: 1: table name, 2: error message, */ /* translators: 1: table name, 2: error message, */
printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ); printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
} }
} }
} }
echo '</p>'; echo '</p>';
} }
if ( !empty($problems) ) { if ( $problems ) {
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'); 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' ) );
$problem_output = array(); $problem_output = '';
foreach ( $problems as $table => $problem ) foreach ( $problems as $table => $problem )
$problem_output[] = "$table: $problem"; $problem_output .= "$table: $problem\n";
echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>'; echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
} else { } else {
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>"; 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>";
} }
} else { } else {
if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) 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 &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.'); 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>';
else else
_e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.') echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
?> ?>
<p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p> <p class="step"><a class="button" href="<?php echo wp_nonce_url( 'repair.php?repair=1', 'repair_db' ); ?>"><?php _e( 'Repair Database' ); ?></a></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><?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>
<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> <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>
<?php <?php
} }
?> ?>