This commit is contained in:
@@ -81,6 +81,27 @@ class UserController extends BaseController
|
||||
return hash('sha256', $token);
|
||||
}
|
||||
|
||||
private function redirectWithoutLegacyTermFilters(string $route): ?\CodeIgniter\HTTP\RedirectResponse
|
||||
{
|
||||
$legacyTermKeys = ['school_year', 'schoolYear', 'year', 'semester'];
|
||||
$query = $this->request->getGet();
|
||||
$hasLegacyTermFilter = false;
|
||||
|
||||
foreach ($legacyTermKeys as $key) {
|
||||
if (array_key_exists($key, $query)) {
|
||||
unset($query[$key]);
|
||||
$hasLegacyTermFilter = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$hasLegacyTermFilter) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$target = site_url($route) . (!empty($query) ? '?' . http_build_query($query) : '');
|
||||
return redirect()->to($target);
|
||||
}
|
||||
|
||||
// Method to show the home page
|
||||
public function home()
|
||||
{
|
||||
@@ -113,6 +134,10 @@ class UserController extends BaseController
|
||||
|
||||
helper('url');
|
||||
|
||||
if ($redirect = $this->redirectWithoutLegacyTermFilters('user/user_list')) {
|
||||
return $redirect;
|
||||
}
|
||||
|
||||
return view('user/user_list', [
|
||||
'userListEndpoint' => site_url('api/users'),
|
||||
]);
|
||||
@@ -854,6 +879,10 @@ class UserController extends BaseController
|
||||
|
||||
helper('url');
|
||||
|
||||
if ($redirect = $this->redirectWithoutLegacyTermFilters('user/login_activity')) {
|
||||
return $redirect;
|
||||
}
|
||||
|
||||
$perPage = (int) ($this->request->getGet('per_page') ?? 25);
|
||||
|
||||
return view('user/login_activity', [
|
||||
|
||||
Reference in New Issue
Block a user