diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 33360f5b7..5bd02db15 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -92,7 +92,7 @@ class fileAdminModel extends file if($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true; else $file->isCarted = false; - $file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid); + $file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); $output->data[$key] = $file; } diff --git a/modules/file/file.model.php b/modules/file/file.model.php index c9d4587ec..bf2295ad8 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -46,7 +46,7 @@ class fileModel extends file $obj->source_filename = $file_info->source_filename; $obj->file_size = $file_info->file_size; $obj->disp_file_size = FileHandler::filesize($file_info->file_size); - if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid); + if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl); else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename); $obj->direct_download = $file_info->direct_download; $files[] = $obj; @@ -95,9 +95,9 @@ class fileModel extends file * @param string $sid * @return string Returns a url */ - function getDownloadUrl($file_srl, $sid) + function getDownloadUrl($file_srl, $sid, $module_srl="") { - return sprintf('?module=%s&act=%s&file_srl=%s&sid=%s', 'file', 'procFileDownload', $file_srl, $sid); + return sprintf('?module=%s&act=%s&file_srl=%s&sid=%s&module_srl=%s', 'file', 'procFileDownload', $file_srl, $sid, $module_srl); } /** @@ -164,7 +164,7 @@ class fileModel extends file if(count($output->data) == 1) { $file = $output->data[0]; - $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid); + $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); return $file; } @@ -177,7 +177,7 @@ class fileModel extends file foreach($output->data as $key=>$value) { $file = $value; - $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid); + $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); $fileList[] = $file; } } @@ -211,7 +211,7 @@ class fileModel extends file { $file = $file_list[$i]; $file->source_filename = stripslashes($file->source_filename); - $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid); + $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); $file_list[$i] = $file; }