Merge pull request #750 from Monota/fix-content-type

Fix content type of images for inline display.
support-project · Jun 11, 2017 · 27872bf · 27872bf
2 parents bcf8685 + f702f3a
commit 27872bf
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 10 deletions.
diff --git a/src/main/java/org/support/project/knowledge/control/open/FileControl.java b/src/main/java/org/support/project/knowledge/control/open/FileControl.java
@@ -37,6 +37,18 @@ public Boundary download() {
             LOG.debug("File binary is null. [fileNo] " + fileNo);
             return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
         }
+        if (getParam("attachment").equals("")) {
+            // 画像（PNG, JPEG, GIF）を本文内に表示する場合は attachment パラメーターが付与されていない。
+            if (entity.getFileName().toLowerCase().endsWith(".png")) {
+                return download(entity.getFileName(), entity.getFileBinary(), entity.getFileSize().longValue(), "image/png");
+            }
+            if (entity.getFileName().toLowerCase().endsWith(".jpg") || entity.getFileName().toLowerCase().endsWith(".jpeg")) {
+                return download(entity.getFileName(), entity.getFileBinary(), entity.getFileSize().longValue(), "image/jpeg");
+            }
+            if (entity.getFileName().toLowerCase().endsWith(".gif")) {
+                return download(entity.getFileName(), entity.getFileBinary(), entity.getFileSize().longValue(), "image/gif");
+            }
+        }
         return download(entity.getFileName(), entity.getFileBinary(), entity.getFileSize().longValue());
     }
 

diff --git a/src/main/java/org/support/project/knowledge/logic/SlideLogic.java b/src/main/java/org/support/project/knowledge/logic/SlideLogic.java
@@ -236,7 +236,7 @@ public DownloadInfo getSlideImage(String fileNo, String slideImage, LoginedUser
             return null;
         }
         DownloadInfo down = new DownloadInfo();
-        down.setContentType("application/octet-stream");
+        down.setContentType("image/png");
         down.setFileName(slideImage);
         down.setSize(file.length());
         down.setInputStream(new FileInputStream(file));

diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-attach-files.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-attach-files.jsp
@@ -52,10 +52,10 @@
             %>
             <div class="downloadfile <%= hide %>">
                 <div class="col-xs-6">
-                    <a href="<%=jspUtil.out("file.url")%>">
+                    <a href="<%=jspUtil.out("file.url")%>&amp;attachment=true">
                     <img src="<%=jspUtil.out("file.thumbnailUrl")%>" width="20"/> 
                     </a>
-                    <a href="<%=jspUtil.out("file.url")%>"> <%=jspUtil.out("file.name", jspUtil.ESCAPE_HTML, 100)%></a>
+                    <a href="<%=jspUtil.out("file.url")%>&amp;attachment=true"> <%=jspUtil.out("file.name", jspUtil.ESCAPE_HTML, 100)%></a>
                 </div>
             </div>
             </c:if>

diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-edit.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-edit.jsp
@@ -44,7 +44,7 @@
                         <img src="<%= jspUtil.out("file.thumbnailUrl") %>" />
                     </div>
                     <div class="file-label">
-                        <a href="<%= jspUtil.out("file.url") %>"><%= jspUtil.out("file.name") %></a>
+                        <a href="<%= jspUtil.out("file.url") %>&amp;attachment=true"><%= jspUtil.out("file.name") %></a>
                     </div>
                     <br class="fileLabelBr" /> <input type="hidden" name="files" value="<%= jspUtil.out("file.fileNo") %>" /> &nbsp;&nbsp;&nbsp;
                     <button type="button" class="btn btn-success"

diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
@@ -77,7 +77,7 @@
                 <c:forEach var="file" items="${files}">
                     <c:if test="${file.commentNo == comment.commentNo}">
                         <div class="downloadfile">
