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

Apply allow_indexing_format to procFileDownload()

Browse source
This commit is contained in:
mmx900 2023-06-30 21:10:01 +09:00
parent 4c73b1fa93
commit 17e14546dd
2 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/file/file.controller.php
View file

@ -400,26 +400,7 @@ class FileController extends File
$url = getNotEncodedUrl('', 'module', 'file', 'act', 'procFileOutput', 'file_srl', $file_srl, 'file_key', $file_key, 'force_download', Context::get('force_download') === 'Y' ? 'Y' : null);
}
$allow_indexing = false;
// Handles extension to allow indexing
if($file_module_config->allow_indexing_format)
{
$allow_indexing_format_array = array();
$allow_indexing_format_array = explode(',', $file_module_config->allow_indexing_format);
if(!is_array($allow_indexing_format_array)) $allow_indexing_format_array[0] = $file_module_config->allow_indexing_format;
foreach($allow_indexing_format_array as $val)
{
$val = trim($val);
if(preg_match("/\.{$val}$/i", $filename))
{
$allow_indexing = true;
break;
}
}
}
if(!$allow_indexing)
if (!FileModel::isIndexable($filename, $file_module_config))
{
header('X-Robots-Tag: noindex');
}
@ -572,7 +553,11 @@ class FileController extends File
header('Content-Length: ' . $range_length);
header('Accept-Ranges: bytes');
header('Etag: "' . $etag . '"');
header('X-Robots-Tag: noindex');
if (!FileModel::isIndexable($filename, $file_config))
{
header('X-Robots-Tag: noindex' . false);
}
// Print the file contents
for($offset = 0; $offset < $range_length; $offset += 4096)

27
modules/file/file.model.php
View file

@ -181,6 +181,33 @@ class FileModel extends File
return true;
}
/**
* Check if the file is indexable
* @param object $filename
* @param object $file_module_config
* @return bool
*/
public static function isIndexable($filename, $file_module_config)
{
if($file_module_config->allow_indexing_format)
{
$allow_indexing_format_array = array();
$allow_indexing_format_array = explode(',', $file_module_config->allow_indexing_format);
if(!is_array($allow_indexing_format_array)) $allow_indexing_format_array[0] = $file_module_config->allow_indexing_format;
foreach($allow_indexing_format_array as $val)
{
$val = trim($val);
if(preg_match("/\.{$val}$/i", $filename))
{
return true;
}
}
}
return false;
}
/**
* Check if the file is deletable
*