From c7f57c0b15bf4b96368afd78b4b99768842a53ad Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Sat, 7 Dec 2019 13:36:33 +0000 Subject: [PATCH] update sidebar, add sidebar to shared files,
in comments, thanks to zzz --- .../java/com/muwire/webui/FilesServlet.java | 2 +- .../java/com/muwire/webui/SearchServlet.java | 14 +++++++---- webui/src/main/webapp/SharedFiles.jsp | 24 +++++++++++++------ webui/src/main/webapp/sidebar.jsi | 1 + 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/webui/src/main/java/com/muwire/webui/FilesServlet.java b/webui/src/main/java/com/muwire/webui/FilesServlet.java index b52ed05e..c6effd39 100644 --- a/webui/src/main/java/com/muwire/webui/FilesServlet.java +++ b/webui/src/main/java/com/muwire/webui/FilesServlet.java @@ -113,7 +113,7 @@ public class FilesServlet extends HttpServlet { return; } fileManager.share(file); - resp.sendRedirect("/MuWire/Files.jsp"); + resp.sendRedirect("/MuWire/SharedFiles.jsp"); } else if (action.equals("unshare")) { String pathElements = req.getParameter("path"); if (pathElements == null) { diff --git a/webui/src/main/java/com/muwire/webui/SearchServlet.java b/webui/src/main/java/com/muwire/webui/SearchServlet.java index 683dbf27..11a97df8 100644 --- a/webui/src/main/java/com/muwire/webui/SearchServlet.java +++ b/webui/src/main/java/com/muwire/webui/SearchServlet.java @@ -75,8 +75,11 @@ public class SearchServlet extends HttpServlet { sb.append(infohash); sb.append(""); sb.append("").append(downloadManager.isDownloading(result.getInfohash())).append(""); - if (result.getComment() != null) - sb.append("").append(Util.escapeHTMLinXML(result.getComment())).append(""); + if (result.getComment() != null) { + sb.append("") + .append(Util.escapeHTMLinXML(result.getComment()).replace("\r\n", "
").replace("\n", "
")) + .append(""); + } sb.append(""); }); sb.append(""); @@ -107,8 +110,11 @@ public class SearchServlet extends HttpServlet { resultSet.forEach(result -> { sb.append(""); sb.append("").append(Util.escapeHTMLinXML(result.getSender().getHumanReadableName())).append(""); - if (result.getComment() != null) - sb.append("").append(Util.escapeHTMLinXML(result.getComment())).append(""); + if (result.getComment() != null) { + sb.append("") + .append(Util.escapeHTMLinXML(result.getComment()).replace("\r\n", "
").replace("\n", "
")) + .append(""); + } sb.append(""); }); sb.append(""); diff --git a/webui/src/main/webapp/SharedFiles.jsp b/webui/src/main/webapp/SharedFiles.jsp index 55e72aea..f94be8a2 100644 --- a/webui/src/main/webapp/SharedFiles.jsp +++ b/webui/src/main/webapp/SharedFiles.jsp @@ -2,7 +2,7 @@ pageEncoding="UTF-8"%> <%@include file="initcode.jsi"%> -<% String pagetitle="Files"; %> +<% String pagetitle="Shared Files"; %> @@ -11,6 +11,20 @@ <%@ include file="header.jsi"%> + +

Shared Files 0

@@ -18,10 +32,6 @@
-
- - - -
+
- \ No newline at end of file + diff --git a/webui/src/main/webapp/sidebar.jsi b/webui/src/main/webapp/sidebar.jsi index 7487e77c..2f33b505 100644 --- a/webui/src/main/webapp/sidebar.jsi +++ b/webui/src/main/webapp/sidebar.jsi @@ -9,6 +9,7 @@

Pages

Downloads Search + Shared Files