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

Support using pipe characters within egg validation rules; closes #1960

Browse source
This commit is contained in:
Dane Everitt 2020-05-07 20:40:19 -07:00
parent 69eb33fb89
commit 49dee28eb8
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Services/Eggs/Variables/VariableUpdateService.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Services\Eggs\Variables; namespace Pterodactyl\Services\Eggs\Variables;
use Illuminate\Support\Str;
use Pterodactyl\Models\EggVariable; use Pterodactyl\Models\EggVariable;
use Illuminate\Contracts\Validation\Factory; use Illuminate\Contracts\Validation\Factory;
use Pterodactyl\Exceptions\DisplayException; use Pterodactyl\Exceptions\DisplayException;
@ -81,7 +82,11 @@ class VariableUpdateService
} }
if (! empty($data['rules'] ?? '')) { if (! empty($data['rules'] ?? '')) {
$this->validateRules($data['rules']); $this->validateRules(
(is_string($data['rules']) && Str::contains($data['rules'], ';;'))
? explode(';;', $data['rules'])
: $data['rules']
);
} }
$options = array_get($data, 'options') ?? []; $options = array_get($data, 'options') ?? [];