From 574a7677790a9cdafda0bbeba4d262abfbf3470e Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 27 Sep 2001 17:18:31 +0000 Subject: [PATCH 1/1] forgot to make ServletModuleImages use the setImage String.class hack bullshit.. --- source/mircoders/entity/EntityImages.java | 1 + source/mircoders/servlet/ServletModuleImages.java | 24 +++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java index c085a7db..f098b682 100755 --- a/source/mircoders/entity/EntityImages.java +++ b/source/mircoders/entity/EntityImages.java @@ -70,6 +70,7 @@ public class EntityImages extends AbstractEntity implements Entity //hack -mh if (imageType.equals("1")) type = 1; + //end hack if (uploadData!=null) { Connection con=null;PreparedStatement pstmt=null; diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java index b79c5dd3..ac7d7468 100755 --- a/source/mircoders/servlet/ServletModuleImages.java +++ b/source/mircoders/servlet/ServletModuleImages.java @@ -85,10 +85,10 @@ public class ServletModuleImages extends mir.servlet.ServletModule EntityImages entImage = (EntityImages)mainModule.getById(id); if (imageData!=null && fileName!=null) { - int fileType = -1; - if (contentType.equals("image/jpeg")) fileType=0; - if (contentType.equals("image/gif")) fileType=1; - if (fileType>=0) + String fileType = "-1"; + if (contentType.equals("image/jpeg")) fileType="0"; + if (contentType.equals("image/gif")) fileType="1"; + if (fileType != "-1") entImage.setImage(imageData, fileType); else theLog.printError("Wrong file uploaded!"); @@ -121,10 +121,10 @@ public class ServletModuleImages extends mir.servlet.ServletModule EntityImages entImage = (EntityImages)mainModule.getById(id); if (imageData!=null && fileName!=null) { - int fileType = -1; - if (contentType.equals("image/jpeg")) fileType=0; - if (contentType.equals("image/gif")) fileType=1; - if (fileType>=0) + String fileType = "-1"; + if (contentType.equals("image/jpeg")) fileType="0"; + if (contentType.equals("image/gif")) fileType="1"; + if (fileType != "-1") entImage.setImage(imageData, fileType); else theLog.printError("Wrong file uploaded!"); @@ -312,10 +312,10 @@ public class ServletModuleImages extends mir.servlet.ServletModule String fileName=mpReq.getFilename(); String contentType=mpReq.getContentType(); - int fileType = -1; - if (contentType.equals("image/jpeg")) fileType=0; - if (contentType.equals("image/gif")) fileType=1; - if (fileType>=0) { + String fileType = "-1"; + if (contentType.equals("image/jpeg")) fileType="0"; + if (contentType.equals("image/gif")) fileType="1"; + if (fileType != "-1") { EntityImages entImage = (EntityImages)mainModule.getById(idParam); entImage.setImage(imageData, fileType); } -- 2.11.0