Merge branch 'develop' into feature/vuejs-auth

app/Http/Requests/Admin/Api/StoreApplicationApiKeyRequest.php

@@ -10,13 +10,15 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
 {
     /**
      * @return array
+     * @throws \ReflectionException
+     * @throws \ReflectionException
      */
     public function rules()
     {
         $modelRules = ApiKey::getCreateRules();
 
         return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {
-            return [AdminAcl::COLUMN_IDENTIFER . $resource => $modelRules['r_' . $resource]];
+            return [AdminAcl::COLUMN_IDENTIFIER . $resource => $modelRules['r_' . $resource]];
         })->merge(['memo' => $modelRules['memo']])->toArray();
     }
 
@@ -33,7 +35,7 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
     public function getKeyPermissions(): array
     {
         return collect($this->validated())->filter(function ($value, $key) {
-            return substr($key, 0, strlen(AdminAcl::COLUMN_IDENTIFER)) === AdminAcl::COLUMN_IDENTIFER;
+            return substr($key, 0, strlen(AdminAcl::COLUMN_IDENTIFIER)) === AdminAcl::COLUMN_IDENTIFIER;
         })->toArray();
     }
 }

app/Http/Requests/Admin/Servers/Databases/StoreServerDatabaseRequest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Admin\Servers\Databases;
+
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
+
+class StoreServerDatabaseRequest extends AdminFormRequest
+{
+    /**
+     * Validation rules for database creation.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'database' => 'required|string|min:1|max:24',
+            'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
+            'database_host_id' => 'required|integer|exists:database_hosts,id',
+        ];
+    }
+}

app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php

@@ -8,7 +8,7 @@ use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 class MailSettingsFormRequest extends AdminFormRequest
 {
     /**
-     * Return rules to validate mail settings POST data aganist.
+     * Return rules to validate mail settings POST data against.
      *
      * @return array
      */

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

@@ -38,7 +38,7 @@ abstract class ApplicationApiRequest extends FormRequest
 
     /**
      * Determine if the current user is authorized to perform
-     * the requested action aganist the API.
+     * the requested action against the API.
      *
      * @return bool
      *

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

@@ -19,7 +19,7 @@ class StoreLocationRequest extends ApplicationApiRequest
     protected $permission = AdminAcl::WRITE;
 
     /**
-     * Rules to validate the request aganist.
+     * Rules to validate the request against.
      *
      * @return array
      */

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

@@ -20,7 +20,7 @@ class UpdateLocationRequest extends StoreLocationRequest
     }
 
     /**
-     * Rules to validate this request aganist.
+     * Rules to validate this request against.
      *
      * @return array
      */

app/Http/Requests/Api/Application/Servers/Databases/StoreServerDatabaseRequest.php

@@ -26,7 +26,7 @@ class StoreServerDatabaseRequest extends ApplicationApiRequest
     {
         return [
             'database' => 'required|string|min:1|max:24',
-            'remote' => 'required|string|min:1',
+            'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
             'host' => 'required|integer|exists:database_hosts,id',
         ];
     }

app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php

@@ -7,7 +7,7 @@ use Pterodactyl\Models\Server;
 class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
 {
     /**
-     * Return the rules to validate this request aganist.
+     * Return the rules to validate this request against.
      *
      * @return array
      */

app/Http/Requests/Api/Application/Servers/UpdateServerStartupRequest.php

@@ -19,7 +19,7 @@ class UpdateServerStartupRequest extends ApplicationApiRequest
     protected $permission = AdminAcl::WRITE;
 
     /**
-     * Validation rules to run the input aganist.
+     * Validation rules to run the input against.
      *
      * @return array
      */

app/Http/Requests/Api/Client/ClientApiRequest.php

@@ -8,7 +8,7 @@ abstract class ClientApiRequest extends ApplicationApiRequest
 {
     /**
      * Determine if the current user is authorized to perform
-     * the requested action aganist the API.
+     * the requested action against the API.
      *
      * @return bool
      */

app/Http/Requests/Api/Client/Servers/SendCommandRequest.php

@@ -17,7 +17,7 @@ class SendCommandRequest extends GetServerRequest
     }
 
     /**
-     * Rules to validate this request aganist.
+     * Rules to validate this request against.
      *
      * @return array
      */

app/Http/Requests/Api/Client/Servers/SendPowerRequest.php

@@ -18,7 +18,7 @@ class SendPowerRequest extends ClientApiRequest
     }
 
     /**
-     * Rules to validate this request aganist.
+     * Rules to validate this request against.
      *
      * @return array
      */

