diff --git a/Changelog b/Changelog index 726e8f8d2..e7ce3ea19 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-25 DariusIII + * Chg: Update admin/user-list handling * Chg: Update Blacklight/Movie class, use DB facade and try to prevent re-processing of unmatched movies * Chg: Update laravel/scout to version 4.0.4 * Chg: Update PHPDOC block in DbUpdate log property diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 704b6d8ea..105ad0ebe 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -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'); diff --git a/app/Models/User.php b/app/Models/User.php index beac95610..fd107feae 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -4,6 +4,7 @@ namespace App\Models; use App\Mail\SendInvite; use App\Mail\AccountChange; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use Illuminate\Support\Carbon; use Blacklight\utility\Utility; @@ -465,39 +466,99 @@ class User extends Authenticatable } /** + * @param $start + * @param $offset * @param $orderBy * @param string $userName * @param string $email * @param string $host * @param string $role + * @param bool $apiRequests * - * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator + * @return array * @throws \Exception */ - public static function getRange($orderBy, $userName = '', $email = '', $host = '', $role = '') + public static function getRange($start, $offset, $orderBy, $userName = '', $email = '', $host = '', $role = '', $apiRequests = false) { - UserRequest::clearApiRequests(false); - - $order = getUserBrowseOrder($orderBy); - - $users = self::query()->with('role', 'request')->where('id', '<>', 0)->groupBy('id')->orderBy($order[0], $order[1])->withCount('request as apirequests'); - if (! empty($userName)) { - $users->where('username', 'like', '%'.$userName.'%'); + if ($apiRequests) { + UserRequest::clearApiRequests(false); + $query = " + SELECT users.*, user_roles.name AS rolename, COUNT(user_requests.id) AS apirequests + FROM users + INNER JOIN user_roles ON user_roles.id = users.user_roles_id + LEFT JOIN user_requests ON user_requests.users_id = users.id + WHERE users.id != 0 %s %s %s %s + AND email != 'sharing@nZEDb.com' + GROUP BY users.id + ORDER BY %s %s %s"; + } else { + $query = ' + SELECT users.*, user_roles.name AS rolename + FROM users + INNER JOIN user_roles ON user_roles.id = users.user_roles_id + WHERE 1=1 %s %s %s %s + ORDER BY %s %s %s'; } + $order = self::getBrowseOrder($orderBy); + return DB::select( + sprintf( + $query, + ! empty($userName) ? 'AND users.username ' . 'LIKE '.DB::connection()->getPdo()->quote('%'.$userName.'%') : '', + ! empty($email) ? 'AND users.email ' . 'LIKE ' .DB::connection()->getPdo()->quote('%'.$email.'%') : '', + ! empty($host) ? 'AND users.host ' . 'LIKE ' .DB::connection()->getPdo()->quote('%'.$host.'%') : '', + (! empty($role) ? ('AND users.role = ' . $role) : ''), + $order[0], + $order[1], + ($start === false ? '' : ('LIMIT ' . $offset . ' OFFSET ' . $start)) + ) + ); + } - if (! empty($email)) { - $users->where('email', 'like', '%'.$email.'%'); + /** + * Get sort types for sorting users on the web page user list. + * + * @param $orderBy + * + * @return string[] + */ + public static function getBrowseOrder($orderBy) + { + $order = (empty($orderBy) ? 'username_desc' : $orderBy); + $orderArr = explode('_', $order); + switch ($orderArr[0]) { + case 'username': + $orderField = 'username'; + break; + case 'email': + $orderField = 'email'; + break; + case 'host': + $orderField = 'host'; + break; + case 'createdat': + $orderField = 'created_at'; + break; + case 'lastlogin': + $orderField = 'lastlogin'; + break; + case 'apiaccess': + $orderField = 'apiaccess'; + break; + case 'grabs': + $orderField = 'grabs'; + break; + case 'role': + $orderField = 'role'; + break; + case 'rolechangedate': + $orderField = 'rolechangedate'; + break; + default: + $orderField = 'username'; + break; } - - if (! empty($host)) { - $users->where('host', 'like', '%'.$host.'%'); - } - - if (! empty($role)) { - $users->where('user_roles_id', $role); - } - - return $users->paginate(config('nntmux.items_per_page')); + $orderSort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc'; + return [$orderField, $orderSort]; } /** diff --git a/resources/views/themes/admin/user-list.tpl b/resources/views/themes/admin/user-list.tpl index 169b53736..8b79ef1ee 100644 --- a/resources/views/themes/admin/user-list.tpl +++ b/resources/views/themes/admin/user-list.tpl @@ -74,29 +74,28 @@ options - {foreach $userlist as $user} {$user.username} + href="{$smarty.const.WWW_TOP}/admin/user-edit?id={$user->id}">{$user->username} - {$user.email} + {$user->email} - {$user.host} - {$user.created_at|date_format} - {$user.lastlogin|date_format} - {$user.apiaccess|date_format} - {$user.apirequests} - {$user.grabs} - {$user.invites} - {$user->host} + {$user->created_at|date_format} + {$user->lastlogin|date_format} + {$user->apiaccess|date_format} + {$user->apirequests} + {$user->grabs} + {$user->invites} + {$user->role->name} - {if !empty($user.rolechangedate)}{$user.rolechangedate}{/if} - {if $user.user_roles_id !="2"} + {if !empty($user->rolechangedate)}{$user->rolechangedate}{/if} + {if $user->user_roles_id !="2"} delete{/if}