From a36f3dd8758cfe753a97608ddd126da8bd39cd88 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 13 Feb 2016 17:36:03 -0500 Subject: [PATCH] Fix startup variable editing to allow admin full control --- app/Http/Controllers/Admin/ServersController.php | 2 +- app/Repositories/ServerRepository.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index 325d788a1..348d852cb 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -374,7 +374,7 @@ class ServersController extends Controller $server = new ServerRepository; $server->updateStartup($id, $request->except([ '_token' - ])); + ]), true); Alert::success('Server startup variables were successfully updated.')->flash(); } catch (\Pterodactyl\Exceptions\DisplayException $e) { Alert::danger($e->getMessage())->flash(); diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php index cb501e091..2f040191d 100644 --- a/app/Repositories/ServerRepository.php +++ b/app/Repositories/ServerRepository.php @@ -540,7 +540,7 @@ class ServerRepository } - public function updateStartup($id, array $data) + public function updateStartup($id, array $data, $admin = false) { $server = Models\Server::findOrFail($id); @@ -595,7 +595,7 @@ class ServerRepository } // Variable hidden and/or not user editable - if ($variable->user_viewable === 0 || $variable->user_editable === 0) { + if (($variable->user_viewable === 0 || $variable->user_editable === 0) && !$admin) { throw new DisplayException('A service option variable field (' . $variable->env_variable . ') does not exist or you do not have permission to edit it.'); }