Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix startup variable editing to allow admin full control

Browse source
This commit is contained in:
Dane Everitt 2016-02-13 17:36:03 -05:00
parent a903ae313a
commit a36f3dd875
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Admin/ServersController.php
View file

@ -374,7 +374,7 @@ class ServersController extends Controller
$server = new ServerRepository; $server = new ServerRepository;
$server->updateStartup($id, $request->except([ $server->updateStartup($id, $request->except([
'_token' '_token'
])); ]), true);
Alert::success('Server startup variables were successfully updated.')->flash(); Alert::success('Server startup variables were successfully updated.')->flash();
} catch (\Pterodactyl\Exceptions\DisplayException $e) { } catch (\Pterodactyl\Exceptions\DisplayException $e) {
Alert::danger($e->getMessage())->flash(); Alert::danger($e->getMessage())->flash();

4
app/Repositories/ServerRepository.php
View file

@ -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); $server = Models\Server::findOrFail($id);
@ -595,7 +595,7 @@ class ServerRepository
} }
// Variable hidden and/or not user editable // 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.'); throw new DisplayException('A service option variable field (' . $variable->env_variable . ') does not exist or you do not have permission to edit it.');
} }