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

Simplify checks for Ajax request

Browse Source 
Use isAjax method instead of doing the check separately.

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-12-07 18:23:52 +01:00
parent 308c9d7951
commit 616d216fd1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/controllers/server/ServerVariablesController.php
View File

@ -11,6 +11,7 @@ namespace PMA\libraries\controllers\server;
use PMA\libraries\controllers\Controller;
use PMA\libraries\Message;
use PMA\libraries\Response;
use PMA\libraries\Template;
use PMA\libraries\Util;
use PMA\libraries\URL;
@ -44,7 +45,8 @@ class ServerVariablesController extends Controller
*/
public function indexAction()
{
if (! empty($_REQUEST['ajax_request'])
$request = Request::getInstance();
if ($request->isAjax()
&& isset($_REQUEST['type'])
&& $_REQUEST['type'] === 'getval'
) {
@ -52,7 +54,7 @@ class ServerVariablesController extends Controller
return;
}
if (! empty($_REQUEST['ajax_request'])
if ($request->isAjax()
&& isset($_REQUEST['type'])
&& $_REQUEST['type'] === 'setval'
) {

4
libraries/controllers/table/TableChartController.php
View File

@ -11,6 +11,7 @@ namespace PMA\libraries\controllers\table;
use PMA\libraries\controllers\TableController;
use PMA\libraries\Message;
use PMA\libraries\Response;
use PMA\libraries\Template;
use PMA\libraries\Util;
@ -61,7 +62,8 @@ class TableChartController extends TableController
*/
public function indexAction()
{
if (isset($_REQUEST['ajax_request'])
$request = Request::getInstance();
if ($request->isAjax()
&& isset($_REQUEST['pos'])
&& isset($_REQUEST['session_max_rows'])
) {

2
server_status_monitor.php
View File

@ -20,7 +20,7 @@ $response = Response::getInstance();
/**
* Ajax request
*/
if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if ($response->isAjax()) {
// Send with correct charset
header('Content-Type: text/html; charset=UTF-8');

8
tbl_operations.php
View File

@ -201,9 +201,7 @@ if (isset($result) && empty($message_to_show)) {
: PMA\libraries\Message::error();
}
if (isset($GLOBALS['ajax_request'])
&& $GLOBALS['ajax_request'] == true
) {
if ($response->isAjax()) {
$response->setRequestStatus($_message->isSuccess());
$response->addJSON('message', $_message);
if (!empty($sql_query)) {
@ -223,9 +221,7 @@ if (isset($result) && empty($message_to_show)) {
$_message = new PMA\libraries\Message;
$_message->addMessagesString($warning_messages);
$_message->isError(true);
if (isset($GLOBALS['ajax_request'])
&& $GLOBALS['ajax_request'] == true
) {
if ($response->isAjax()) {
$response->setRequestStatus(false);
$response->addJSON('message', $_message);
if (!empty($sql_query)) {