update sidebar, add sidebar to shared files, <br> in comments, thanks to zzz

This commit is contained in:
Zlatin Balevsky
2019-12-07 13:36:33 +00:00
parent 0f0f46f425
commit c7f57c0b15
4 changed files with 29 additions and 12 deletions

View File

@ -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) {

View File

@ -75,8 +75,11 @@ public class SearchServlet extends HttpServlet {
sb.append(infohash);
sb.append("</InfoHash>");
sb.append("<Downloading>").append(downloadManager.isDownloading(result.getInfohash())).append("</Downloading>");
if (result.getComment() != null)
sb.append("<Comment>").append(Util.escapeHTMLinXML(result.getComment())).append("</Comment>");
if (result.getComment() != null) {
sb.append("<Comment>")
.append(Util.escapeHTMLinXML(result.getComment()).replace("\r\n", "<br>").replace("\n", "<br>"))
.append("</Comment>");
}
sb.append("</Result>");
});
sb.append("</ResultsFromSender>");
@ -107,8 +110,11 @@ public class SearchServlet extends HttpServlet {
resultSet.forEach(result -> {
sb.append("<Result>");
sb.append("<Sender>").append(Util.escapeHTMLinXML(result.getSender().getHumanReadableName())).append("</Sender>");
if (result.getComment() != null)
sb.append("<Comment>").append(Util.escapeHTMLinXML(result.getComment())).append("</Comment>");
if (result.getComment() != null) {
sb.append("<Comment>")
.append(Util.escapeHTMLinXML(result.getComment()).replace("\r\n", "<br>").replace("\n", "<br>"))
.append("</Comment>");
}
sb.append("</Result>");
});
sb.append("</ResultsForFile>");

View File

@ -2,7 +2,7 @@
pageEncoding="UTF-8"%>
<%@include file="initcode.jsi"%>
<% String pagetitle="Files"; %>
<% String pagetitle="Shared Files"; %>
<html>
<head>
@ -11,6 +11,20 @@
</head>
<body onload="initConnectionsCount(); initFiles();">
<%@ include file="header.jsi"%>
<aside>
<div class="menubox-divider"></div>
<div class="menubox">
<h2>Share</h2>
<form action="/MuWire/Files" method="post">
<input type="text" name="file">
<input type="hidden" name="action" value="share">
<input type="submit" value="Share">
</form>
</div>
<div class="menubox-divider"></div>
<%@include file="sidebar.jsi"%>
</aside>
<section class="main foldermain">
<p>Shared Files <span id="count">0</span></p>
<p><span id="hashing"></span></p>
<hr/>
@ -18,10 +32,6 @@
<div id="root"></div>
</ul>
<hr/>
<form action="/MuWire/Files" method="post">
<input type="text" name="file">
<input type="hidden" name="action" value="share">
<input type="submit" value="Share">
</form>
</section>
</body>
</html>
</html>

View File

@ -9,6 +9,7 @@
<h2>Pages</h2>
<a class="menuitem" href="Downloads.jsp">Downloads</a>
<a class="menuitem" href="Home.jsp">Search</a>
<a class="menuitem" href="SharedFiles.jsp">Shared Files</a>
</div>
<div class="menubox-divider"></div>
<div class="menubox">