Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--server_status.php20
-rw-r--r--server_status_queries.php8
2 files changed, 14 insertions, 14 deletions
diff --git a/server_status.php b/server_status.php
index 328ff05bfa..46b039f9d5 100644
--- a/server_status.php
+++ b/server_status.php
@@ -46,7 +46,7 @@ if (! empty($_REQUEST['kill'])) {
$response = PMA_Response::getInstance();
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(getServerTrafficHtml($ServerStatusData));
+$response->addHTML(PMA_getServerTrafficHtml($ServerStatusData));
$response->addHTML('</div>');
exit;
@@ -58,19 +58,19 @@ exit;
*
* @return string
*/
-function getServerTrafficHtml($ServerStatusData)
+function PMA_getServerTrafficHtml($ServerStatusData)
{
//display the server state General Information
- $retval = getServerStateGeneralInfoHtml($ServerStatusData);
+ $retval = PMA_getServerStateGeneralInfoHtml($ServerStatusData);
//display the server state traffic
- $retval .= getServerStateTrafficHtml($ServerStatusData);
+ $retval .= PMA_getServerStateTrafficHtml($ServerStatusData);
//display the server state connection information
- $retval .= getServerStateConnectionsHtml($ServerStatusData);
+ $retval .= PMA_getServerStateConnectionsHtml($ServerStatusData);
//display the Table Process List information
- $retval .= getTableProcesslistHtml($ServerStatusData);
+ $retval .= PMA_getTableProcesslistHtml($ServerStatusData);
return $retval;
}
@@ -82,7 +82,7 @@ function getServerTrafficHtml($ServerStatusData)
*
* @return string
*/
-function getServerStateGeneralInfoHtml($ServerStatusData)
+function PMA_getServerStateGeneralInfoHtml($ServerStatusData)
{
$start_time = PMA_DBI_fetchValue(
'SELECT UNIX_TIMESTAMP() - ' . $ServerStatusData->status['Uptime']
@@ -161,7 +161,7 @@ function getServerStateGeneralInfoHtml($ServerStatusData)
*
* @return string
*/
-function getServerStateTrafficHtml($ServerStatusData)
+function PMA_getServerStateTrafficHtml($ServerStatusData)
{
$hour_factor = 3600 / $ServerStatusData->status['Uptime'];
$retval = '<table id="serverstatustraffic" class="data noclick">';
@@ -250,7 +250,7 @@ function getServerStateTrafficHtml($ServerStatusData)
*
* @return string
*/
-function getServerStateConnectionsHtml($ServerStatusData)
+function PMA_getServerStateConnectionsHtml($ServerStatusData)
{
$hour_factor = 3600 / $ServerStatusData->status['Uptime'];
$retval = '<table id="serverstatusconnections" class="data noclick">';
@@ -349,7 +349,7 @@ function getServerStateConnectionsHtml($ServerStatusData)
*
* @return string
*/
-function getTableProcesslistHtml($ServerStatusData)
+function PMA_getTableProcesslistHtml($ServerStatusData)
{
$url_params = array();
diff --git a/server_status_queries.php b/server_status_queries.php
index 3df0725b76..4bacf65ce4 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -42,7 +42,7 @@ $scripts->addFile('server_status_sorter.js');
// Add the html content to the response
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(getQueryStatisticsHtml($ServerStatusData));
+$response->addHTML(PMA_getQueryStatisticsHtml($ServerStatusData));
$response->addHTML('</div>');
exit;
@@ -53,7 +53,7 @@ exit;
*
* @return string
*/
-function getQueryStatisticsHtml($ServerStatusData)
+function PMA_getQueryStatisticsHtml($ServerStatusData)
{
$retval = '';
@@ -89,7 +89,7 @@ function getQueryStatisticsHtml($ServerStatusData)
$retval .= '</span>';
$retval .= '</h3>';
- $retval .= getServerStatusQueriesDetailsHtml($ServerStatusData);
+ $retval .= PMA_getServerStatusQueriesDetailsHtml($ServerStatusData);
return $retval;
}
@@ -101,7 +101,7 @@ function getQueryStatisticsHtml($ServerStatusData)
*
* @return string
*/
-function getServerStatusQueriesDetailsHtml($ServerStatusData)
+function PMA_getServerStatusQueriesDetailsHtml($ServerStatusData)
{
$used_queries = $ServerStatusData->used_queries;
$total_queries = array_sum($used_queries);