app/Http/Requests/Base/StoreAccountKeyRequest.php

@@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\FrontendUserFormRequest;
 class StoreAccountKeyRequest extends FrontendUserFormRequest
 {
     /**
-     * Rules to validate the request input aganist before storing
+     * Rules to validate the request input against before storing
      * an account API key.
      *
      * @return array

app/Http/Requests/Server/Database/DeleteServerDatabaseRequest.php

@@ -19,7 +19,7 @@ class DeleteServerDatabaseRequest extends ServerFormRequest
     }
 
     /**
-     * Return the user permission to validate this request aganist.
+     * Return the user permission to validate this request against.
      *
      * @return string
      */
@@ -29,7 +29,7 @@ class DeleteServerDatabaseRequest extends ServerFormRequest
     }
 
     /**
-     * Rules to validate this request aganist.
+     * Rules to validate this request against.
      *
      * @return array
      */

app/Http/Requests/Server/Database/StoreServerDatabaseRequest.php

@@ -19,7 +19,7 @@ class StoreServerDatabaseRequest extends ServerFormRequest
     }
 
     /**
-     * Return the user permission to validate this request aganist.
+     * Return the user permission to validate this request against.
      *
      * @return string
      */
@@ -29,7 +29,7 @@ class StoreServerDatabaseRequest extends ServerFormRequest
     }
 
     /**
-     * Rules to validate this request aganist.
+     * Rules to validate this request against.
      *
      * @return array
      */

app/Http/Requests/Server/ScheduleCreationFormRequest.php

@@ -12,7 +12,7 @@ namespace Pterodactyl\Http\Requests\Server;
 class ScheduleCreationFormRequest extends ServerFormRequest
 {
     /**
-     * Permission to validate this request aganist.
+     * Permission to validate this request against.
      *
      * @return string
      */

app/Http/Requests/Server/ServerFormRequest.php

@@ -8,7 +8,7 @@ use Pterodactyl\Http\Requests\FrontendUserFormRequest;
 abstract class ServerFormRequest extends FrontendUserFormRequest
 {
     /**
-     * Return the user permission to validate this request aganist.
+     * Return the user permission to validate this request against.
      *
      * @return string
      */

app/Http/Requests/Server/Subuser/SubuserStoreFormRequest.php

@@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\Server\ServerFormRequest;
 class SubuserStoreFormRequest extends ServerFormRequest
 {
     /**
-     * Return the user permission to validate this request aganist.
+     * Return the user permission to validate this request against.
      *
      * @return string
      */
@@ -17,7 +17,7 @@ class SubuserStoreFormRequest extends ServerFormRequest
     }
 
     /**
-     * The rules to validate this request submission aganist.
+     * The rules to validate this request submission against.
      *
      * @return array
      */

app/Http/Requests/Server/Subuser/SubuserUpdateFormRequest.php

@@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\Server\ServerFormRequest;
 class SubuserUpdateFormRequest extends ServerFormRequest
 {
     /**
-     * Return the user permission to validate this request aganist.
+     * Return the user permission to validate this request against.
      *
      * @return string
      */
@@ -17,7 +17,7 @@ class SubuserUpdateFormRequest extends ServerFormRequest
     }
 
     /**
-     * The rules to validate this request submission aganist.
+     * The rules to validate this request submission against.
      *
      * @return array
      */

app/Http/Requests/Server/UpdateFileContentsFormRequest.php

@@ -20,7 +20,7 @@ use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 class UpdateFileContentsFormRequest extends ServerFormRequest
 {
     /**
-     * Return the permission string to validate this request aganist.
+     * Return the permission string to validate this request against.
      *
      * @return string
      */