-
-
+ getImage('play.png'); ?>
+ getImage('b_help.png'); ?>
@@ -931,6 +945,7 @@ function printQueryStatistics()
{
global $server_status, $used_queries, $url_query, $PMA_PHP_SELF;
+ $common_functions = PMA_CommonFunctions::getInstance();
$hour_factor = 3600 / $server_status['Uptime'];
$total_queries = array_sum($used_queries);
@@ -939,23 +954,23 @@ function printQueryStatistics()
formatNumber($total_queries, 0)) . ' ';
+ echo $common_functions->showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions');
?>
formatNumber($total_queries * $hour_factor, 0);
echo '
';
echo 'ø ' . __('per minute') . ': ';
- echo PMA_formatNumber($total_queries * 60 / $server_status['Uptime'], 0);
+ echo $common_functions->formatNumber($total_queries * 60 / $server_status['Uptime'], 0);
echo '
';
if ($total_queries / $server_status['Uptime'] >= 1) {
echo 'ø ' . __('per second') . ': ';
- echo PMA_formatNumber($total_queries / $server_status['Uptime'], 0);
+ echo $common_functions->formatNumber($total_queries / $server_status['Uptime'], 0);
}
?>
@@ -1008,11 +1023,11 @@ function printQueryStatistics()
?>
|
- |
+ formatNumber($value, 5, 0, true)); ?> |
|
+ htmlspecialchars($common_functions->formatNumber($value * $hour_factor, 4, 1, true)); ?>
% |
+ htmlspecialchars($common_functions->formatNumber($value * $perc_factor, 0, 2)); ?>%
formatByteDown(
+ $server_status['Bytes_received'] + $server_status['Bytes_sent'],
+ 3,
+ 1
+ )
+ )
);
?>
@@ -1061,8 +1084,8 @@ function printServerTraffic()
timespanFormat($server_status['Uptime']),
+ $common_functions->localisedDate($start_time)
) . "\n";
?>
@@ -1102,7 +1125,7 @@ function printServerTraffic()
- |
+ showHint(__('On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.')); ?> |
ø |
@@ -1111,22 +1134,34 @@ function printServerTraffic()
|
formatByteDown(
+ $server_status['Bytes_received'], 3, 1
+ )
); ?> |
formatByteDown(
+ $server_status['Bytes_received'] * $hour_factor, 3, 1
+ )
); ?> |
|
formatByteDown(
+ $server_status['Bytes_sent'], 3, 1
+ )
); ?> |
formatByteDown(
+ $server_status['Bytes_sent'] * $hour_factor, 3, 1
+ )
); ?> |
@@ -1134,14 +1169,14 @@ function printServerTraffic()
| formatByteDown(
$server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1
)
); ?> |
formatByteDown(
($server_status['Bytes_received'] + $server_status['Bytes_sent'])
* $hour_factor, 3, 1
)
@@ -1162,21 +1197,21 @@ function printServerTraffic()
|
|
|
+ $common_functions->formatNumber($server_status['Max_used_connections'], 0); ?>
--- |
--- |
|
|
+ $common_functions->formatNumber($server_status['Aborted_connects'], 4, 1, true); ?>
formatNumber(
$server_status['Aborted_connects'] * $hour_factor, 4, 2, true
); ?> |
0
- ? PMA_formatNumber(
+ ? $common_functions->formatNumber(
$server_status['Aborted_connects'] * 100 / $server_status['Connections'],
0, 2, true
) . '%'
@@ -1185,14 +1220,14 @@ function printServerTraffic()
|
|
|
+ $common_functions->formatNumber($server_status['Aborted_clients'], 4, 1, true); ?>
formatNumber(
$server_status['Aborted_clients'] * $hour_factor, 4, 2, true
); ?> |
0
- ? PMA_formatNumber(
+ ? $common_functions->formatNumber(
$server_status['Aborted_clients'] * 100 / $server_status['Connections'],
0, 2, true
) . '%'
@@ -1201,13 +1236,13 @@ function printServerTraffic()
|
|
|
+ $common_functions->formatNumber($server_status['Connections'], 4, 0); ?>
formatNumber(
$server_status['Connections'] * $hour_factor, 4, 2
); ?> |
% |
+ $common_functions->formatNumber(100, 0, 2); ?>%
@@ -1313,6 +1348,9 @@ function printServerTraffic()
function printVariablesTable()
{
global $server_status, $server_variables, $allocationMap, $links;
+
+ $common_functions = PMA_CommonFunctions::getInstance();
+
/**
* Messages are built using the message name
*/
@@ -1515,7 +1553,7 @@ function printVariablesTable()
echo htmlspecialchars(str_replace('_', ' ', $name));
/* Fields containing % are calculated, they can not be described in MySQL documentation */
if (strpos($name, '%') === false) {
- echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name);
+ echo $common_functions->showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name);
}
?>
@@ -1528,15 +1566,17 @@ function printVariablesTable()
}
}
if ('%' === substr($name, -1, 1)) {
- echo htmlspecialchars(PMA_formatNumber($value, 0, 2)) . ' %';
+ echo htmlspecialchars($common_functions->formatNumber($value, 0, 2)) . ' %';
} elseif (strpos($name, 'Uptime') !== false) {
- echo htmlspecialchars(PMA_timespanFormat($value));
+ echo htmlspecialchars(
+ $common_functions->timespanFormat($value)
+ );
} elseif (is_numeric($value) && $value == (int) $value && $value > 1000) {
- echo htmlspecialchars(PMA_formatNumber($value, 3, 1));
+ echo htmlspecialchars($common_functions->formatNumber($value, 3, 1));
} elseif (is_numeric($value) && $value == (int) $value) {
- echo htmlspecialchars(PMA_formatNumber($value, 3, 0));
+ echo htmlspecialchars($common_functions->formatNumber($value, 3, 0));
} elseif (is_numeric($value)) {
- echo htmlspecialchars(PMA_formatNumber($value, 3, 1));
+ echo htmlspecialchars($common_functions->formatNumber($value, 3, 1));
} else {
echo htmlspecialchars($value);
}
@@ -1554,7 +1594,7 @@ function printVariablesTable()
if (isset($links[$name])) {
foreach ($links[$name] as $link_name => $link_url) {
if ('doc' == $link_name) {
- echo PMA_showMySQLDocu($link_url, $link_url);
+ echo $common_functions->showMySQLDocu($link_url, $link_url);
} else {
echo '
' . $link_name . '' .
"\n";
@@ -1576,38 +1616,41 @@ function printVariablesTable()
function printMonitor()
{
global $server_status, $server_db_isLocal;
+
+ $common_functions = PMA_CommonFunctions::getInstance();
+
?>