Merge pull request #2362 from wizardeur/file-mimetype-fix

A fix for mime types handling
Leantime · Mar 1, 2024 · 9329cb0 · 9329cb0
2 parents c9a2fe1 + a271d23
commit 9329cb0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/Domain/Files/Controllers/Get.php b/app/Domain/Files/Controllers/Get.php
@@ -81,15 +81,19 @@ private function getFileLocally($encName, $ext, $module, $realName): Response
                 $path_parts = pathinfo($fullPath);
 
                 if ($ext == 'pdf') {
+                    $mime_type = 'application/pdf';
                     header('Content-type: application/pdf');
                     header("Content-Disposition: inline; filename=\"" . $realName . "." . $ext . "\"");
                 } elseif ($ext == 'jpg' || $ext == 'jpeg' || $ext == 'gif' || $ext == 'png') {
+                    $mime_type = $mimes[$ext];
                     header('Content-type: ' . $mimes[$ext]);
                     header('Content-disposition: inline; filename="' . $realName . "." . $ext . '";');
                 } elseif ($ext == 'svg') {
+                    $mime_type = 'image/svg+xml';
                     header('Content-type: image/svg+xml');
                     header('Content-disposition: attachment; filename="' . $realName . "." . $ext . '";');
                 } else {
+                    $mime_type = 'application/octet-stream';
                     header("Content-type: application/octet-stream");
                     header("Content-Disposition: filename=\"" . $realName . "." . $ext . "\"");
                 }
@@ -102,7 +106,7 @@ private function getFileLocally($encName, $ext, $module, $realName): Response
 
 
                 $oStreamResponse = new StreamedResponse();
-                $oStreamResponse->headers->set("Content-Type", $mimes[$ext] );
+                $oStreamResponse->headers->set("Content-Type", $mime_type );
                 $oStreamResponse->headers->set("Content-Length", $sFileSize);
                 $oStreamResponse->headers->set("ETag", $sEtag);