diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 3706d9c28..a76b7808d 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -114,7 +114,7 @@ class fileAdminModel extends file { $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; } diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 1c7af1be2..b3e6fdca5 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -158,7 +158,7 @@ class fileController extends file } 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 - $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"]) { // Handles extension to allow outlink diff --git a/modules/file/file.model.php b/modules/file/file.model.php index e6be2882b..091fd3ddf 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -251,11 +251,11 @@ class fileModel extends file * * @param int $file_srl The sequence of file to get url * @param string $sid - * @param int $module_srl (unused) + * @param int $unused (unused) * @param string $source_filename * @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') { @@ -348,7 +348,7 @@ class fileModel extends file if(count($output->data) == 1) { $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; } @@ -361,7 +361,7 @@ class fileModel extends file foreach($output->data as $key=>$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; } } @@ -393,7 +393,7 @@ class fileModel extends file foreach ($output->data as $file) { $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; } return $fileList; @@ -452,6 +452,8 @@ class fileModel extends file /** * method for compatibility + * + * @deprecated */ public static function getFileModuleConfig($module_srl) { @@ -460,6 +462,8 @@ class fileModel extends file /** * method for compatibility + * + * @deprecated */ public static function getFileGrant($file_info, $member_info) { diff --git a/modules/file/tpl/iframe.html b/modules/file/tpl/iframe.html index 4a31000a8..6fecde816 100644 --- a/modules/file/tpl/iframe.html +++ b/modules/file/tpl/iframe.html @@ -13,7 +13,7 @@ uploaded_fileinfo.download_url = '{FileModel::getDirectFileUrl($uploaded_fileinfo->get("uploaded_filename"))}'; - 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"))}'; uploaded_fileinfo.thumbnail_filename = '{$uploaded_fileinfo->get("thumbnail_filename")}'; uploaded_fileinfo.original_type = '{$uploaded_fileinfo->get("original_type")}';