diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php index 22a8c113f..d5d474af8 100644 --- a/app/Http/Controllers/Admin/RoleController.php +++ b/app/Http/Controllers/Admin/RoleController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; +use App\Models\User; use Exception; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; @@ -105,26 +106,26 @@ public function update(Request $request, Role $role) } } - if($role->id == 3 || $role->id == 1 || $role->id == 4){ //dont let the user change the names of these roles - $role->update([ - 'color' => $request->color - ]); - }else{ + //if($role->id == 1 || $role->id == 3 || $role->id == 4){ //dont let the user change the names of these roles + // $role->update([ + // 'color' => $request->color + // ]); + //}else{ $role->update([ 'name' => $request->name, 'color' => $request->color ]); - } + //} - if($role->id == 1){ - return redirect()->route('admin.roles.index')->with('success', __('Role updated. Name and Permissions of this Role cannot be changed')); - }elseif($role->id == 4 || $role->id == 3){ - return redirect()->route('admin.roles.index')->with('success', __('Role updated. Name of this Role cannot be changed')); - }else{ + //if($role->id == 1){ + // return redirect()->route('admin.roles.index')->with('success', __('Role updated. Name and Permissions of this Role cannot be changed')); + //}elseif($role->id == 4 || $role->id == 3){ + // return redirect()->route('admin.roles.index')->with('success', __('Role updated. Name of this Role cannot be changed')); + // }else{ return redirect() ->route('admin.roles.index') ->with('success', __('Role saved')); - } + //} } /** @@ -135,14 +136,15 @@ public function update(Request $request, Role $role) public function destroy(Role $role) { - if($role->id == 3 || $role->id == 1 || $role->id == 2){ //cannot delete the hard coded roles + if($role->id == 1 || $role->id == 3 || $role->id == 4){ //cannot delete the hard coded roles return back()->with("error","You cannot delete that role"); } $users = User::role($role)->get(); foreach($users as $user){ - $user->syncRoles(['Member']); + //$user->syncRoles(['Member']); + $user->syncRoles(4); } $role->delete(); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 29a4b6e0a..9f1e8019b 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -139,6 +139,8 @@ protected function create(array $data) ]); + $user->syncRoles(4); + $response = $this->pterodactyl->application->post('/application/users', [ 'external_id' => $user->pterodactyl_id, 'username' => $user->name, diff --git a/app/Http/Middleware/isAdmin.php b/app/Http/Middleware/isAdmin.php index 1bf4f55af..6e8202a43 100644 --- a/app/Http/Middleware/isAdmin.php +++ b/app/Http/Middleware/isAdmin.php @@ -18,7 +18,8 @@ class isAdmin */ public function handle(Request $request, Closure $next) { - if (Auth::user() && Auth::user()->hasRole("Admin")) { + //if (Auth::user() && Auth::user()->hasRole("Admin")) { + if (Auth::user() && Auth::user()->hasRole(1)) { return $next($request); } diff --git a/database/migrations/2023_04_03_231829_update_users_table.php b/database/migrations/2023_04_03_231829_update_users_table.php index 3caf98aa0..df2497417 100644 --- a/database/migrations/2023_04_03_231829_update_users_table.php +++ b/database/migrations/2023_04_03_231829_update_users_table.php @@ -26,7 +26,7 @@ public function up() public function down() { Schema::table('users', function (Blueprint $table) { - $table->integer('pterodactyl_id')->nullable->change(); + $table->integer('pterodactyl_id')->nullable()->change(); }); } }; diff --git a/database/migrations/2023_04_29_233120_drop_roles.php b/database/migrations/2023_04_29_233120_drop_roles.php deleted file mode 100644 index 3f3657077..000000000 --- a/database/migrations/2023_04_29_233120_drop_roles.php +++ /dev/null @@ -1,51 +0,0 @@ - 'PermissionsSeeder', - ]); - - Schema::table('users', function ($table) { - $table->dropColumn('role'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('users', function($table) { - $table->string('role')->default('member'); - }); - - $users = User::with('roles')->get(); - foreach($users as $user){ - if($user->hasRole(1)){ - $user->role = "admin"; - }elseif ($user->hasRole(3)){ - $user->role = "client"; - }else{ - $user->role = "member"; - } - $user->save(); - } - - } -}; diff --git a/database/seeders/PermissionsSeeder.php b/database/seeders/PermissionsSeeder.php index 7d6ebc062..e688bdf07 100644 --- a/database/seeders/PermissionsSeeder.php +++ b/database/seeders/PermissionsSeeder.php @@ -32,9 +32,14 @@ public function run() $admin->syncRoles(1); } - $admins = User::where("role","client")->get(); - foreach($admins as $admin) { - $admin->syncRoles(3); + $mods = User::where("role","moderator")->get(); + foreach($mods as $mod) { + $mod->syncRoles(2); + } + + $clients = User::where("role","client")->get(); + foreach($clients as $client) { + $client->syncRoles(3); } diff --git a/public/install/forms.php b/public/install/forms.php index d6d72b92c..726e22ec3 100644 --- a/public/install/forms.php +++ b/public/install/forms.php @@ -1,5 +1,7 @@ query($query1) && $db->query($query2)) { wh_log('Created user with Email ' . $mail . ' and pterodactyl ID ' . $pteroID, 'info'); header('LOCATION: index.php?step=7'); diff --git a/themes/default/views/layouts/main.blade.php b/themes/default/views/layouts/main.blade.php index 607a692c6..6925c9366 100644 --- a/themes/default/views/layouts/main.blade.php +++ b/themes/default/views/layouts/main.blade.php @@ -255,7 +255,7 @@ class="nav-link @if (Request::routeIs('ticket.*')) active @endif"> @endif - @if ((Auth::user()->hasRole("Admin") || Auth::user()->role == 'moderator') && $ticket_enabled) + @if ((Auth::user()->hasRole(1) || Auth::user()->role == 'moderator') && $ticket_enabled) @endif - @if (Auth::user()->hasRole("Admin")) + @if (Auth::user()->hasRole(1))