Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/js/chunks/7241.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/js/gravity.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/js/gravity.js": "/js/gravity.js?id=190ae9a58e8b2b35a42f",
"/js/gravity.js": "/js/gravity.js?id=921a7b108a461ea7ef26",
"/css/gravity.css": "/css/gravity.css?id=f4312103778cfc5c63f0",
"/img/audio-large.svg": "/img/audio-large.svg?id=fca6a67c7ef06d00ef4a",
"/img/audio-small.svg": "/img/audio-small.svg?id=48f5a5c5ff1cfd2cb375",
Expand Down
7 changes: 7 additions & 0 deletions resources/js/components/Fieldtypes/List/Field.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@
if (_.isEmpty(this.value)) {
this.model = []
}

else {
this.value.forEach((value, index, theValue) => {
if (typeof theValue[index] === 'string')
theValue[index] = this.new(value);
});
}
}
}
</script>
1 change: 1 addition & 0 deletions settings/cors.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
'type' => 'list',
'default' => ['api/*'],
'override' => 'cors.paths',
'required' => true,
],
[
'name' => 'Allowed Methods',
Expand Down
1 change: 1 addition & 0 deletions settings/files.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
'description' => 'List of accepted file types. Separate values by a comma.',
'type' => 'list',
'default' => ['jpg', 'jpeg', 'png', 'gif'],
'required' => true,
],
[
'name' => 'Max Filesize Upload Limit',
Expand Down
14 changes: 14 additions & 0 deletions src/Http/Controllers/API/FileManager/FileController.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,20 @@ public function store(UploadFileRequest $request, Disk $disk)
{
$attributes = $request->validated();

$extensions = setting('files.accepted_files');
$file = new FileUploader($request->file('file'));

$check = false;
foreach($extensions as $extension) {
if ($extension['value'] === $file->getExtension()) {
$check = true; break;
}
}

if ($check === false) {
abort(500, 'File extension not allowed. Allow in settings before resubmitting');
}

$file = (new FileUploader($request->file('file')))
->setDisk($disk)
->setDirectory($attributes['directory_id'])
Expand Down
9 changes: 9 additions & 0 deletions src/Services/FileUploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ public function __construct(UploadedFile $file, array $overrides = [])
$this->setDimensions();
}

/**
* Get the extension
*
* @return string
*/
public function getExtension() {
return $this->info['extension'];
}

/**
* Set Disk for File to Upload.
*
Expand Down