From 45b8f3f3d6af68fddc996514771f389a0bac2ed0 Mon Sep 17 00:00:00 2001
From: mh <mh>
Date: Mon, 8 Apr 2002 01:58:55 +0000
Subject: [PATCH] send the proper content-type

---
 source/mircoders/servlet/ServletModuleImages.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java
index 0a3a3844..69e96994 100755
--- a/source/mircoders/servlet/ServletModuleImages.java
+++ b/source/mircoders/servlet/ServletModuleImages.java
@@ -64,7 +64,11 @@ public class ServletModuleImages extends ServletModuleUploadedMedia
     if (idParam!=null && !idParam.equals("")) {
       try {
         EntityImages entImage =(EntityImages)mainModule.getById(idParam);
-        res.setContentType("image/jpeg"); // testweise
+        ServletContext ctx =
+                    (ServletContext)MirConfig.getPropAsObject("ServletContext");
+        String fName = entImage.getId()+"."
+                      +entImage.getMediaType().getValue("name");
+        res.setContentType(ctx.getMimeType(fName));
         ServletOutputStream out = res.getOutputStream(); // wichtig, dass vorher kein res.getwriter() gelaufen ist
 
         byte[] outbytes = entImage.getImage();
@@ -87,7 +91,11 @@ public class ServletModuleImages extends ServletModuleUploadedMedia
     if (idParam!=null && !idParam.equals("")) {
       try {
         EntityImages entImage =(EntityImages)mainModule.getById(idParam);
-        res.setContentType("image/jpeg"); // testweise
+        ServletContext ctx =
+                    (ServletContext)MirConfig.getPropAsObject("ServletContext");
+        String fName = entImage.getId()+"."
+                      +entImage.getMediaType().getValue("name");
+        res.setContentType(ctx.getMimeType(fName));
         ServletOutputStream out = res.getOutputStream(); // wichtig, dass vorher kein res.getwriter() gelaufen ist
 
         byte[] outbytes = entImage.getIcon();
-- 
2.11.0