gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. using a better function name 2. fix code style issue 3. add doc for functions

Browse Source
This commit is contained in:
xmujay 2013-06-17 21:43:13 +08:00
parent 8c000b4fee
commit e3a824cc7b
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/server_status_monitor.lib.php
View File

@ -210,7 +210,8 @@ function PMA_getHtmlForAddChartDialog()
$retval .= '<input type="radio" name="chartType" value="preset" id="chartPreset" />';
$retval .= '<label for="chartPreset">' . __('Preset chart') . '</label>';
$retval .= '<select name="presetCharts"></select><br/>';
$retval .= '<input type="radio" name="chartType" value="variable" id="chartStatusVar" checked="checked" />';
$retval .= '<input type="radio" name="chartType" value="variable" '
. 'id="chartStatusVar" checked="checked" />';
$retval .= '<label for="chartStatusVar">';
$retval .= __('Status variable(s)');
$retval .= '</label><br/>';
@ -407,7 +408,7 @@ function PMA_getHtmlForClientSideDataAndLinks($ServerStatusData)
*
* @return Array
*/
function PMA_getJSonForChartingData()
function PMA_getJsonForChartingData()
{
$ret = json_decode($_REQUEST['requiredData'], true);
$statusVars = array();
@ -535,9 +536,12 @@ function PMA_getJSonForChartingData()
/**
* Returns JSon for log data with type: slow
*
* @param int $start Unix Time: Start time for query
* @param int $end Unix Time: End time for query
*
* @return Array
*/
function PMA_getJSonForLogDataTypeSlow($start, $end)
function PMA_getJsonForLogDataTypeSlow($start, $end)
{
$q = 'SELECT start_time, user_host, ';
$q .= 'Sec_to_Time(Sum(Time_to_Sec(query_time))) as query_time, ';
@ -595,9 +599,12 @@ function PMA_getJSonForLogDataTypeSlow($start, $end)
/**
* Returns JSon for log data with type: general
*
* @param int $start Unix Time: Start time for query
* @param int $end Unix Time: End time for query
*
* @return Array
*/
function PMA_getJSonForLogDataTypeGeneral($start, $end)
function PMA_getJsonForLogDataTypeGeneral($start, $end)
{
$limitTypes = '';
if (isset($_REQUEST['limitTypes']) && $_REQUEST['limitTypes']) {
@ -701,7 +708,7 @@ function PMA_getJSonForLogDataTypeGeneral($start, $end)
*
* @return Array
*/
function PMA_getJSonForLoggingVars()
function PMA_getJsonForLoggingVars()
{
if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) {
$value = PMA_Util::sqlAddSlashes($_REQUEST['varValue']);
@ -731,7 +738,7 @@ function PMA_getJSonForLoggingVars()
*
* @return Array
*/
function PMA_getJSonForQueryAnalyzer()
function PMA_getJsonForQueryAnalyzer()
{
$return = array();

10
server_status_monitor.php
View File

@ -29,7 +29,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (isset($_REQUEST['chart_data'])) {
switch($_REQUEST['type']) {
case 'chartgrid': // Data for the monitor
$ret = PMA_getJSonForChartingData();
$ret = PMA_getJsonForChartingData();
PMA_Response::getInstance()->addJSON('message', $ret);
exit;
}
@ -45,26 +45,26 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$end = intval($_REQUEST['time_end']);
if ($_REQUEST['type'] == 'slow') {
$return = PMA_getJSonForLogDataTypeSlow($start, $end);
$return = PMA_getJsonForLogDataTypeSlow($start, $end);
PMA_Response::getInstance()->addJSON('message', $return);
exit;
}
if ($_REQUEST['type'] == 'general') {
$return = PMA_getJSonForLogDataTypeGeneral($start, $end);
$return = PMA_getJsonForLogDataTypeGeneral($start, $end);
PMA_Response::getInstance()->addJSON('message', $return);
exit;
}
}
if (isset($_REQUEST['logging_vars'])) {
$loggingVars = PMA_getJSonForLoggingVars();
$loggingVars = PMA_getJsonForLoggingVars();
PMA_Response::getInstance()->addJSON('message', $loggingVars);
exit;
}
if (isset($_REQUEST['query_analyzer'])) {
$return = PMA_getJSonForQueryAnalyzer();
$return = PMA_getJsonForQueryAnalyzer();
PMA_Response::getInstance()->addJSON('message', $return);
exit;
}