starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update admin/user-list handling

Browse Source
This commit is contained in:
DariusIII
2018-05-25 16:04:30 +02:00
parent f76ef717c9
commit 949e02d9fe
4 changed files with 110 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/UserController.php
+12 -8
View File
@@ -30,6 +30,9 @@ class UserController 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;
$offset = ($page - 1) * config('nntmux.items_per_page');
$variables = [
'username' => $request->has('username') ? $request->input('username') : '',
@@ -38,6 +41,13 @@ class UserController extends BasePageController
'role' => $request->has('role') ? $request->input('role') : '',
];
$rslt = User::getRange(
$offset, config('nntmux.items_per_page'), $orderBy, $variables['username'],
$variables['email'], $variables['host'], $variables['role'], true
);
$results = $this->paginate($rslt ?? [], User::getCount() ?? 0, config('nntmux.items_per_page'), $page, request()->url(), request()->query());
$this->smarty->assign(
[
'username' => $variables['username'],
@@ -46,20 +56,14 @@ class UserController extends BasePageController
'role' => $variables['role'],
'role_ids' => array_keys($roles),
'role_names' => $roles,
'userlist' => User::getRange(
$orderBy,
$variables['username'],
$variables['email'],
$variables['host'],
$variables['role']
),
'userlist' => $results,
]
);
User::updateExpiredRoles();
foreach ($ordering as $orderType) {
$this->smarty->assign('orderby'.$orderType, WWW_TOP.'user-list?ob='.$orderType.'&offset=0');
$this->smarty->assign('orderby'.$orderType, WWW_TOP.'user-list?ob='.$orderType);
}
$content = $this->smarty->fetch('user-list.tpl');