From c33a9950c3b6deb11d7a4c8d4adcc9d04ec43bdc Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Mon, 8 Feb 2021 18:47:59 +0100
Subject: [PATCH] fix word/spreadsheet icon rendering

---
 Models/UploadFile.php                | 10 +++++++---
 Theme/Backend/template-functions.php |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index d8a21d0..83bc015 100755
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -18,6 +18,7 @@ namespace Modules\Media\Models;
 
 use phpOMS\Log\FileLogger;
 use phpOMS\System\File\Local\Directory;
+use phpOMS\System\File\Local\File;
 
 /**
  * Upload.
@@ -118,9 +119,13 @@ class UploadFile
             $this->outputDir = $this->findOutputDir();
         }
 
-        $path = empty($this->outputDir) ? $f['tmp_name'] : $this->outputDir;
+        $path = $this->outputDir;
 
         foreach ($files as $key => $f) {
+            if ($path === '') {
+                $path = File::dirpath($f['tmp_name']);
+            }
+
             $result[$key]           = [];
             $result[$key]['status'] = UploadStatus::OK;
 
@@ -158,7 +163,6 @@ class UploadFile
                 $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)) {
                 try {
                     $this->fileName           = $this->createFileName($path, $f['tmp_name'], $extension);
@@ -223,7 +227,7 @@ class UploadFile
                 //FileUtils::changeFileEncoding($dest, $encoding);
             }*/
 
-            $result[$key]['path'] = $this->outputDir === '' ? $f['tmp_name'] : \realpath($this->outputDir);
+            $result[$key]['path'] = $path;
         }
 
         return $result;
diff --git a/Theme/Backend/template-functions.php b/Theme/Backend/template-functions.php
index dac982a..1583657 100755
--- a/Theme/Backend/template-functions.php
+++ b/Theme/Backend/template-functions.php
@@ -21,7 +21,7 @@ $fileIconFunction = function (int $extensionType) : string
     } elseif ($extensionType === ExtensionType::TEXT || $extensionType === ExtensionType::WORD) {
         return 'file-text';
     } elseif ($extensionType === ExtensionType::PRESENTATION) {
-        return 'file-powerpoint';
+        return 'file-powerpoint-o';
     } elseif ($extensionType === ExtensionType::PDF) {
         return 'file-pdf-o';
     } elseif ($extensionType === ExtensionType::ARCHIVE) {
@@ -33,7 +33,7 @@ $fileIconFunction = function (int $extensionType) : string
     } elseif ($extensionType === ExtensionType::IMAGE) {
         return 'file-image-o';
     } elseif ($extensionType === ExtensionType::SPREADSHEET) {
-        return 'file-excel';
+        return 'file-excel-o';
     } elseif ($extensionType === ExtensionType::DIRECTORY) {
         return 'folder-open';
     }