Leverage injected request object

Laravel automatically injects the current Http [request object][1] to all Controller actions and Middleware. Leveraging this object improves consistency and testability.

[1]: https://laravel.com/docs/requests#accessing-the-request
This commit is contained in:
Shift
2023-03-30 14:15:14 +00:00
parent ce9ce47010
commit 66c246852c
16 changed files with 82 additions and 79 deletions
@@ -29,7 +29,7 @@ class AdminUserController extends BasePageController
$ordering = getUserBrowseOrdering();
$orderBy = $request->has('ob') && \in_array($request->input('ob'), $ordering, false) ? $request->input('ob') : '';
$page = request()->has('page') && is_numeric(request()->input('page')) ? request()->input('page') : 1;
$page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1;
$offset = ($page - 1) * config('nntmux.items_per_page');
$variables = [
@@ -50,7 +50,7 @@ class AdminUserController extends BasePageController
true
);
$results = $this->paginate($rslt ?? [], User::getCount($variables['role'], $variables['username'], $variables['host'], $variables['email']) ?? 0, config('nntmux.items_per_page'), $page, request()->url(), request()->query());
$results = $this->paginate($rslt ?? [], User::getCount($variables['role'], $variables['username'], $variables['host'], $variables['email']) ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query());
$this->smarty->assign(
[