From 6fda3b72e48459cd4d7ece757951b220eeec0aca Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 13 Apr 2017 23:49:47 -0400
Subject: [PATCH] Display total servers user can access in the Admin CP

closes #356
---
 app/Http/Controllers/Admin/UserController.php          |  2 +-
 app/Models/User.php                                    | 10 ++++++++++
 .../themes/pterodactyl/admin/users/index.blade.php     |  6 ++++--
 .../themes/pterodactyl/admin/users/view.blade.php      |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 14a77e2da..c9d7a4725 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -44,7 +44,7 @@ class UserController extends Controller
      */
     public function index(Request $request)
     {
-        $users = User::withCount('servers');
+        $users = User::withCount('servers', 'subuserOf');
 
         if (! is_null($request->input('query'))) {
             $users->search($request->input('query'));
diff --git a/app/Models/User.php b/app/Models/User.php
index 649af11a7..b159da9ad 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -239,4 +239,14 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
     {
         return $this->hasMany(Server::class, 'owner_id');
     }
+
+    /**
+     * Return all servers that user is listed as a subuser of directly.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function subuserOf()
+    {
+        return $this->hasMany(Subuser::class);
+    }
 }
diff --git a/resources/themes/pterodactyl/admin/users/index.blade.php b/resources/themes/pterodactyl/admin/users/index.blade.php
index 9599664a8..761f267a0 100644
--- a/resources/themes/pterodactyl/admin/users/index.blade.php
+++ b/resources/themes/pterodactyl/admin/users/index.blade.php
@@ -57,7 +57,8 @@
                             <th>Email</td>
                             <th>Client Name</th>
                             <th>Username</th>
-                            <th>Servers</th>
+                            <th class="text-center" data-toggle="tooltip" data-placement="top" title="Servers that this user is marked as the owner of.">Servers Owned</th>
+                            <th class="text-center" data-toggle="tooltip" data-placement="top" title="Servers that this user can access because they are marked as a subuser.">Can Access</th>
                             <th></th>
                         </tr>
                     </thead>
@@ -68,7 +69,8 @@
                                 <td><a href="{{ route('admin.users.view', $user->id) }}">{{ $user->email }}</a></td>
                                 <td>{{ $user->name_last }}, {{ $user->name_first }}</td>
                                 <td>{{ $user->username }}</td>
-                                <td>{{ $user->servers_count }}</td>
+                                <td class="text-center">{{ $user->servers_count }}</td>
+                                <td class="text-center">{{ $user->subuser_of_count }}</td>
                                 <td class="text-center"><img src="https://www.gravatar.com/avatar/{{ md5(strtolower($user->email)) }}?s=20" class="img-circle" /></td>
                             </tr>
                         @endforeach
diff --git a/resources/themes/pterodactyl/admin/users/view.blade.php b/resources/themes/pterodactyl/admin/users/view.blade.php
index 6449f0dd7..287b9cc84 100644
--- a/resources/themes/pterodactyl/admin/users/view.blade.php
+++ b/resources/themes/pterodactyl/admin/users/view.blade.php
@@ -136,9 +136,9 @@
                                 <td><a href="{{ route('admin.servers.view', $server->id) }}">{{ $server->name }}</a></td>
                                 <td>
                                     @if($server->owner_id === $user->id)
-                                        @lang('strings.owner')
+                                        <span class="label bg-purple">Owner</span>
                                     @else
-                                        @lang('strings.subuser')
+                                        <span class="label bg-blue">Subuser</span>
                                     @endif
                                 </td>
                                 <td><a href="{{ route('admin.nodes.view', $server->node->id) }}">{{ $server->node->name }}</a></td>