Ref #17769 - replace superglobals with serverrequest in server/ controllers (#17978)

ru-asdx · web-flow · commit 87bd27621e80 · 2023-01-10T21:22:04.000-03:00
* replace superglobals with serverrequest in server/ controllers
* replace $_POST['param'] ?? $_GET['value'] with $request-&gt;getParam

Signed-off-by: Evgeny Skorlov &lt;eugene@skorlov.name&gt;
diff --git a/libraries/classes/Controllers/Server/Databases/DestroyController.php b/libraries/classes/Controllers/Server/Databases/DestroyController.php
@@ -50,7 +50,7 @@ public function __invoke(ServerRequest $request): void
         $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null;
         $GLOBALS['reload'] = $GLOBALS['reload'] ?? null;
 
-        $selected_dbs = $_POST['selected_dbs'] ?? null;
+        $selected_dbs = $request->getParsedBodyParam('selected_dbs');
 
         if (
             ! $this->response->isAjax()
diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php
@@ -86,7 +86,7 @@ public function __invoke(ServerRequest $request): void
         }
 
         $replicationInfo = new ReplicationInfo($this->dbi);
-        $replicationInfo->load($_POST['primary_connection'] ?? null);
+        $replicationInfo->load($request->getParsedBodyParam('primary_connection'));
 
         $primaryInfo = $replicationInfo->getPrimaryInfo();
         $replicaInfo = $replicationInfo->getReplicaInfo();
diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php
@@ -67,7 +67,7 @@ public function __invoke(ServerRequest $request): void
             $GLOBALS['unlim_num_rows'] = 0;
         }
 
-        $GLOBALS['single_table'] = $_POST['single_table'] ?? $_GET['single_table'] ?? $GLOBALS['single_table'] ?? null;
+        $GLOBALS['single_table'] = $request->getParam('single_table') ?? $GLOBALS['single_table'] ?? null;
 
         $exportList = Plugins::getExport('server', isset($GLOBALS['single_table']));
 
diff --git a/libraries/classes/Controllers/Server/UserGroupsController.php b/libraries/classes/Controllers/Server/UserGroupsController.php
@@ -66,40 +66,40 @@ public function __invoke(ServerRequest $request): void
         /**
          * Delete user group
          */
-        if (! empty($_POST['deleteUserGroup'])) {
-            UserGroups::delete($configurableMenusFeature, $_POST['userGroup']);
+        if ($request->hasBodyParam('deleteUserGroup')) {
+            UserGroups::delete($configurableMenusFeature, $request->getParsedBodyParam('userGroup'));
         }
 
         /**
          * Add a new user group
          */
-        if (! empty($_POST['addUserGroupSubmit'])) {
-            UserGroups::edit($configurableMenusFeature, $_POST['userGroup'], true);
+        if ($request->hasBodyParam('addUserGroupSubmit')) {
+            UserGroups::edit($configurableMenusFeature, $request->getParsedBodyParam('userGroup'), true);
         }
 
         /**
          * Update a user group
          */
-        if (! empty($_POST['editUserGroupSubmit'])) {
-            UserGroups::edit($configurableMenusFeature, $_POST['userGroup']);
+        if ($request->hasBodyParam('editUserGroupSubmit')) {
+            UserGroups::edit($configurableMenusFeature, $request->getParsedBodyParam('userGroup'));
         }
 
-        if (isset($_POST['viewUsers'])) {
+        if ($request->hasBodyParam('viewUsers')) {
             // Display users belonging to a user group
             $this->response->addHTML(UserGroups::getHtmlForListingUsersofAGroup(
                 $configurableMenusFeature,
-                $_POST['userGroup']
+                $request->getParsedBodyParam('userGroup')
             ));
         }
 
-        if (isset($_GET['addUserGroup'])) {
+        if ($request->hasQueryParam('addUserGroup')) {
             // Display add user group dialog
             $this->response->addHTML(UserGroups::getHtmlToEditUserGroup($configurableMenusFeature));
-        } elseif (isset($_POST['editUserGroup'])) {
+        } elseif ($request->hasBodyParam('editUserGroup')) {
             // Display edit user group dialog
             $this->response->addHTML(UserGroups::getHtmlToEditUserGroup(
                 $configurableMenusFeature,
-                $_POST['userGroup']
+                $request->getParsedBodyParam('userGroup')
             ));
         } else {
             // Display user groups table

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function __invoke(ServerRequest $request): void`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`$replicationInfo = new ReplicationInfo($this->dbi);`
`89`		`- $replicationInfo->load($_POST['primary_connection'] ?? null);`
	`89`	`+ $replicationInfo->load($request->getParsedBodyParam('primary_connection'));`
`90`	`90`
`91`	`91`	`$primaryInfo = $replicationInfo->getPrimaryInfo();`
`92`	`92`	`$replicaInfo = $replicationInfo->getReplicaInfo();`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function __invoke(ServerRequest $request): void`
`67`	`67`	`$GLOBALS['unlim_num_rows'] = 0;`
`68`	`68`	`}`
`69`	`69`
`70`		`- $GLOBALS['single_table'] = $_POST['single_table'] ?? $_GET['single_table'] ?? $GLOBALS['single_table'] ?? null;`
	`70`	`+ $GLOBALS['single_table'] = $request->getParam('single_table') ?? $GLOBALS['single_table'] ?? null;`
`71`	`71`
`72`	`72`	`$exportList = Plugins::getExport('server', isset($GLOBALS['single_table']));`
`73`	`73`