From 45cbc1debcb65bb0f4153287cea17fcace93e370 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 25 Jul 2023 09:11:53 +0800 Subject: [PATCH] * Adjust for --- module/file/model.php | 42 +++++++----------------------------------- module/file/tao.php | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/module/file/model.php b/module/file/model.php index 2b478c87ce..a7185bf0f4 100755 --- a/module/file/model.php +++ b/module/file/model.php @@ -1215,6 +1215,7 @@ class fileModel extends model $sessionString = session_name() . '=' . session_id(); $uploadDate = $this->lang->file->uploadDate . substr($file->addedDate, 0, 10); $fileTitle = "  " . $file->title; + $fileSize = $this->fileTao->convertFileSize($file->size); if(strpos($file->title, ".{$file->extension}") === false && $file->extension != 'txt') $fileTitle .= ".{$file->extension}"; $imageWidth = 0; if(stripos('jpg|jpeg|gif|png|bmp', $file->extension) !== false) @@ -1223,29 +1224,6 @@ class fileModel extends model $imageWidth = $imageSize[0]; } - $fileSize = 0; - - /* Show size info. */ - if($file->size < 1024) - { - $fileSize = $file->size . 'B'; - } - elseif($file->size < 1024 * 1024) - { - $file->size = round($file->size / 1024, 2); - $fileSize = $file->size . 'K'; - } - elseif($file->size < 1024 * 1024 * 1024) - { - $file->size = round($file->size / (1024 * 1024), 2); - $fileSize = $file->size . 'M'; - } - else - { - $file->size = round($file->size / (1024 * 1024 * 1024), 2); - $fileSize = $file->size . 'G'; - } - $downloadLink = helper::createLink('file', 'download', "fileID=$file->id"); $downloadLink .= strpos($downloadLink, '?') === false ? '?' : '&'; $downloadLink .= $sessionString; @@ -1288,33 +1266,27 @@ class fileModel extends model */ public function buildFileActions(string $html, string $downloadLink, int $imageWidth, bool $showEdit, bool $showDelete, object $file, object|null $object): string { - $html .= "