Visitar URL original
Ref #17769 - Replace superglobals with serverrequest in PrivilegesCon… · phpmyadmin/phpmyadmin@3663fed · GitHub
Skip to content

Commit 3663fed

Browse files
ru-asdxru-asdx
authored
Ref #17769 - Replace superglobals with serverrequest in PrivilegesController (#17977)
* replace superglobals with serverrequest Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
1 parent d1e616d commit 3663fed

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

‎libraries/classes/Controllers/Server/PrivilegesController.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ public function __invoke(ServerRequest $request): void
166166
* only to update the password
167167
*/
168168
if (
169-
isset($_POST['change_copy']) && $GLOBALS['username'] == $_POST['old_username']
170-
&& $GLOBALS['hostname'] == $_POST['old_hostname']
169+
$request->hasBodyParam('change_copy') && $GLOBALS['username'] == $request->getParsedBodyParam('old_username')
170+
&& $GLOBALS['hostname'] == $request->getParsedBodyParam('old_hostname')
171171
) {
172172
$this->response->addHTML(
173173
Message::error(
@@ -219,7 +219,7 @@ public function __invoke(ServerRequest $request): void
219219
/**
220220
* Changes / copies a user, part III
221221
*/
222-
if (isset($_POST['change_copy']) && $GLOBALS['username'] !== null && $GLOBALS['hostname'] !== null) {
222+
if ($request->hasBodyParam('change_copy') && $GLOBALS['username'] !== null && $GLOBALS['hostname'] !== null) {
223223
$GLOBALS['queries'] = $serverPrivileges->getDbSpecificPrivsQueriesForChangeOrCopyUser(
224224
$GLOBALS['queries'],
225225
$GLOBALS['username'],
@@ -235,7 +235,7 @@ public function __invoke(ServerRequest $request): void
235235
/**
236236
* Updates privileges
237237
*/
238-
if (! empty($_POST['update_privs'])) {
238+
if ($request->hasBodyParam('update_privs')) {
239239
if (is_array($GLOBALS['dbname'])) {
240240
foreach ($GLOBALS['dbname'] as $key => $db_name) {
241241
[$GLOBALS['sql_query'][$key], $GLOBALS['message']] = $serverPrivileges->updatePrivileges(
@@ -263,17 +263,17 @@ public function __invoke(ServerRequest $request): void
263263
* Assign users to user groups
264264
*/
265265
if (
266-
! empty($_POST['changeUserGroup']) && $relationParameters->configurableMenusFeature !== null
266+
$request->hasBodyParam('changeUserGroup') && $relationParameters->configurableMenusFeature !== null
267267
&& $this->dbi->isSuperUser() && $this->dbi->isCreateUser()
268268
) {
269-
$serverPrivileges->setUserGroup($GLOBALS['username'] ?? '', $_POST['userGroup']);
269+
$serverPrivileges->setUserGroup($GLOBALS['username'] ?? '', $request->getParsedBodyParam('userGroup'));
270270
$GLOBALS['message'] = Message::success();
271271
}
272272

273273
/**
274274
* Revokes Privileges
275275
*/
276-
if (isset($_POST['revokeall'])) {
276+
if ($request->hasBodyParam('revokeall')) {
277277
[$GLOBALS['message'], $GLOBALS['sql_query']] = $serverPrivileges->getMessageAndSqlQueryForPrivilegesRevoke(
278278
(is_string($GLOBALS['dbname']) ? $GLOBALS['dbname'] : ''),
279279
($GLOBALS['tablename'] ?? ($GLOBALS['routinename'] ?? '')),
@@ -286,7 +286,7 @@ public function __invoke(ServerRequest $request): void
286286
/**
287287
* Updates the password
288288
*/
289-
if (isset($_POST['change_pw'])) {
289+
if ($request->hasBodyParam('change_pw')) {
290290
$GLOBALS['message'] = $serverPrivileges->updatePassword(
291291
$GLOBALS['errorUrl'],
292292
$GLOBALS['username'] ?? '',
@@ -298,17 +298,17 @@ public function __invoke(ServerRequest $request): void
298298
* Deletes users
299299
* (Changes / copies a user, part IV)
300300
*/
301-
if (isset($_POST['delete']) || (isset($_POST['change_copy']) && $_POST['mode'] < 4)) {
301+
if ($request->hasBodyParam('delete') || ($request->hasBodyParam('change_copy') && $request->getParsedBodyParam('mode') < 4)) {
302302
$GLOBALS['queries'] = $serverPrivileges->getDataForDeleteUsers($GLOBALS['queries']);
303-
if (empty($_POST['change_copy'])) {
303+
if (! $request->hasBodyParam('change_copy')) {
304304
[$GLOBALS['sql_query'], $GLOBALS['message']] = $serverPrivileges->deleteUser($GLOBALS['queries']);
305305
}
306306
}
307307

308308
/**
309309
* Changes / copies a user, part V
310310
*/
311-
if (isset($_POST['change_copy'])) {
311+
if ($request->hasBodyParam('change_copy')) {
312312
$GLOBALS['queries'] = $serverPrivileges->getDataForQueries(
313313
$GLOBALS['queries'],
314314
$GLOBALS['queries_for_display']
@@ -333,11 +333,11 @@ public function __invoke(ServerRequest $request): void
333333
if (
334334
$this->response->isAjax()
335335
&& empty($_REQUEST['ajax_page_request'])
336-
&& ! isset($_GET['export'])
337-
&& (! isset($_POST['submit_mult']) || $_POST['submit_mult'] !== 'export')
338-
&& ((! isset($_GET['initial']) || $_GET['initial'] === '')
339-
|| (isset($_POST['delete']) && $_POST['delete'] === __('Go')))
340-
&& ! isset($_GET['showall'])
336+
&& ! $request->hasQueryParam('export')
337+
&& $request->getParsedBodyParam('submit_mult') !== 'export'
338+
&& ((! $request->hasQueryParam('initial') || $request->getQueryParam('initial') === '')
339+
|| $request->getParsedBodyParam('delete') === __('Go'))
340+
&& ! $request->hasQueryParam('showall')
341341
) {
342342
$extra_data = $serverPrivileges->getExtraDataForAjaxBehavior(
343343
($GLOBALS['password'] ?? ''),
@@ -364,7 +364,7 @@ public function __invoke(ServerRequest $request): void
364364
}
365365

366366
// export user definition
367-
if (isset($_GET['export']) || (isset($_POST['submit_mult']) && $_POST['submit_mult'] === 'export')) {
367+
if ($request->hasQueryParam('export') || $request->getParsedBodyParam('submit_mult') === 'export') {
368368
[$GLOBALS['title'], $GLOBALS['export']] = $serverPrivileges->getListForExportUserDefinition(
369369
$GLOBALS['username'] ?? '',
370370
$GLOBALS['hostname'] ?? ''
@@ -383,7 +383,7 @@ public function __invoke(ServerRequest $request): void
383383
}
384384

385385
// Show back the form if an error occurred
386-
if (isset($_GET['adduser']) || $GLOBALS['_add_user_error'] === true) {
386+
if ($request->hasQueryParam('adduser') || $GLOBALS['_add_user_error'] === true) {
387387
// Add user
388388
$this->response->addHTML($serverPrivileges->getHtmlForAddUser(
389389
$serverPrivileges->escapeGrantWildcards(is_string($GLOBALS['dbname']) ? $GLOBALS['dbname'] : '')

0 commit comments

Comments
 (0)