-                            <img src="<%=jspUtil.out("file.thumbnailUrl")%>" /> <a href="<%=jspUtil.out("file.url")%>"> <%=jspUtil.out("file.name")%>
+                            <img src="<%=jspUtil.out("file.thumbnailUrl")%>" /> <a href="<%=jspUtil.out("file.url")%>&amp;attachment=true"> <%=jspUtil.out("file.name")%>
                             </a>
                         </div>
                     </c:if>
@@ -148,7 +148,7 @@
                 <c:forEach var="file" items="${files}">
                     <c:if test="${file.commentNo == comment.commentNo}">
                         <div class="downloadfile">
-                            <img src="<%=jspUtil.out("file.thumbnailUrl")%>" /> <a href="<%=jspUtil.out("file.url")%>"> <%=jspUtil.out("file.name")%>
+                            <img src="<%=jspUtil.out("file.thumbnailUrl")%>" /> <a href="<%=jspUtil.out("file.url")%>&amp;attachment=true"> <%=jspUtil.out("file.name")%>
                             </a>
                         </div>
                     </c:if>

diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/edit_comment.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/edit_comment.jsp
@@ -109,7 +109,7 @@ var _SET_IMAGE_LABEL= '<%= jspUtil.label("knowledge.edit.set.image.path") %>';
         <c:forEach var="file" items="${comment_files}" >
             <div class="filediv" id="file-<%= jspUtil.out("file.fileNo") %>">
                 <div class="file-image"><img src="<%= jspUtil.out("file.thumbnailUrl") %>" /></div>
-                <div class="file-label"><a href="<%= jspUtil.out("file.url") %>"><%= jspUtil.out("file.name") %></a></div>
+                <div class="file-label"><a href="<%= jspUtil.out("file.url") %>&amp;attachment=true"><%= jspUtil.out("file.name") %></a></div>
                 <br class="fileLabelBr"/>
                 <input type="hidden" name="files" value="<%= jspUtil.out("file.fileNo") %>" />
                 &nbsp;&nbsp;&nbsp;

diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-attach.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-attach.jsp
@@ -40,7 +40,7 @@
     <c:forEach var="file" items="${files}" >
         <div class="filediv row" id="file-<%= jspUtil.out("file.fileNo") %>">
             <div class="file-image col-xs-1"><img src="<%= jspUtil.out("file.thumbnailUrl") %>" width="20"/></div>
-            <div class="file-label col-xs-6"><a href="<%= jspUtil.out("file.url") %>"><%= jspUtil.out("file.name", jspUtil.ESCAPE_HTML, 20) %></a></div>
+            <div class="file-label col-xs-6"><a href="<%= jspUtil.out("file.url") %>&amp;attachment=true"><%= jspUtil.out("file.name", jspUtil.ESCAPE_HTML, 20) %></a></div>
             <input type="hidden" name="files" value="<%= jspUtil.out("file.fileNo") %>" />
             <div class="file-buttons col-xs-4">
             <% if (jspUtil.is("image", "file.type")) { %>

diff --git a/src/main/webapp/js/knowledge-attachfile.js b/src/main/webapp/js/knowledge-attachfile.js
@@ -51,7 +51,7 @@ var uploadedFiles = function(files) {
         filediv += '</div>';
 
         filediv += '<div class="file-label col-xs-6">';
-        filediv += '<a href="' + file.url + '">';
+        filediv += '<a href="' + file.url + '&amp;attachment=true">';
         var filename = file.name;
         if (filename.length > 20) {
             filename = filename.substring(0, 17) + '...';

diff --git a/src/main/webapp/js/knowledge-view-attachfile.js b/src/main/webapp/js/knowledge-view-attachfile.js
@@ -60,7 +60,7 @@ var uploadedFiles = function(files) {
         filediv += '</div>';
 
         filediv += '<div class="file-label col-xs-6">';
-        filediv += '<a href="' + file.url + '">';
+        filediv += '<a href="' + file.url + '&amp;attachment=true">';
         var filename = file.name;
         if (filename.length > 20) {
             filename = filename.substring(0, 17) + '...';