From 3af218eb762eaa3a2e0515b51f358a0893962bd5 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 13 Apr 2012 19:56:47 +0530 Subject: [PATCH 1/3] Make some messages translatable --- js/messages.php | 2 ++ js/server_status_monitor.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 7b10563258..4eba015c42 100644 --- a/js/messages.php +++ b/js/messages.php @@ -210,6 +210,8 @@ $js_messages['strAffectedRows'] = __('Affected rows:'); $js_messages['strFailedParsingConfig'] = __('Failed parsing config file. It doesn\'t seem to be valid JSON code.'); $js_messages['strFailedBuildingGrid'] = __('Failed building chart grid with imported config. Resetting to default config...'); $js_messages['strImport'] = __('Import'); +$js_messages['strImportDialogTitle'] = __('Import monitor configuration'); +$js_messages['strImportDialogMessage'] = __('Please select the file you want to import'); $js_messages['strAnalyzeQuery'] = __('Analyse Query'); diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 84e82c993e..87040f2005 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -507,8 +507,8 @@ $(function() { }); $('a[href="#importMonitorConfig"]').click(function() { - $('div#emptyDialog').attr('title', 'Import monitor configuration'); - $('div#emptyDialog').html('Please select the file you want to import:
' + + $('div#emptyDialog').attr('title', PMA_messages['strImportDialogTitle']); + $('div#emptyDialog').html(PMA_messages['strImportDialogMessage'] + ':
' + '
'); var dlgBtns = {}; From fa9aaea8c0f409cfd6f131de6b808de1a4851008 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 13 Apr 2012 20:57:17 +0530 Subject: [PATCH 2/3] Coding style improvements --- server_collations.php | 3 +- server_databases.php | 15 ++++--- server_engines.php | 18 ++++---- server_export.php | 7 +++- server_privileges.php | 11 ++--- server_status.php | 93 +++++++++++++++++++++++------------------- server_synchronize.php | 39 ++++++++++-------- server_variables.php | 88 +++++++++++++++++++++++---------------- 8 files changed, 157 insertions(+), 117 deletions(-) diff --git a/server_collations.php b/server_collations.php index 5ce7643d74..076b79ca43 100644 --- a/server_collations.php +++ b/server_collations.php @@ -63,7 +63,8 @@ foreach ($mysql_charsets as $current_charset) { . (empty($mysql_charsets_descriptions[$current_charset]) ? '' : ' (' . htmlspecialchars( - $mysql_charsets_descriptions[$current_charset]) . ')' . "\n") + $mysql_charsets_descriptions[$current_charset] + ) . ')' . "\n") . ' ' . "\n" . '' . "\n"; $odd_row = true; diff --git a/server_databases.php b/server_databases.php index 57ae0edfc0..7ad910fcfb 100644 --- a/server_databases.php +++ b/server_databases.php @@ -11,7 +11,7 @@ require_once 'libraries/common.inc.php'; require 'libraries/server_common.inc.php'; -if (!PMA_DRIZZLE) { +if (! PMA_DRIZZLE) { include_once 'libraries/replication.inc.php'; } else { $replication_types = array(); @@ -57,7 +57,8 @@ if (empty($_REQUEST['sort_by'])) { } if (isset($_REQUEST['sort_order']) - && strtolower($_REQUEST['sort_order']) == 'desc') { + && strtolower($_REQUEST['sort_order']) == 'desc' +) { $sort_order = 'desc'; } else { $sort_order = 'asc'; @@ -78,7 +79,8 @@ if (isset($_REQUEST['drop_selected_dbs_x'])) { } if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type'])) - && ($is_superuser || $cfg['AllowUserDropDatabase'])) { + && ($is_superuser || $cfg['AllowUserDropDatabase']) +) { if (! isset($_REQUEST['selected_dbs']) && ! isset($_REQUEST['query_type'])) { $message = PMA_Message::error(__('No databases selected.')); } else { @@ -131,8 +133,9 @@ if ($cfg['ShowCreateDb']) { * Gets the databases list */ if ($server > 0) { - $databases = PMA_DBI_get_databases_full(null, $dbstats, null, $sort_by, - $sort_order, $pos, true); + $databases = PMA_DBI_get_databases_full( + null, $dbstats, null, $sort_by, $sort_order, $pos, true + ); $databases_count = count($GLOBALS['pma']->databases); } else { $databases_count = 0; @@ -203,7 +206,7 @@ if ($databases_count > 0) { echo ' '. $name .'' . "\n"; } - if ($is_superuser && !PMA_DRIZZLE) { + if ($is_superuser && ! PMA_DRIZZLE) { echo ' ' . ($cfg['PropertiesIconic'] ? '' : __('Action')) . "\n" . ' ' . "\n"; } diff --git a/server_engines.php b/server_engines.php index 19e484a0bb..1c26dc6942 100644 --- a/server_engines.php +++ b/server_engines.php @@ -27,7 +27,8 @@ require 'libraries/server_links.inc.php'; * Did the user request information about a certain storage engine? */ if (empty($_REQUEST['engine']) - || ! PMA_StorageEngine::isValid($_REQUEST['engine'])) { + || ! PMA_StorageEngine::isValid($_REQUEST['engine']) +) { /** * Displays the sub-page heading @@ -70,7 +71,7 @@ if (empty($_REQUEST['engine']) $odd_row = !$odd_row; } - unset($odd_row, $engine, $details); + unset($odd_row, $engine, $details); echo '' . "\n" . '' . "\n"; @@ -92,15 +93,15 @@ if (empty($_REQUEST['engine']) . ' ' . "\n" . '

' . "\n\n"; $infoPages = $engine_plugin->getInfoPages(); - if (!empty($infoPages) && is_array($infoPages)) { + if (! empty($infoPages) && is_array($infoPages)) { echo '

' . "\n" . ' [' . "\n"; if (empty($_REQUEST['page'])) { echo ' ' . __('Variables') . '' . "\n"; } else { echo ' ' - . __('Variables') . '' . "\n"; + . PMA_generate_common_url(array('engine' => $_REQUEST['engine'])) + . '">' . __('Variables') . '' . "\n"; } foreach ($infoPages as $current => $label) { echo ' |' . "\n"; @@ -109,7 +110,8 @@ if (empty($_REQUEST['engine']) } else { echo ' ' . htmlspecialchars($label) . '' . "\n"; } } @@ -118,10 +120,10 @@ if (empty($_REQUEST['engine']) . '

' . "\n\n"; } unset($infoPages, $page_output); - if (!empty($_REQUEST['page'])) { + if (! empty($_REQUEST['page'])) { $page_output = $engine_plugin->getPage($_REQUEST['page']); } - if (!empty($page_output)) { + if (! empty($page_output)) { echo $page_output; } else { echo '

' . $engine_plugin->getSupportInformationMessage() . "\n" diff --git a/server_export.php b/server_export.php index f915ac0c3e..fa14bbb058 100644 --- a/server_export.php +++ b/server_export.php @@ -43,13 +43,16 @@ foreach ($GLOBALS['pma']->databases as $current_db) { } else { $is_selected = ''; } - } elseif (!empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) { + } elseif (! empty($selectall) + || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|')) + ) { $is_selected = ' selected="selected"'; } else { $is_selected = ''; } $current_db = htmlspecialchars($current_db); - $multi_values .= ' ' . "\n"; + $multi_values .= ' ' . "\n"; } // end while $multi_values .= "\n"; $multi_values .= ''; diff --git a/server_privileges.php b/server_privileges.php index a96eef03c2..1f70b38059 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1649,14 +1649,15 @@ if (isset($_REQUEST['export']) || (isset($_REQUEST['submit_mult']) && $_REQUEST[ foreach ($_REQUEST['selected_usr'] as $export_user) { $export_username = substr($export_user, 0, strpos($export_user, '&')); $export_hostname = substr($export_user, strrpos($export_user, ';') + 1); - $response .= '# ' . - sprintf(__('Privileges for %s'), - '`' . htmlspecialchars($export_username) . '`@`' . htmlspecialchars($export_hostname) . '`') + $response .= '# ' + . sprintf( + __('Privileges for %s'), + '`' . htmlspecialchars($export_username) . '`@`' . htmlspecialchars($export_hostname) . '`' + ) . "\n\n"; $response .= PMA_getGrants($export_username, $export_hostname) . "\n"; } - } - else { + } else { // export privileges for a single user $title = __('User') . ' `' . htmlspecialchars($username) . '`@`' . htmlspecialchars($hostname) . '`'; $response .= PMA_getGrants($username, $hostname); diff --git a/server_status.php b/server_status.php index be4f8ac748..4c6c8ec589 100644 --- a/server_status.php +++ b/server_status.php @@ -40,8 +40,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); - // Query realtime chart - case 'queries': + case 'queries': // Query realtime chart if (PMA_DRIZZLE) { $sql = "SELECT concat('Com_', variable_name), variable_value FROM data_dictionary.GLOBAL_STATEMENTS @@ -73,8 +72,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); - // Traffic realtime chart - case 'traffic': + case 'traffic': // Traffic realtime chart $traffic = PMA_DBI_fetch_result( "SHOW GLOBAL STATUS WHERE Variable_name = 'Bytes_received' @@ -89,8 +87,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); - // Data for the monitor - case 'chartgrid': + case 'chartgrid': // Data for the monitor $ret = json_decode($_REQUEST['requiredData'], true); $statusVars = array(); $serverVars = array(); @@ -113,13 +110,13 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { * Also do some white list filtering on the names */ case 'servervar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) { + if (! preg_match('/[^a-zA-Z_]+/', $pName)) { $serverVars[] = $pName; } break; case 'statusvar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) { + if (! preg_match('/[^a-zA-Z_]+/', $pName)) { $statusVars[] = $pName; } break; @@ -144,9 +141,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { = $cpuload['idle']; $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy']; - } else + } else { $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg']; + } break; @@ -257,7 +255,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; } - if (!isset($return['sum'][$type])) { + if (! isset($return['sum'][$type])) { $return['sum'][$type] = 0; } $return['sum'][$type] += $row['#']; @@ -298,7 +296,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { preg_match('/^(\w+)\s/', $row['argument'], $match); $type = strtolower($match[1]); - if (!isset($return['sum'][$type])) { + if (! isset($return['sum'][$type])) { $return['sum'][$type] = 0; } $return['sum'][$type] += $row['#']; @@ -356,7 +354,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (isset($_REQUEST['logging_vars'])) { if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if (!is_numeric($value)) { + if (! is_numeric($value)) { $value="'" . $value . "'"; } @@ -464,7 +462,7 @@ if (isset($_REQUEST['flush'])) { /** * Kills a selected process */ -if (!empty($_REQUEST['kill'])) { +if (! empty($_REQUEST['kill'])) { if (PMA_DBI_try_query('KILL ' . $_REQUEST['kill'] . ';')) { $message = PMA_Message::success(__('Thread %s was successfully killed.')); } else { @@ -1117,35 +1115,41 @@ function printServerTraffic() + implode( + ' ', PMA_formatByteDown($server_status['Bytes_received'], 3, 1) + ); ?> + implode( + ' ', PMA_formatByteDown($server_status['Bytes_received'] * $hour_factor, 3, 1) + ); ?> + implode( + ' ', PMA_formatByteDown($server_status['Bytes_sent'], 3, 1) + ); ?> + implode( + ' ', PMA_formatByteDown($server_status['Bytes_sent'] * $hour_factor, 3, 1) + ); ?> @@ -1172,36 +1176,41 @@ function printServerTraffic() + PMA_formatNumber( + $server_status['Aborted_connects'] * $hour_factor, 4, 2, true + ); ?> 0 - ? PMA_formatNumber( + ? PMA_formatNumber( $server_status['Aborted_connects'] * 100 / $server_status['Connections'], - 0, 2, true) . '%' - : '--- '; ?> + 0, 2, true + ) . '%' + : '--- '; ?> + PMA_formatNumber( + $server_status['Aborted_clients'] * $hour_factor, 4, 2, true + ); ?> 0 - ? PMA_formatNumber( + ? PMA_formatNumber( $server_status['Aborted_clients'] * 100 / $server_status['Connections'], - 0, 2, true) . '%' - : '--- '; ?> + 0, 2, true + ) . '%' + : '--- '; ?> + PMA_formatNumber( + $server_status['Connections'] * $hour_factor, 4, 2 + ); ?> % @@ -1211,7 +1220,7 @@ function printServerTraffic() $url_params = array(); - $show_full_sql = !empty($_REQUEST['full']); + $show_full_sql = ! empty($_REQUEST['full']); if ($show_full_sql) { $url_params['full'] = 1; $full_text_link = 'server_status.php' . PMA_generate_common_url(array(), 'html', '?'); @@ -1576,7 +1585,7 @@ function printMonitor() - + @@ -1726,7 +1735,7 @@ function printMonitor()

- +