Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-15 08:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix word/spreadsheet icon rendering

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-02-08 18:47:59 +01:00
parent 98942d585f
commit c33a9950c3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Models/UploadFile.php
View File

@ -18,6 +18,7 @@ namespace Modules\Media\Models;
use phpOMS\Log\FileLogger; use phpOMS\Log\FileLogger;
use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\System\File\Local\File;
/** /**
* Upload. * Upload.
@ -118,9 +119,13 @@ class UploadFile
$this->outputDir = $this->findOutputDir(); $this->outputDir = $this->findOutputDir();
} }
$path = empty($this->outputDir) ? $f['tmp_name'] : $this->outputDir; $path = $this->outputDir;
foreach ($files as $key => $f) { foreach ($files as $key => $f) {
if ($path === '') {
$path = File::dirpath($f['tmp_name']);
}
$result[$key] = []; $result[$key] = [];
$result[$key]['status'] = UploadStatus::OK; $result[$key]['status'] = UploadStatus::OK;
@ -158,7 +163,6 @@ class UploadFile
$result[$key]['filename'] = $this->fileName; $result[$key]['filename'] = $this->fileName;
} }
// @todo: find a way to allow upload to default temp directory, maybe check if $path is empty, if empty don't change directory, just keep it in the temp directory
if (empty($this->fileName) || \is_file($path . '/' . $this->fileName)) { if (empty($this->fileName) || \is_file($path . '/' . $this->fileName)) {
try { try {
$this->fileName = $this->createFileName($path, $f['tmp_name'], $extension); $this->fileName = $this->createFileName($path, $f['tmp_name'], $extension);
@ -223,7 +227,7 @@ class UploadFile
//FileUtils::changeFileEncoding($dest, $encoding); //FileUtils::changeFileEncoding($dest, $encoding);
}*/ }*/
$result[$key]['path'] = $this->outputDir === '' ? $f['tmp_name'] : \realpath($this->outputDir); $result[$key]['path'] = $path;
} }
return $result; return $result;

4
Theme/Backend/template-functions.php
View File

@ -21,7 +21,7 @@ $fileIconFunction = function (int $extensionType) : string
} elseif ($extensionType === ExtensionType::TEXT || $extensionType === ExtensionType::WORD) { } elseif ($extensionType === ExtensionType::TEXT || $extensionType === ExtensionType::WORD) {
return 'file-text'; return 'file-text';
} elseif ($extensionType === ExtensionType::PRESENTATION) { } elseif ($extensionType === ExtensionType::PRESENTATION) {
return 'file-powerpoint'; return 'file-powerpoint-o';
} elseif ($extensionType === ExtensionType::PDF) { } elseif ($extensionType === ExtensionType::PDF) {
return 'file-pdf-o'; return 'file-pdf-o';
} elseif ($extensionType === ExtensionType::ARCHIVE) { } elseif ($extensionType === ExtensionType::ARCHIVE) {
@ -33,7 +33,7 @@ $fileIconFunction = function (int $extensionType) : string
} elseif ($extensionType === ExtensionType::IMAGE) { } elseif ($extensionType === ExtensionType::IMAGE) {
return 'file-image-o'; return 'file-image-o';
} elseif ($extensionType === ExtensionType::SPREADSHEET) { } elseif ($extensionType === ExtensionType::SPREADSHEET) {
return 'file-excel'; return 'file-excel-o';
} elseif ($extensionType === ExtensionType::DIRECTORY) { } elseif ($extensionType === ExtensionType::DIRECTORY) {
return 'folder-open'; return 'folder-open';
} }