Reorganize API files

app/Http/Requests/Api/Application/Allocations/DeleteAllocationRequest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Allocations;
+namespace Pterodactyl\Http\Requests\Api\Application\Allocations;
 
 use Pterodactyl\Models\Node;
 use Pterodactyl\Models\Allocation;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class DeleteAllocationRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Allocations/GetAllocationsRequest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Allocations;
+namespace Pterodactyl\Http\Requests\Api\Application\Allocations;
 
 use Pterodactyl\Models\Node;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class GetAllocationsRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/ApiAdminRequest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin;
+namespace Pterodactyl\Http\Requests\Api\Application;
 
 use Pterodactyl\Models\ApiKey;
+use Pterodactyl\Services\Acl\Api\AdminAcl;
 use Illuminate\Foundation\Http\FormRequest;
 use Pterodactyl\Exceptions\PterodactylException;
-use Pterodactyl\Services\Acl\Api\AdminAcl as Acl;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 abstract class ApiAdminRequest extends FormRequest
@@ -24,7 +24,7 @@ abstract class ApiAdminRequest extends FormRequest
      *
      * @var int
      */
-    protected $permission = Acl::NONE;
+    protected $permission = AdminAcl::NONE;
 
     /**
      * Determine if the current user is authorized to perform
@@ -40,7 +40,7 @@ abstract class ApiAdminRequest extends FormRequest
             throw new PterodactylException('An ACL resource must be defined on API requests.');
         }
 
-        return Acl::check($this->key(), $this->resource, $this->permission);
+        return AdminAcl::check($this->key(), $this->resource, $this->permission);
     }
 
     /**

app/Http/Requests/Api/Application/Locations/DeleteLocationRequest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Locations;
+namespace Pterodactyl\Http\Requests\Api\Application\Locations;
 
 use Pterodactyl\Models\Location;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class DeleteLocationRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Locations/GetLocationRequest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Http\Controllers\API\Admin\Locations;
+namespace Pterodactyl\Http\Controllers\Api\Application\Locations;
 
 use Pterodactyl\Models\Location;
-use Pterodactyl\Http\Requests\API\Admin\Locations\GetLocationsRequest;
+use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationsRequest;
 
 class GetLocationRequest extends GetLocationsRequest
 {

app/Http/Requests/Api/Application/Locations/GetLocationsRequest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Locations;
+namespace Pterodactyl\Http\Requests\Api\Application\Locations;
 
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class GetLocationsRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Http\Controllers\API\Admin\Locations;
+namespace Pterodactyl\Http\Controllers\Api\Application\Locations;
 
 use Pterodactyl\Models\Location;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class StoreLocationRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Locations/UpdateLocationRequest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Locations;
+namespace Pterodactyl\Http\Requests\Api\Application\Locations;
 
 use Pterodactyl\Models\Location;
-use Pterodactyl\Http\Controllers\API\Admin\Locations\StoreLocationRequest;
+use Pterodactyl\Http\Controllers\Api\Application\Locations\StoreLocationRequest;
 
 class UpdateLocationRequest extends StoreLocationRequest
 {

app/Http/Requests/Api/Application/Nodes/DeleteNodeRequest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Nodes;
+namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
 
 use Pterodactyl\Models\Node;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class DeleteNodeRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Nodes/GetNodeRequest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Nodes;
+namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
 
 use Pterodactyl\Models\Node;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class GetNodeRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Nodes/GetNodesRequest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Nodes;
+namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
 
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class GetNodesRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Nodes;
+namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
 
 use Pterodactyl\Models\Node;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class StoreNodeRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Nodes;
+namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
 
 use Pterodactyl\Models\Node;
 

app/Http/Requests/Api/Application/Users/DeleteUserRequest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Users;
+namespace Pterodactyl\Http\Requests\Api\Application\Users;
 
 use Pterodactyl\Models\User;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class DeleteUserRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Users/GetUserRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Users;
+namespace Pterodactyl\Http\Requests\Api\Application\Users;
 
 use Pterodactyl\Models\User;
 

app/Http/Requests/Api/Application/Users/GetUsersRequest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Users;
+namespace Pterodactyl\Http\Requests\Api\Application\Users;
 
 use Pterodactyl\Services\Acl\Api\AdminAcl as Acl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class GetUsersRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Users/StoreUserRequest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Users;
+namespace Pterodactyl\Http\Requests\Api\Application\Users;
 
 use Pterodactyl\Models\User;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Pterodactyl\Http\Requests\API\Admin\ApiAdminRequest;
+use Pterodactyl\Http\Requests\Api\Application\ApiAdminRequest;
 
 class StoreUserRequest extends ApiAdminRequest
 {

app/Http/Requests/Api/Application/Users/UpdateUserRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Http\Requests\API\Admin\Users;
+namespace Pterodactyl\Http\Requests\Api\Application\Users;
 
 use Pterodactyl\Models\User;