From cfaefb2bfdd80cd2954c4d1449a70102435d0428 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Wed, 9 Jan 2019 01:01:18 -0600 Subject: [PATCH] allowed login models and update of login controller --- app/Http/Middleware/RequireRole.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Middleware/RequireRole.php b/app/Http/Middleware/RequireRole.php index 364b806ce..69b43cbda 100644 --- a/app/Http/Middleware/RequireRole.php +++ b/app/Http/Middleware/RequireRole.php @@ -20,14 +20,14 @@ class RequireRole { $confirmed = false; $ranking = [ - 'None' => 0, - 'Guest' => 1, - 'User' => 2, - 'Director' => 3, - 'Admin' => 4, + 'role.none' => 0, + 'role.guest' => 1, + 'role.user' => 2, + 'role.director' => 3, + 'role.admin' => 4, ]; //Using eloquent let's get the roles for the character - $check = UserRole::where('character_id', auth()->user()->character_id)->get(['role']); + $check = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission' => $permission])->get(['permission']); if(!isset($check[0]->role)) { abort(403, "You don't have permissions to access this area!");