fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 09:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

MIME 타입과 지원 확장자 수정

Browse source
This commit is contained in:
conory 2019-10-04 01:12:19 +09:00
parent 3964792b8b
commit 1075b528d6
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/filters/filenamefilter.php
View file

@ -97,7 +97,7 @@ class FilenameFilter
*/ */
public static function isDirectDownload($filename) public static function isDirectDownload($filename)
{ {
if (preg_match('/\.(as[fx]|avi|flac|flv|gif|jpe?g|m4[av]|midi?|mkv|moov|mov|mp[1234]|mpe?g|og[gv]|png|qt|ram?|rmm?|wav|web[mp]|wm[av])$/i', $filename)) if (preg_match('/\.(gif|jpe?g|png|webp|mp3|wav|ogg|flac|aac|mp4|webm|ogv)$/i', $filename))
{ {
return true; return true;
} }

10
common/framework/mime.php
View file

@ -112,11 +112,13 @@ class MIME
'mp3' => ['audio/mpeg'], 'mp3' => ['audio/mpeg'],
'mpga' => ['audio/mpeg'], 'mpga' => ['audio/mpeg'],
'mp2' => ['audio/mpeg'], 'mp2' => ['audio/mpeg'],
'ogg' => ['audio/ogg'],
'wav' => ['audio/wav', 'audio/x-wav'],
'flac' => ['audio/flac'],
'aac' => ['audio/aac', 'audio/aacp', 'audio/x-hx-aac-adts'],
'aif' => ['audio/x-aiff'], 'aif' => ['audio/x-aiff'],
'aiff' => ['audio/x-aiff'], 'aiff' => ['audio/x-aiff'],
'ra' => ['audio/x-realaudio'], 'ra' => ['audio/x-realaudio'],
'wav' => ['audio/x-wav'],
'ogg' => ['audio/ogg'],
'm4a' => ['audio/x-m4a'], 'm4a' => ['audio/x-m4a'],
// Video. // Video.
@ -125,8 +127,8 @@ class MIME
'mpg' => ['video/mpeg'], 'mpg' => ['video/mpeg'],
'mpeg' => ['video/mpeg'], 'mpeg' => ['video/mpeg'],
'mpe' => ['video/mpeg'], 'mpe' => ['video/mpeg'],
'mp4' => ['video/mp4'], 'mp4' => ['video/mp4', 'audio/mp4'],
'webm' => ['video/webm'], 'webm' => ['video/webm', 'audio/webm'],
'ogv' => ['video/ogg'], 'ogv' => ['video/ogg'],
'mov' => ['video/quicktime'], 'mov' => ['video/quicktime'],
'moov' => ['video/quicktime'], 'moov' => ['video/quicktime'],

10
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -151,10 +151,10 @@
} }
if(result.error == 0) { if(result.error == 0) {
if(/\.(jpe?g|png|gif|webp)$/i.test(result.source_filename)) { if(/\.(gif|jpe?g|png|webp)$/i.test(result.source_filename)) {
temp_code += '<img src="' + result.download_url + '" alt="' + result.source_filename + '" editor_component="image_link" data-file-srl="' + result.file_srl + '" />'; temp_code += '<img src="' + result.download_url + '" alt="' + result.source_filename + '" editor_component="image_link" data-file-srl="' + result.file_srl + '" />';
} }
else if(/\.(mp3|ogg|wav)$/i.test(result.source_filename)) { else if(/\.(mp3|wav|ogg|flac|aac)$/i.test(result.source_filename)) {
temp_code += '<audio src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />'; temp_code += '<audio src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
} }
else if(/\.(mp4|webm|ogv)$/i.test(result.source_filename)) { else if(/\.(mp4|webm|ogv)$/i.test(result.source_filename)) {
@ -323,10 +323,10 @@
if(!result) return; if(!result) return;
var temp_code = ''; var temp_code = '';
if(/\.(jpe?g|png|gif|webp)$/i.test(result.source_filename)) { if(/\.(gif|jpe?g|png|webp)$/i.test(result.source_filename)) {
temp_code += '<img src="' + result.download_url + '" alt="' + result.source_filename + '" editor_component="image_link" data-file-srl="' + result.file_srl + '" />'; temp_code += '<img src="' + result.download_url + '" alt="' + result.source_filename + '" editor_component="image_link" data-file-srl="' + result.file_srl + '" />';
} }
else if(/\.(mp3|ogg|wav)$/i.test(result.source_filename)) { else if(/\.(mp3|wav|ogg|flac|aac)$/i.test(result.source_filename)) {
temp_code += '<audio src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />'; temp_code += '<audio src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
} }
else if(/\.(mp4|webm|ogv)$/i.test(result.source_filename)) { else if(/\.(mp4|webm|ogv)$/i.test(result.source_filename)) {
@ -443,7 +443,7 @@
result_image.push(template_fileimte_image(file)); result_image.push(template_fileimte_image(file));
} }
} }
else if(/\.(jpe?g|png|gif|webp)$/i.test(file.source_filename)) { else if(/\.(gif|jpe?g|png|webp)$/i.test(file.source_filename)) {
result_image.push(template_fileimte_image(file)); result_image.push(template_fileimte_image(file));
} else { } else {
result.push(template_fileimte(file)); result.push(template_fileimte(file));

2
tests/unit/framework/MIMETest.php
View file

@ -19,6 +19,8 @@ class MIMETest extends \Codeception\TestCase\Test
$this->assertEquals('mpg', Rhymix\Framework\MIME::getExtensionByType('video/mpeg')); $this->assertEquals('mpg', Rhymix\Framework\MIME::getExtensionByType('video/mpeg'));
$this->assertEquals('ogg', Rhymix\Framework\MIME::getExtensionByType('audio/ogg')); $this->assertEquals('ogg', Rhymix\Framework\MIME::getExtensionByType('audio/ogg'));
$this->assertEquals('ogv', Rhymix\Framework\MIME::getExtensionByType('video/ogg')); $this->assertEquals('ogv', Rhymix\Framework\MIME::getExtensionByType('video/ogg'));
$this->assertEquals('mp4', Rhymix\Framework\MIME::getExtensionByType('audio/mp4'));
$this->assertEquals('mp4', Rhymix\Framework\MIME::getExtensionByType('video/mp4'));
$this->assertFalse(Rhymix\Framework\MIME::getExtensionByType('application/octet-stream')); $this->assertFalse(Rhymix\Framework\MIME::getExtensionByType('application/octet-stream'));
} }
} }