More defined naming scheme for config

DaneEveritt · DaneEveritt · commit 87c09a921b95 · 2017-04-09T16:05:18.000-04:00
diff --git a/app/Http/Controllers/API/Admin/NodeController.php b/app/Http/Controllers/API/Admin/NodeController.php
@@ -52,7 +52,7 @@ public function index(Request $request)
             ->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
@@ -53,7 +53,7 @@ public function index(Request $request)
             ->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
@@ -52,7 +52,7 @@ public function index(Request $request)
             ->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
@@ -43,7 +43,7 @@
     | 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),
     ],
 
     /*

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function index(Request $request)`
`52`	`52`	`->withResourceName('user')`
`53`	`53`	`->paginateWith(new IlluminatePaginatorAdapter($nodes));`
`54`	`54`
`55`		`- if (config('pterodactyl.api.allow_includes_on_list') && $request->input('include')) {`
	`55`	`+ if (config('pterodactyl.api.include_on_list') && $request->input('include')) {`
`56`	`56`	`$fractal->parseIncludes(explode(',', $request->input('include')));`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function index(Request $request)`
`53`	`53`	`->withResourceName('user')`
`54`	`54`	`->paginateWith(new IlluminatePaginatorAdapter($servers));`
`55`	`55`
`56`		`- if (config('pterodactyl.api.allow_includes_on_list') && $request->input('include')) {`
	`56`	`+ if (config('pterodactyl.api.include_on_list') && $request->input('include')) {`
`57`	`57`	`$fractal->parseIncludes(explode(',', $request->input('include')));`
`58`	`58`	`}`
`59`	`59`