From 8b4bd3945da0638d29b9d444418b6c1452e011bd Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 13 Sep 2020 12:35:48 -0700
Subject: [PATCH] Fix user search in admin area; closes #2100

---
 app/Http/Controllers/Admin/UserController.php       | 13 +++++++++++--
 public/themes/pterodactyl/js/admin/new-server.js    |  2 +-
 resources/views/admin/nodes/index.blade.php         |  2 +-
 resources/views/admin/servers/new.blade.php         |  2 +-
 .../views/admin/servers/view/details.blade.php      |  2 +-
 resources/views/admin/users/index.blade.php         |  2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index f6d9a4c3b..2afbe1407 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -185,11 +185,20 @@ class UserController extends Controller
      */
     public function json(Request $request)
     {
+        $users = QueryBuilder::for(User::query())->allowedFilters(['email'])->paginate(25);
+
         // Handle single user requests.
         if ($request->query('user_id')) {
-            return $this->repository->filterById($request->input('user_id'));
+            $user = User::query()->findOrFail($request->input('user_id'));
+            $user->md5 = md5(strtolower($user->email));
+
+            return $user;
         }
 
-        return $this->repository->filterUsersByQuery($request->input('q'));
+        return $users->map(function ($item) {
+            $item->md5 = md5(strtolower($item->email));
+
+            return $item;
+        });
     }
 }
diff --git a/public/themes/pterodactyl/js/admin/new-server.js b/public/themes/pterodactyl/js/admin/new-server.js
index 3e0718a46..7416451da 100644
--- a/public/themes/pterodactyl/js/admin/new-server.js
+++ b/public/themes/pterodactyl/js/admin/new-server.js
@@ -161,7 +161,7 @@ function initUserIdSelect(data) {
 
             data: function (params) {
                 return {
-                    q: params.term, // search term
+                    filter: { email: params.term },
                     page: params.page,
                 };
             },
diff --git a/resources/views/admin/nodes/index.blade.php b/resources/views/admin/nodes/index.blade.php
index a8de9554d..524d81107 100644
--- a/resources/views/admin/nodes/index.blade.php
+++ b/resources/views/admin/nodes/index.blade.php
@@ -31,7 +31,7 @@
                 <div class="box-tools search01">
                     <form action="{{ route('admin.nodes') }}" method="GET">
                         <div class="input-group input-group-sm">
-                            <input type="text" name="query" class="form-control pull-right" value="{{ request()->input('query') }}" placeholder="Search Nodes">
+                            <input type="text" name="filter[name]" class="form-control pull-right" value="{{ request()->input('filter.name') }}" placeholder="Search Nodes">
                             <div class="input-group-btn">
                                 <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
                                 <a href="{{ route('admin.nodes.new') }}"><button type="button" class="btn btn-sm btn-primary" style="border-radius: 0 3px 3px 0;margin-left:-1px;">Create New</button></a>
diff --git a/resources/views/admin/servers/new.blade.php b/resources/views/admin/servers/new.blade.php
index fe9c7be24..47f6d06ba 100644
--- a/resources/views/admin/servers/new.blade.php
+++ b/resources/views/admin/servers/new.blade.php
@@ -327,7 +327,7 @@
         // END Persist 'Service Variables'
     </script>
 
-    {!! Theme::js('js/admin/new-server.js') !!}
+    {!! Theme::js('js/admin/new-server.js?v=20200913') !!}
 
     <script type="application/javascript">
         $(document).ready(function() {
diff --git a/resources/views/admin/servers/view/details.blade.php b/resources/views/admin/servers/view/details.blade.php
index 9d5cc3125..6499eb787 100644
--- a/resources/views/admin/servers/view/details.blade.php
+++ b/resources/views/admin/servers/view/details.blade.php
@@ -73,7 +73,7 @@
             delay: 250,
             data: function (params) {
                 return {
-                    q: params.term, // search term
+                    filter: { email: params.term },
                     page: params.page,
                 };
             },
diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php
index 721e1ff92..98efd1176 100644
--- a/resources/views/admin/users/index.blade.php
+++ b/resources/views/admin/users/index.blade.php
@@ -26,7 +26,7 @@
                 <div class="box-tools search01">
                     <form action="{{ route('admin.users') }}" method="GET">
                         <div class="input-group input-group-sm">
-                            <input type="text" name="query" class="form-control pull-right" value="{{ request()->input('query') }}" placeholder="Search">
+                            <input type="text" name="filter[email]" class="form-control pull-right" value="{{ request()->input('filter.email') }}" placeholder="Search">
                             <div class="input-group-btn">
                                 <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
                                 <a href="{{ route('admin.users.new') }}"><button type="button" class="btn btn-sm btn-primary" style="border-radius: 0 3px 3px 0;margin-left:-1px;">Create New</button></a>