diff --git a/js/messages.php b/js/messages.php index db0e670504..a4efcb4661 100644 --- a/js/messages.php +++ b/js/messages.php @@ -206,6 +206,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 bc36225fe9..e2eec44512 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -516,8 +516,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 = {}; diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 776a81f1a3..aefe8e6544 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -362,7 +362,8 @@ class PMA_Theme * * @return string CSS code. */ - function getCssIEClearFilter() { + function getCssIEClearFilter() + { return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 ? 'filter: none' : ''; diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 97d9f0d917..62ad8378c0 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -328,7 +328,8 @@ class ConfigFile * @param string $path * @return string */ - public function getCanonicalPath($path) { + public function getCanonicalPath($path) + { return preg_replace('#^Servers/([\d]+)/#', 'Servers/1/', $path); } diff --git a/libraries/dbi/drizzle-wrappers.lib.php b/libraries/dbi/drizzle-wrappers.lib.php index 86fcf229b4..b47f69548c 100644 --- a/libraries/dbi/drizzle-wrappers.lib.php +++ b/libraries/dbi/drizzle-wrappers.lib.php @@ -12,7 +12,8 @@ */ // TODO: drizzle module segfaults while freeing resources, often. This allows at least for some development -function _drizzle_shutdown_flush() { +function _drizzle_shutdown_flush() +{ flush(); } register_shutdown_function('_drizzle_shutdown_flush'); @@ -130,7 +131,7 @@ class PMA_Drizzle extends Drizzle /** * Creates a new connection using unix domain socket - * + * * @param $uds * @param $user * @param $password @@ -211,7 +212,7 @@ class PMA_DrizzleCon /** * Pass calls of undefined methods to DrizzleCon object - * + * * @param $method * @param $args * @return mixed diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 724e94f778..457bc291de 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -229,7 +229,8 @@ function PMA_DBI_free_result($result) * * @return bool false */ -function PMA_DBI_more_results() { +function PMA_DBI_more_results() +{ // N.B.: PHP's 'mysql' extension does not support // multi_queries so this function will always // return false. Use the 'mysqli' extension, if @@ -242,7 +243,8 @@ function PMA_DBI_more_results() { * * @return bool false */ -function PMA_DBI_next_result() { +function PMA_DBI_next_result() +{ // N.B.: PHP's 'mysql' extension does not support // multi_queries so this function will always // return false. Use the 'mysqli' extension, if diff --git a/libraries/export/csv.php b/libraries/export/csv.php index bb4a550164..deb8538438 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -42,7 +42,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { return true; } @@ -53,7 +54,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { global $what; global $csv_terminated; global $csv_separator; @@ -101,7 +103,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBHeader($db) { + function PMA_exportDBHeader($db) + { return true; } @@ -113,7 +116,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } @@ -125,7 +129,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } @@ -141,7 +146,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { + function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) + { global $what; global $csv_terminated; global $csv_separator; diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index abd492792f..91c04cfb6b 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -41,7 +41,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { return PMA_exportOutputHandler(''); } @@ -52,7 +53,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { global $charset_of_file; return PMA_exportOutputHandler('' . __('Database') . ' ' . htmlspecialchars($db) . ''); } @@ -86,7 +89,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } @@ -98,7 +102,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 752f196a7c..99faa998f6 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -31,7 +31,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { return true; } @@ -42,7 +43,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { return true; } @@ -54,7 +56,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBHeader($db) { + function PMA_exportDBHeader($db) + { return true; } @@ -66,7 +69,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } @@ -78,7 +82,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } @@ -94,7 +99,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { + function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) + { $columns = PMA_DBI_get_columns($db, $table); $columns = array_values($columns); $row_cnt = count($columns); diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 1ee1fb7045..e9728cd8b7 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -40,7 +40,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { $GLOBALS['ods_buffer'] .= '' . '' . ''; @@ -57,7 +58,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { $GLOBALS['ods_buffer'] .= '' . '' . '' @@ -107,7 +109,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBHeader($db) { + function PMA_exportDBHeader($db) + { return true; } @@ -119,7 +122,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } @@ -131,7 +135,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } @@ -147,7 +152,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { + function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) + { global $what; // Gets the data from the database diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index f06ae5817a..21906d8eda 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -39,7 +39,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { return true; } @@ -50,7 +51,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { return true; } @@ -62,7 +64,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBHeader($db) { + function PMA_exportDBHeader($db) + { return PMA_exportOutputHandler('===' . __('Database') . ' ' . $db . "\n\n"); } @@ -74,7 +77,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } @@ -86,7 +90,8 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } diff --git a/libraries/import/shp.php b/libraries/import/shp.php index e935ca271f..bf9d1e09d4 100644 --- a/libraries/import/shp.php +++ b/libraries/import/shp.php @@ -41,7 +41,8 @@ if (isset($plugin_list)) { // Returns specified number of bytes from the buffer. // Buffer automatically fetches next chunk of data when the buffer falls short. // Sets $eof when $GLOBALS['finished'] is set and the buffer falls short. - function readFromBuffer($length){ + function readFromBuffer($length) + { global $buffer, $eof; if (strlen($buffer) < $length) { diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 802481679b..4183cae821 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -149,7 +149,8 @@ function PMA_sanitize($message, $escape = false, $safe = false) * @return string the sanitized filename * */ -function PMA_sanitize_filename($filename) { +function PMA_sanitize_filename($filename) +{ $filename = preg_replace('/[^A-Za-z0-9_.-]/', '_', $filename); return $filename; } diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php index c6408ff631..3566ffea97 100644 --- a/libraries/sysinfo.lib.php +++ b/libraries/sysinfo.lib.php @@ -32,13 +32,15 @@ class WINNT public $os = 'WINNT'; - public function __construct() { + public function __construct() + { // initialize the wmi object $objLocator = new COM('WbemScripting.SWbemLocator'); $this->_wmi = $objLocator->ConnectServer(); } - function loadavg() { + function loadavg() + { $loadavg = ""; $sum = 0; $buffer = $this->_getWMI('Win32_Processor', array('LoadPercentage')); @@ -52,7 +54,8 @@ class WINNT return array('loadavg' => $sum / count($buffer)); } - private function _getWMI($strClass, $strValue = array()) { + private function _getWMI($strClass, $strValue = array()) + { $arrData = array(); $value = ""; @@ -81,7 +84,8 @@ class WINNT } - function memory() { + function memory() + { $buffer = $this->_getWMI("Win32_OperatingSystem", array('TotalVisibleMemorySize', 'FreePhysicalMemory')); $mem = Array(); $mem['MemTotal'] = $buffer[0]['TotalVisibleMemorySize']; @@ -108,13 +112,15 @@ class Linux { public $os = 'Linux'; - function loadavg() { + function loadavg() + { $buf = file_get_contents('/proc/stat'); $nums=preg_split("/\s+/", substr($buf, 0, strpos($buf, "\n"))); return Array('busy' => $nums[1]+$nums[2]+$nums[3], 'idle' => intval($nums[4])); } - function memory() { + function memory() + { preg_match_all('/^(MemTotal|MemFree|Cached|Buffers|SwapCached|SwapTotal|SwapFree):\s+(.*)\s*kB/im', file_get_contents('/proc/meminfo'), $matches); $mem = array_combine( $matches[1], $matches[2] ); diff --git a/libraries/transformations/text_plain__append.inc.php b/libraries/transformations/text_plain__append.inc.php index 5ca0d3c7e0..b8297a557c 100644 --- a/libraries/transformations/text_plain__append.inc.php +++ b/libraries/transformations/text_plain__append.inc.php @@ -5,14 +5,15 @@ * Has one option: the text to be appended (default '') */ -function PMA_transformation_text_plain__append_info() { +function PMA_transformation_text_plain__append_info() +{ return array( 'info' => __('Appends text to a string. The only option is the text to be appended (enclosed in single quotes, default empty string).'), ); } -function PMA_transformation_text_plain__append($buffer, $options = array(), $meta = '') { - +function PMA_transformation_text_plain__append($buffer, $options = array(), $meta = '') +{ if (! isset($options[0]) || $options[0] == '') { $options[0] = ''; } 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 79f3b2a169..d57f29f026 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1652,14 +1652,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 09822b5e5d..3f3675890d 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 . "'"; } @@ -467,7 +465,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 { @@ -1120,35 +1118,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) + ); ?> @@ -1175,36 +1179,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 + ); ?> % @@ -1214,7 +1223,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', '?'); @@ -1579,7 +1588,7 @@ function printMonitor() - + @@ -1729,7 +1738,7 @@ function printMonitor()

- +