diff --git a/app/Http/Controllers/Server/SubuserController.php b/app/Http/Controllers/Server/SubuserController.php index 97c4e5ab8..b93d3d7fe 100644 --- a/app/Http/Controllers/Server/SubuserController.php +++ b/app/Http/Controllers/Server/SubuserController.php @@ -62,7 +62,7 @@ class SubuserController extends Controller return view('server.users.index', [ 'server' => $server, 'node' => $node, - 'subusers' => Models\Subuser::select('subusers.*', 'users.email', 'users.username') + 'subusers' => Models\Subuser::select('subusers.*', 'users.email', 'users.username', 'users.use_totp') ->join('users', 'users.id', '=', 'subusers.user_id') ->where('server_id', $server->id) ->get(), diff --git a/resources/lang/en/strings.php b/resources/lang/en/strings.php index 8aeaf6ffa..d1862f0ba 100644 --- a/resources/lang/en/strings.php +++ b/resources/lang/en/strings.php @@ -59,4 +59,5 @@ return [ 'yes' => 'Yes', 'no' => 'No', 'delete' => 'Delete', + '2fa' => '2FA', ]; diff --git a/resources/themes/pterodactyl/server/users/index.blade.php b/resources/themes/pterodactyl/server/users/index.blade.php index 3ae65e28a..b047487e9 100644 --- a/resources/themes/pterodactyl/server/users/index.blade.php +++ b/resources/themes/pterodactyl/server/users/index.blade.php @@ -46,6 +46,7 @@ @lang('strings.username') @lang('strings.email') + @lang('strings.2fa') @lang('strings.created_at') @can('view-subuser', $server)@endcan @can('delete-subuser', $server)@endcan @@ -55,6 +56,13 @@ User Image {{ $user->username }} {{ $user->email }} + + @if($user->use_totp) + + @else + + @endif + {{ $user->created_at }} @can('view-subuser', $server)