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

Merge branch 'hotfix/0.8.7'

pull/62/head
Zlatin Balevsky 2021-07-06 20:42:58 +01:00
parent 0f3c22ddd4 a73a7a4ad3
commit 2f1217c1b5
No known key found for this signature in database
GPG Key ID: A72832072D525E41
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webui/src/main/webapp/AboutMe.jsp
View File

@ -13,6 +13,7 @@ String pagetitle=Util._t("About Me");
String helptext = Util._t("This page shows information about your MuWire identity.");
Core core = (Core) application.getAttribute("core");
String shortId = Util.escapeHTMLinXML(core.getMe().getHumanReadableName());
%>
@ -36,7 +37,7 @@ openAccordion = 3;
</aside>
<section class="main foldermain">
<h3><%=Util._t("MuWire ID")%></h3>
<p><%=Util._t("Your short MuWire ID: {0}", core.getMe().getHumanReadableName())%></p>
<p><%=Util._t("Your short MuWire ID: {0}", shortId)%></p>
<p><%=Util._t("Your full MuWire ID:")%></p>
<p><textarea class="fullId" id="full-id" readonly><%=core.getMe().toBase64()%></textarea></p>
<p><a href='#' onclick="window.copyFullId();return false;"><%=Util._t("Copy to clipboard")%></a></p>

2
webui/src/main/webapp/BrowseHost.jsp
View File

@ -14,7 +14,7 @@ String helptext = Util._t("Use this page to browse the files shared by other MuW
String currentBrowse = null;
if (request.getParameter("currentHost") != null) {
Persona host = new Persona(new ByteArrayInputStream(Base64.decode(request.getParameter("currentHost"))));
currentBrowse = host.getHumanReadableName();
currentBrowse = Util.escapeHTMLinXML(host.getHumanReadableName());
}
%>

4
webui/src/main/webapp/FileDetails.jsp
View File

@ -11,7 +11,7 @@ String helptext = Util._t("View details about the selected shared file here.");
String path = request.getParameter("path");
File file = Util.getFromPathElements(path);
String filePath = Util.escapeHTMLinXML(file.getAbsolutePath());
%>
<html>
@ -31,7 +31,7 @@ File file = Util.getFromPathElements(path);
<%@include file="sidebar.jsi"%>
</aside>
<section class="main foldermain">
<h2><%=Util._t("Details for {0}", file.getAbsolutePath())%></h2>
<h2><%=Util._t("Details for {0}", filePath)%></h2>
<h3><%=Util._t("Search Hits")%></h3>
<div id="table-wrapper">
<div id="table-scroll">