From 87c09a921b955ed8c7d3ff2b8f62d5a7c6ba2bfa Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 9 Apr 2017 16:05:18 -0400 Subject: [PATCH] More defined naming scheme for config --- app/Http/Controllers/API/Admin/NodeController.php | 2 +- app/Http/Controllers/API/Admin/ServerController.php | 2 +- app/Http/Controllers/API/Admin/UserController.php | 2 +- config/pterodactyl.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/API/Admin/NodeController.php b/app/Http/Controllers/API/Admin/NodeController.php index 655a7575d..4992638b2 100644 --- a/app/Http/Controllers/API/Admin/NodeController.php +++ b/app/Http/Controllers/API/Admin/NodeController.php @@ -52,7 +52,7 @@ class NodeController extends Controller ->withResourceName('user') ->paginateWith(new IlluminatePaginatorAdapter($nodes)); - if (config('pterodactyl.api.allow_includes_on_list') && $request->input('include')) { + if (config('pterodactyl.api.include_on_list') && $request->input('include')) { $fractal->parseIncludes(explode(',', $request->input('include'))); } diff --git a/app/Http/Controllers/API/Admin/ServerController.php b/app/Http/Controllers/API/Admin/ServerController.php index 643e67296..8d1962822 100644 --- a/app/Http/Controllers/API/Admin/ServerController.php +++ b/app/Http/Controllers/API/Admin/ServerController.php @@ -53,7 +53,7 @@ class ServerController extends Controller ->withResourceName('user') ->paginateWith(new IlluminatePaginatorAdapter($servers)); - if (config('pterodactyl.api.allow_includes_on_list') && $request->input('include')) { + if (config('pterodactyl.api.include_on_list') && $request->input('include')) { $fractal->parseIncludes(explode(',', $request->input('include'))); } diff --git a/app/Http/Controllers/API/Admin/UserController.php b/app/Http/Controllers/API/Admin/UserController.php index 15af793d0..7268c263c 100644 --- a/app/Http/Controllers/API/Admin/UserController.php +++ b/app/Http/Controllers/API/Admin/UserController.php @@ -52,7 +52,7 @@ class UserController extends Controller ->withResourceName('user') ->paginateWith(new IlluminatePaginatorAdapter($users)); - if (config('pterodactyl.api.allow_includes_on_list') && $request->input('include')) { + if (config('pterodactyl.api.include_on_list') && $request->input('include')) { $fractal->parseIncludes(explode(',', $request->input('include'))); } diff --git a/config/pterodactyl.php b/config/pterodactyl.php index 7d6916891..f217e4c05 100644 --- a/config/pterodactyl.php +++ b/config/pterodactyl.php @@ -43,7 +43,7 @@ return [ | Configuration options for the API. */ 'api' => [ - 'allow_includes_on_list' => env('API_ALLOW_INCLUDE_ON_LIST', false), + 'include_on_list' => env('API_INCLUDE_ON_LIST', false), ], /*