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
11 changes: 11 additions & 0 deletions config/assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,17 @@

'additional_uploadable_extensions' => [],

/*
|--------------------------------------------------------------------------
| Additional Filename Character Replacements
|--------------------------------------------------------------------------
|
| When uploading files, replace filenames that contain these characters.
|
*/

'additional_filename_replacements' => [],

/*
|--------------------------------------------------------------------------
| SVG Sanitization
Expand Down
4 changes: 2 additions & 2 deletions src/Assets/AssetUploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ protected function getNewExtension()

public static function getSafeFilename($string)
{
$replacements = [
$replacements = array_merge([
' ' => '-',
'#' => '-',
':' => '-',
Expand All @@ -95,7 +95,7 @@ public static function getSafeFilename($string)
'%' => '-',
"'" => '-',
'--' => '-',
];
], config('statamic.assets.additional_filename_replacements', []));

return (string) Str::of(urldecode($string))
->replace(array_keys($replacements), array_values($replacements))
Expand Down
13 changes: 12 additions & 1 deletion tests/Assets/AssetUploaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ class AssetUploaderTest extends TestCase
{
#[Test]
#[DataProvider('filenameReplacementsProvider')]
public function it_gets_safe_filename($originalFilename, $expectedFilename)
public function it_gets_safe_filename($originalFilename, $expectedFilename, $config = [])
{
config(['statamic.assets.additional_filename_replacements' => $config]);
$this->assertEquals($expectedFilename, AssetUploader::getSafeFilename($originalFilename));
}

Expand All @@ -34,6 +35,16 @@ public static function filenameReplacementsProvider()
'single quote' => ["one'two'three.jpg", 'one-two-three.jpg'],
'double dash' => ['one--two--three.jpg', 'one-two-three.jpg'],
'ascii' => ['fòô-bàř', 'foo-bar'],
'additional config' => [
'one,two%three-(6)',
'onetwo_three-6',
[
',' => '',
'(' => '',
')' => '',
'%' => '_',
],
],
];
}
}
Loading