diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index a6c19fdb47..273f3f4082 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -20,11 +20,14 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 && // Displays the form ?>
> - ' . "\n" - . '' . "\n"; - }?> + ' . "\n" + . '' . "\n"; +}?>
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index b99f8fa1ec..c9f46611ad 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -130,7 +130,9 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine } /** - * @return array detail pages + * Get information pages + * + * @return array detail pages */ function getInfoPages() { @@ -178,7 +180,10 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine . ' / ' . join( ' ', - $common_functions->formatByteDown($status['Innodb_buffer_pool_pages_total'] * $status['Innodb_page_size']) + $common_functions->formatByteDown( + $status['Innodb_buffer_pool_pages_total'] + * $status['Innodb_page_size'] + ) ) . "\n" . ' ' . "\n" . ' ' . "\n" @@ -225,75 +230,89 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine . '' . "\n" . ' '; - // not present at least since MySQL 5.1.40 - if (isset($status['Innodb_buffer_pool_pages_latched'])) { - $output .= ' ' - . ' ' - . ' ' - . ' '; - } + // not present at least since MySQL 5.1.40 + if (isset($status['Innodb_buffer_pool_pages_latched'])) { + $output .= ' ' + . ' ' + . ' ' + . ' '; + } - $output .= ' ' . "\n" - . '
' . __('Latched pages') . '' - . $common_functions->formatNumber( - $status['Innodb_buffer_pool_pages_latched'], 0 - ) - . '
' . __('Latched pages') . '' + . $common_functions->formatNumber( + $status['Innodb_buffer_pool_pages_latched'], 0 + ) + . '
' . "\n\n" - . '' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . '
' . "\n" - . ' ' . __('Buffer Pool Activity') . "\n" - . '
' . __('Read requests') . '' - . $common_functions->formatNumber( - $status['Innodb_buffer_pool_read_requests'], 0 - ) . "\n" - . '
' . __('Write requests') . '' - . $common_functions->formatNumber( - $status['Innodb_buffer_pool_write_requests'], 0 - ) . "\n" - . '
' . __('Read misses') . '' - . $common_functions->formatNumber( - $status['Innodb_buffer_pool_reads'], 0 - ) . "\n" - . '
' . __('Write waits') . '' - . $common_functions->formatNumber( - $status['Innodb_buffer_pool_wait_free'], 0 - ) . "\n" - . '
' . __('Read misses in %') . '' - . ($status['Innodb_buffer_pool_read_requests'] == 0 - ? '---' - : htmlspecialchars($common_functions->formatNumber($status['Innodb_buffer_pool_reads'] * 100 / $status['Innodb_buffer_pool_read_requests'], 3, 2)) . ' %') . "\n" - . '
' . __('Write waits in %') . '' - . ($status['Innodb_buffer_pool_write_requests'] == 0 - ? '---' - : htmlspecialchars($common_functions->formatNumber($status['Innodb_buffer_pool_wait_free'] * 100 / $status['Innodb_buffer_pool_write_requests'], 3, 2)) . ' %') . "\n" - . '
' . "\n"; + $output .= ' ' . "\n" + . '' . "\n\n" + . '' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . '
' . "\n" + . ' ' . __('Buffer Pool Activity') . "\n" + . '
' . __('Read requests') . '' + . $common_functions->formatNumber( + $status['Innodb_buffer_pool_read_requests'], 0 + ) . "\n" + . '
' . __('Write requests') . '' + . $common_functions->formatNumber( + $status['Innodb_buffer_pool_write_requests'], 0 + ) . "\n" + . '
' . __('Read misses') . '' + . $common_functions->formatNumber( + $status['Innodb_buffer_pool_reads'], 0 + ) . "\n" + . '
' . __('Write waits') . '' + . $common_functions->formatNumber( + $status['Innodb_buffer_pool_wait_free'], 0 + ) . "\n" + . '
' . __('Read misses in %') . '' + . ($status['Innodb_buffer_pool_read_requests'] == 0 + ? '---' + : htmlspecialchars( + $common_functions->formatNumber( + $status['Innodb_buffer_pool_reads'] * 100 + / $status['Innodb_buffer_pool_read_requests'], + 3, + 2 + ) + ) . ' %') . "\n" + . '
' . __('Write waits in %') . '' + . ($status['Innodb_buffer_pool_write_requests'] == 0 + ? '---' + : htmlspecialchars( + $common_functions->formatNumber( + $status['Innodb_buffer_pool_wait_free'] * 100 + / $status['Innodb_buffer_pool_write_requests'], + 3, + 2 + ) + ) . ' %') . "\n" + . '
' . "\n"; return $output; } @@ -305,15 +324,18 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine function getPageStatus() { return '
' . "\n"
-            . htmlspecialchars(PMA_DBI_fetch_value('SHOW INNODB STATUS;', 0, 'Status')) . "\n"
+            . htmlspecialchars(
+                PMA_DBI_fetch_value('SHOW INNODB STATUS;', 0, 'Status')
+            ) . "\n"
             . '
' . "\n"; } /** - * returns content for page $id + * Returns content for page $id * - * @param string $id page id - * @return string html output + * @param string $id page id + * + * @return string html output */ function getPage($id) { @@ -338,8 +360,8 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine } /** - * * Gets the InnoDB plugin version number + * * http://www.innodb.com/products/innodb_plugin * (do not confuse this with phpMyAdmin's storage engine plugins!) * @@ -351,8 +373,8 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine } /** - * * Gets the InnoDB file format + * * (works only for the InnoDB plugin) * http://www.innodb.com/products/innodb_plugin * (do not confuse this with phpMyAdmin's storage engine plugins!) @@ -361,12 +383,14 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine */ function getInnodbFileFormat() { - return PMA_DBI_fetch_value("SHOW GLOBAL VARIABLES LIKE 'innodb_file_format';", 0, 1); + return PMA_DBI_fetch_value( + "SHOW GLOBAL VARIABLES LIKE 'innodb_file_format';", 0, 1 + ); } /** - * * Verifies if this server supports the innodb_file_per_table feature + * * (works only for the InnoDB plugin) * http://www.innodb.com/products/innodb_plugin * (do not confuse this with phpMyAdmin's storage engine plugins!) @@ -375,7 +399,9 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine */ function supportsFilePerTable() { - $innodb_file_per_table = PMA_DBI_fetch_value("SHOW GLOBAL VARIABLES LIKE 'innodb_file_per_table';", 0, 1); + $innodb_file_per_table = PMA_DBI_fetch_value( + "SHOW GLOBAL VARIABLES LIKE 'innodb_file_per_table';", 0, 1 + ); if ($innodb_file_per_table == 'ON') { return true; } else { diff --git a/pmd_pdf.php b/pmd_pdf.php index fc9798715b..69ca11a3c5 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -95,9 +95,9 @@ $header->disableMenu();
display(); - } +if (! empty($message)) { + $message->display(); +} ?>