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

Merge pull request #389 from xmujay/2332_xmujay3

Browse Source 
make function starting with "PMA"
This commit is contained in:
Michal Čihař 2013-05-15 23:21:37 -07:00
commit 2c8242d4eb
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server_status_variables.php
View File

@ -44,9 +44,9 @@ $scripts->addFile('server_status_sorter.js');
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
$response->addHTML(getFilterHtml($ServerStatusData));
$response->addHTML(getLinkSuggestionsHtml($ServerStatusData));
$response->addHTML(getVariablesTableHtml($ServerStatusData));
$response->addHTML(PMA_getFilterHtml($ServerStatusData));
$response->addHTML(PMA_getLinkSuggestionsHtml($ServerStatusData));
$response->addHTML(PMA_getVariablesTableHtml($ServerStatusData));
$response->addHTML('</div>');
exit;
@ -58,7 +58,7 @@ exit;
*
* @return string
*/
function getFilterHtml($ServerStatusData)
function PMA_getFilterHtml($ServerStatusData)
{
$filterAlert = '';
if (! empty($_REQUEST['filterAlert'])) {
@ -127,7 +127,7 @@ function getFilterHtml($ServerStatusData)
*
* @return string
*/
function getLinkSuggestionsHtml($ServerStatusData)
function PMA_getLinkSuggestionsHtml($ServerStatusData)
{
$retval = '<div id="linkSuggestions" class="defaultLinks" style="display:none">';
$retval .= '<p class="notice">' . __('Related links:');
@ -161,10 +161,10 @@ function getLinkSuggestionsHtml($ServerStatusData)
*
* @return string
*/
function getVariablesTableHtml($ServerStatusData)
function PMA_getVariablesTableHtml($ServerStatusData)
{
$retval = '';
$strShowStatus = getStatusVariablesDescriptions();
$strShowStatus = PMA_getStatusVariablesDescriptions();
/**
* define some alerts
*/
@ -320,7 +320,7 @@ function getVariablesTableHtml($ServerStatusData)
*
* @return array
*/
function getStatusVariablesDescriptions()
function PMA_getStatusVariablesDescriptions()
{
/**
* Messages are built using the message name

8
server_variables.php
View File

@ -98,7 +98,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
);
$response->addJSON(
'variable',
formatVariable($_REQUEST['varName'], $varValue[1])
PMA_formatVariable($_REQUEST['varName'], $varValue[1])
);
} else {
$response->isSuccess(false);
@ -198,7 +198,7 @@ foreach ($serverVars as $name => $value) {
}
$output .= '</div>'
. '<div class="var-value value' . (PMA_isSuperuser() ? ' editable' : '') . '">&nbsp;'
. formatVariable($name, $value)
. PMA_formatVariable($name, $value)
. '</div>'
. '<div style="clear:both"></div>'
. '</div>';
@ -207,7 +207,7 @@ foreach ($serverVars as $name => $value) {
$output .= '<div class="var-row' . ($odd_row ? ' odd' : ' even') . '">'
. '<div class="var-name session">(' . __('Session value') . ')</div>'
. '<div class="var-value value">&nbsp;'
. formatVariable($name, $serverVarsSession[$name]) . '</div>'
. PMA_formatVariable($name, $serverVarsSession[$name]) . '</div>'
. '<div style="clear:both"></div>'
. '</div>';
}
@ -226,7 +226,7 @@ $response->addHtml($output);
*
* @return formatted string
*/
function formatVariable($name, $value)
function PMA_formatVariable($name, $value)
{
global $VARIABLE_DOC_LINKS;