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

Remove unnecessary arguments and deprecated function calls

Browse source 
- Originally committed on April 3, 2022
This commit is contained in:
Kijin Sung 2022-12-26 16:24:27 +09:00
parent 17279c264b
commit b00f8b63d1
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/file/file.admin.model.php
View file

@ -114,7 +114,7 @@ class fileAdminModel extends file
{ {
$file->isCarted = false; $file->isCarted = false;
} }
$file->download_url = FileModel::getDownloadUrl($file->file_srl, $file->sid, $file->module_srl, $file->source_filename); $file->download_url = FileModel::getDownloadUrl($file->file_srl, $file->sid, 0, $file->source_filename);
$output->data[$key] = $file; $output->data[$key] = $file;
} }

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

@ -158,7 +158,7 @@ class fileController extends file
} }
else else
{ {
$this->add('download_url', FileModel::getDownloadUrl($output->get('file_srl'), $output->get('sid'), $module_srl, $output->get('source_filename'))); $this->add('download_url', FileModel::getDownloadUrl($output->get('file_srl'), $output->get('sid'), 0, $output->get('source_filename')));
} }
} }
@ -305,7 +305,7 @@ class fileController extends file
} }
// Not allow the file outlink // Not allow the file outlink
$file_module_config = FileModel::getFileModuleConfig($file_obj->module_srl); $file_module_config = FileModel::getFileConfig($file_obj->module_srl);
if($file_module_config->allow_outlink == 'N' && $_SERVER["HTTP_REFERER"]) if($file_module_config->allow_outlink == 'N' && $_SERVER["HTTP_REFERER"])
{ {
// Handles extension to allow outlink // Handles extension to allow outlink

14
modules/file/file.model.php
View file

@ -251,11 +251,11 @@ class fileModel extends file
* *
* @param int $file_srl The sequence of file to get url * @param int $file_srl The sequence of file to get url
* @param string $sid * @param string $sid
* @param int $module_srl (unused) * @param int $unused (unused)
* @param string $source_filename * @param string $source_filename
* @return string Returns a url * @return string Returns a url
*/ */
public static function getDownloadUrl($file_srl, $sid, $module_srl = 0, $source_filename = null) public static function getDownloadUrl($file_srl, $sid, $unused = 0, $source_filename = null)
{ {
if ($source_filename && config('use_rewrite') && self::getFileConfig()->download_short_url === 'Y') if ($source_filename && config('use_rewrite') && self::getFileConfig()->download_short_url === 'Y')
{ {
@ -348,7 +348,7 @@ class fileModel extends file
if(count($output->data) == 1) if(count($output->data) == 1)
{ {
$file = $output->data[0]; $file = $output->data[0];
$file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, $file->module_srl, $file->source_filename); $file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, 0, $file->source_filename);
return $file; return $file;
} }
@ -361,7 +361,7 @@ class fileModel extends file
foreach($output->data as $key=>$value) foreach($output->data as $key=>$value)
{ {
$file = $value; $file = $value;
$file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, $file->module_srl, $file->source_filename); $file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, 0, $file->source_filename);
$fileList[] = $file; $fileList[] = $file;
} }
} }
@ -393,7 +393,7 @@ class fileModel extends file
foreach ($output->data as $file) foreach ($output->data as $file)
{ {
$file->source_filename = escape($file->source_filename, false); $file->source_filename = escape($file->source_filename, false);
$file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, $file->module_srl, $file->source_filename); $file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, 0, $file->source_filename);
$fileList[] = $file; $fileList[] = $file;
} }
return $fileList; return $fileList;
@ -452,6 +452,8 @@ class fileModel extends file
/** /**
* method for compatibility * method for compatibility
*
* @deprecated
*/ */
public static function getFileModuleConfig($module_srl) public static function getFileModuleConfig($module_srl)
{ {
@ -460,6 +462,8 @@ class fileModel extends file
/** /**
* method for compatibility * method for compatibility
*
* @deprecated
*/ */
public static function getFileGrant($file_info, $member_info) public static function getFileGrant($file_info, $member_info)
{ {

2
modules/file/tpl/iframe.html
View file

@ -13,7 +13,7 @@
<!--@if($uploaded_fileinfo->get('direct_download') === 'Y')--> <!--@if($uploaded_fileinfo->get('direct_download') === 'Y')-->
uploaded_fileinfo.download_url = '{FileModel::getDirectFileUrl($uploaded_fileinfo->get("uploaded_filename"))}'; uploaded_fileinfo.download_url = '{FileModel::getDirectFileUrl($uploaded_fileinfo->get("uploaded_filename"))}';
<!--@else--> <!--@else-->
uploaded_fileinfo.download_url = '{FileModel::getDownloadUrl($uploaded_fileinfo->get("file_srl"), $uploaded_fileinfo->get("sid"), $module_srl, $uploaded_fileinfo->get("source_filename"))}'; uploaded_fileinfo.download_url = '{FileModel::getDownloadUrl($uploaded_fileinfo->get("file_srl"), $uploaded_fileinfo->get("sid"), 0, $uploaded_fileinfo->get("source_filename"))}';
<!--@end--> <!--@end-->
uploaded_fileinfo.thumbnail_filename = '{$uploaded_fileinfo->get("thumbnail_filename")}'; uploaded_fileinfo.thumbnail_filename = '{$uploaded_fileinfo->get("thumbnail_filename")}';
uploaded_fileinfo.original_type = '{$uploaded_fileinfo->get("original_type")}'; uploaded_fileinfo.original_type = '{$uploaded_fileinfo->get("original_type")}';