StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

backup names don't actually matter all that much, they don't get used as file names

Browse source
This commit is contained in:
Dane Everitt 2020-04-04 12:30:29 -07:00
parent d27f0c6f2a
commit 25b0e86730
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Requests/Api/Client/Servers/Backups/StoreBackupRequest.php
View file

@ -21,7 +21,7 @@ class StoreBackupRequest extends ClientApiRequest
public function rules(): array
{
return [
'name' => 'nullable|string|max:255|regex:/^[w\][\w\s_.-]*[\w]$/',
'name' => 'nullable|string|max:255',
'ignore' => 'nullable|string',
];
}

2
app/Models/Backup.php
View file

@ -65,7 +65,7 @@ class Backup extends Model
public static $validationRules = [
'server_id' => 'bail|required|numeric|exists:servers,id',
'uuid' => 'required|uuid',
'name' => 'required|string|regex:/^[w\][\w\s_.-]*[\w]$/',
'name' => 'required|string',
'ignored_files' => 'string',
'disk' => 'required|string',
'sha256_hash' => 'nullable|string',

3
app/Services/Backups/InitiateBackupService.php
View file

@ -4,7 +4,6 @@ namespace Pterodactyl\Services\Backups;
use Ramsey\Uuid\Uuid;
use Carbon\CarbonImmutable;
use Illuminate\Support\Str;
use Pterodactyl\Models\Backup;
use Pterodactyl\Models\Server;
use Pterodactyl\Repositories\Eloquent\BackupRepository;
@ -59,7 +58,7 @@ class InitiateBackupService
$backup = $this->repository->create([
'server_id' => $server->id,
'uuid' => Uuid::uuid4()->toString(),
'name' => Str::lower(str_replace(' ', '_', trim($name))) ?: sprintf('backup_%s', CarbonImmutable::create()->format('YmdHis')),
'name' => trim($name) ?: sprintf('Backup at %s', CarbonImmutable::create()->toDateTimeString()),
'ignored_files' => $this->ignoredFiles ?? '',
'disk' => 'local',
], true, true);