bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9511 from MrPetovan/bug/9501-admin-users-fixes

Browse source 
Fix redirect/form paths in Module\Admin\Users\Index|Active
This commit is contained in:
Michael Vogel 2020-11-09 03:39:49 +01:00 committed by GitHub
parent d07b580366 ae00111f5b
commit 5ca90e5a74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Admin/Users/Active.php
View file

@ -88,13 +88,13 @@ class Active extends BaseUsers
notice(DI::l10n()->t('You can\'t remove yourself'));
}
DI::baseUrl()->redirect('admin/users');
DI::baseUrl()->redirect('admin/users/active');
break;
case 'block':
self::checkFormSecurityTokenRedirectOnError('admin/users/active', 'admin_users_active', 't');
User::block($uid);
notice(DI::l10n()->t('User "%s" blocked', $user['username']));
DI::baseUrl()->redirect(DI::baseUrl()->get(true));
DI::baseUrl()->redirect('admin/users/active');
break;
}
$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 100);
@ -154,7 +154,7 @@ class Active extends BaseUsers
// values //
'$baseurl' => DI::baseUrl()->get(true),
'$query_string' => DI::baseUrl()->get(true),
'$query_string' => DI::args()->getQueryString(),
'$users' => $users,
'$count' => $count,

4
src/Module/Admin/Users/Index.php
View file

@ -101,7 +101,7 @@ class Index extends BaseUsers
self::checkFormSecurityTokenRedirectOnError('admin/users', 'admin_users', 't');
User::block($uid);
notice(DI::l10n()->t('User "%s" blocked', $user['username']));
DI::baseUrl()->redirect(DI::baseUrl()->get(true));
DI::baseUrl()->redirect('admin/users');
break;
case 'unblock':
self::checkFormSecurityTokenRedirectOnError('admin/users', 'admin_users', 't');
@ -171,7 +171,7 @@ class Index extends BaseUsers
// values //
'$baseurl' => DI::baseUrl()->get(true),
'$query_string' => DI::baseUrl()->get(true),
'$query_string' => DI::args()->getQueryString(),
'$users' => $users,
'$count' => $count,