Refactor server variables page

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-11-17 18:59:17 +11:00
parent ad0ac35ff8
commit fd098ff80e
3 changed files with 2562 additions and 2549 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,97 +1,32 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Server variables
* Handles server variables page.
*
* @package PhpMyAdmin
*/
use PMA\libraries\Message;
use PMA\libraries\Util;
namespace PMA;
use PMA\libraries\controllers\ServerVariablesController;
use PMA\libraries\Response;
require_once 'libraries/common.inc.php';
require_once 'libraries/server_variables.lib.php';
$response = PMA\libraries\Response::getInstance();
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('server_variables.js');
$container = libraries\di\Container::getDefaultContainer();
$container->factory(
'PMA\libraries\controllers\ServerVariablesController'
);
$container->alias(
'ServerVariablesController',
'PMA\libraries\controllers\ServerVariablesController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
/**
* Does the common work
*/
require 'libraries/server_common.inc.php';
/**
* Array of documentation links
*/
$variable_doc_links = PMA_getArrayForDocumentLinks();
/**
* Ajax request
*/
if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (isset($_REQUEST['type'])) {
if ($_REQUEST['type'] === 'getval') {
PMA_getAjaxReturnForGetVal($variable_doc_links);
} else if ($_REQUEST['type'] === 'setval') {
PMA_getAjaxReturnForSetVal($variable_doc_links);
}
exit;
}
}
/**
* Displays the sub-page heading
*/
$doc_link = PMA\libraries\Util::showMySQLDocu('server_system_variables');
$response->addHtml(PMA_getHtmlForSubPageHeader('variables', $doc_link));
/**
* Sends the queries and buffers the results
*/
$serverVarsResult = $GLOBALS['dbi']->tryQuery('SHOW SESSION VARIABLES;');
if ($serverVarsResult !== false) {
$serverVarsSession = array();
while ($arr = $GLOBALS['dbi']->fetchRow($serverVarsResult)) {
$serverVarsSession[$arr[0]] = $arr[1];
}
$GLOBALS['dbi']->freeResult($serverVarsResult);
$serverVars = $GLOBALS['dbi']->fetchResult('SHOW GLOBAL VARIABLES;', 0, 1);
/**
* Link templates
*/
$response->addHtml(PMA_getHtmlForLinkTemplates());
/**
* Displays the page
*/
$response->addHtml(
PMA_getHtmlForServerVariables(
$variable_doc_links, $serverVars, $serverVarsSession
)
);
} else {
/**
* Display the error message
*/
$response->addHTML(
Message::error(
sprintf(
__('Not enough privilege to view server variables and settings. %s'),
Util::showMySQLDocu(
'server-system-variables',
false,
'sysvar_show_compatibility_56'
)
)
)->getDisplay()
);
}
exit;
/** @var ServerVariablesController $controller */
$controller = $container->get(
'ServerVariablesController', array()
);
$controller->indexAction();