From efce8c351b57b14198032f2eb5c081ce5f487884 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Sat, 10 Nov 2018 15:58:48 -0600 Subject: [PATCH] ranks of users --- app/Http/Middleware/RequireRole.php | 3 +-- app/Providers/AuthServiceProvider.php | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Middleware/RequireRole.php b/app/Http/Middleware/RequireRole.php index 46a8a96d0..b01bea425 100644 --- a/app/Http/Middleware/RequireRole.php +++ b/app/Http/Middleware/RequireRole.php @@ -25,8 +25,7 @@ class RequireRole 'Admin' => 3, ]; $check = DB::table('user_roles')->where('character_id', auth()->user()->character_id)->get(['role']); - //$stuff = $check[0]->role; - //dd($stuff); + if($ranking[$check[0]->role] === $ranking[$role]) { $confirmed = true; } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index b7e32931c..2f2625d8b 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -7,6 +7,7 @@ use Illuminate\Contracts\Auth\Access\Gate as GateContract; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; use DB; +use \App\Models\UserRole; class AuthServiceProvider extends ServiceProvider { @@ -31,7 +32,7 @@ class AuthServiceProvider extends ServiceProvider $gate->define('isAdmin', function($user) { $check = DB::table('user_roles')->where('character_id', auth()->user()->character_id)->get(['role']); - if($check === 'Admin') { + if($check[0]->role == 'Admin') { return true; } else { return false; @@ -40,7 +41,7 @@ class AuthServiceProvider extends ServiceProvider $gate->define('isUser', function($user) { $check = DB::table('user_roles')->where('character_id', auth()->user()->character_id)->get(['role']); - if($check === 'User') { + if($check[0]->role == 'User') { return true; } else { return false; @@ -49,7 +50,7 @@ class AuthServiceProvider extends ServiceProvider $gate->define('isGuest', function($user) { $check = DB::table('user_roles')->where('character_id', auth()->user()->character_id)->get(['role']); - if($check === 'Guest') { + if($check[0]->role == 'Guest') { return true; } else { return false; @@ -58,7 +59,7 @@ class AuthServiceProvider extends ServiceProvider $gate->define('isNone', function($user) { $check = DB::table('user_roles')->where('character_id', auth()->user()->character_id)->get(['role']); - if($check === 'None') { + if($check[0]->role == 'None') { return true; } else { return false;