Fix redirect/form paths in Module\Admin\Users\Index|Active

diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php
index 1a12ad786c54002aa705f36b14127810e402a748..4a7f056748dcd2886f502830afe986f6e8ed7543 100644 (file)
--- a/src/Module/Admin/Users/Active.php
+++ b/src/Module/Admin/Users/Active.php
@@ -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,

diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php
index cc453a0731c7d02ddc997e5396fb6ee33e1335d2..8b8cf2f7fde19dd7cc7d6632e91c67185907dcbb 100644 (file)
--- a/src/Module/Admin/Users/Index.php
+++ b/src/Module/Admin/Users/Index.php
@@ -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,