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

Remove excess dots from filenames #1251

Browse source
This commit is contained in:
Kijin Sung 2020-04-16 17:46:39 +09:00
parent f5f2cd99e0
commit 2284fb7128
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ class FilenameFilter
// Remove excess spaces and replacement characters. // Remove excess spaces and replacement characters.
$filename = trim($filename, ' .-_'); $filename = trim($filename, ' .-_');
$filename = preg_replace('/__+/', '_', $filename); $filename = preg_replace('/__+/', '_', $filename);
$filename = preg_replace('/\.\.+/', '.', $filename);
// Clean up unnecessary encodings. // Clean up unnecessary encodings.
$filename = strtr($filename, array('&' => '&')); $filename = strtr($filename, array('&' => '&'));

4
modules/file/file.controller.php
View file

@ -388,7 +388,7 @@ class fileController extends file
// Use short URL or long URL // Use short URL or long URL
if ($file_module_config->download_short_url === 'Y' && config('use_rewrite')) if ($file_module_config->download_short_url === 'Y' && config('use_rewrite'))
{ {
$url = RX_BASEURL . sprintf('files/download/%d/%s/%s', $file_srl, $file_key, rawurlencode($filename)); $url = RX_BASEURL . sprintf('files/download/%d/%s/%s', $file_srl, $file_key, rawurlencode(preg_replace('/\.\.+/', '.', $filename)));
} }
else else
{ {
@ -411,7 +411,7 @@ class fileController extends file
$file_obj = $oFileModel->getFile($file_srl, $columnList); $file_obj = $oFileModel->getFile($file_srl, $columnList);
$file_config = $oFileModel->getFileConfig($file_obj->module_srl ?: null); $file_config = $oFileModel->getFileConfig($file_obj->module_srl ?: null);
$filesize = $file_obj->file_size; $filesize = $file_obj->file_size;
$filename = $file_obj->source_filename; $filename = preg_replace('/\.\.+/', '.', $file_obj->source_filename);
$etag = md5($file_srl . $file_key . \RX_CLIENT_IP); $etag = md5($file_srl . $file_key . \RX_CLIENT_IP);
// Check file key // Check file key