goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/34/head
Zlatin Balevsky 2019-12-07 13:36:33 +00:00
parent 0f0f46f425
commit c7f57c0b15
4 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webui/src/main/java/com/muwire/webui/FilesServlet.java
View File

@ -113,7 +113,7 @@ public class FilesServlet extends HttpServlet {
return; return;
} }
fileManager.share(file); fileManager.share(file);
resp.sendRedirect("/MuWire/Files.jsp"); resp.sendRedirect("/MuWire/SharedFiles.jsp");
} else if (action.equals("unshare")) { } else if (action.equals("unshare")) {
String pathElements = req.getParameter("path"); String pathElements = req.getParameter("path");
if (pathElements == null) { if (pathElements == null) {

14
webui/src/main/java/com/muwire/webui/SearchServlet.java
View File

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

22
webui/src/main/webapp/SharedFiles.jsp
View File

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

1
webui/src/main/webapp/sidebar.jsi
View File

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