diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/controllers/server/ServerVariablesController.php index 60dbd7a110..573bfa671a 100644 --- a/libraries/controllers/server/ServerVariablesController.php +++ b/libraries/controllers/server/ServerVariablesController.php @@ -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' ) { diff --git a/libraries/controllers/table/TableChartController.php b/libraries/controllers/table/TableChartController.php index dca9b46990..4883b7d580 100644 --- a/libraries/controllers/table/TableChartController.php +++ b/libraries/controllers/table/TableChartController.php @@ -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']) ) { diff --git a/server_status_monitor.php b/server_status_monitor.php index f6b93c4bac..ec676d17c5 100644 --- a/server_status_monitor.php +++ b/server_status_monitor.php @@ -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'); diff --git a/tbl_operations.php b/tbl_operations.php index 1ce6ec4c19..ebd327d998 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -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)) {