diff --git a/webui/src/main/java/com/muwire/webui/SearchServlet.java b/webui/src/main/java/com/muwire/webui/SearchServlet.java index a46e8c7b..c7b0a225 100644 --- a/webui/src/main/java/com/muwire/webui/SearchServlet.java +++ b/webui/src/main/java/com/muwire/webui/SearchServlet.java @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.muwire.core.Core; import com.muwire.core.InfoHash; import com.muwire.core.Persona; import com.muwire.core.search.UIResultEvent; @@ -20,6 +21,7 @@ import net.i2p.data.DataHelper; public class SearchServlet extends HttpServlet { + private Core core; private SearchManager searchManager; private ConnectionCounter connectionCounter; private DownloadManager downloadManager; @@ -92,6 +94,7 @@ public class SearchServlet extends HttpServlet { sb.append("").append(sender.toBase64()).append(""); sb.append("").append(resultsFromSender.iterator().next().getBrowse()).append(""); sb.append("").append(browseManager.isBrowsing(sender)).append(""); + sb.append("").append(core.getTrustService().getLevel(sender.getDestination())).append(""); resultsFromSender.forEach(result -> { sb.append(""); sb.append(""); @@ -148,6 +151,7 @@ public class SearchServlet extends HttpServlet { sb.append("").append(result.getSender().toBase64()).append(""); sb.append("").append(result.getBrowse()).append(""); sb.append("").append(browseManager.isBrowsing(result.getSender())).append(""); + sb.append("").append(core.getTrustService().getLevel(result.getSender().getDestination())).append(""); if (result.getComment() != null) { sb.append("") .append(Util.escapeHTMLinXML(result.getComment())) @@ -188,6 +192,7 @@ public class SearchServlet extends HttpServlet { connectionCounter = (ConnectionCounter) config.getServletContext().getAttribute("connectionCounter"); downloadManager = (DownloadManager) config.getServletContext().getAttribute("downloadManager"); browseManager = (BrowseManager) config.getServletContext().getAttribute("browseManager"); + core = (Core) config.getServletContext().getAttribute("core"); } } diff --git a/webui/src/main/js/search.js b/webui/src/main/js/search.js index 5bbde702..30730705 100644 --- a/webui/src/main/js/search.js +++ b/webui/src/main/js/search.js @@ -42,6 +42,7 @@ class ResultsBySender { this.senderB64 = xmlNode.getElementsByTagName("SenderB64")[0].childNodes[0].nodeValue; this.browse = xmlNode.getElementsByTagName("Browse")[0].childNodes[0].nodeValue; this.browsing = xmlNode.getElementsByTagName("Browsing")[0].childNodes[0].nodeValue; + this.trust = xmlNode.getElementsByTagName("Trust")[0].childNodes[0].nodeValue; this.results = new Map(); var resultNodes = xmlNode.getElementsByTagName("Result"); var i; @@ -87,6 +88,7 @@ class ResultByFile { this.senderB64 = xmlNode.getElementsByTagName("SenderB64")[0].childNodes[0].nodeValue; this.browse = xmlNode.getElementsByTagName("Browse")[0].childNodes[0].nodeValue; this.browsing = xmlNode.getElementsByTagName("Browsing")[0].childNodes[0].nodeValue; + this.trust = xmlNode.getElementsByTagName("Trust")[0].childNodes[0].nodeValue; this.comment = null; var comment = xmlNode.getElementsByTagName("Comment") if (comment.length == 1) @@ -205,7 +207,7 @@ function updateFile(fileInfoHash) { resultsFromSpan.innerHTML = "Results For "+searchResults.name; var resultsDiv = document.getElementById("bottomTable"); - var table = ""; + var table = "
SenderBrowse
"; var i; for (var [senderName, result] of searchResults.results) { table += ""; @@ -235,6 +237,7 @@ function updateFile(fileInfoHash) { table += "" } } + table += "" table += ""; } table += "
SenderBrowseTrust
" + getBrowseLink(result.senderB64) + "" + result.trust + "
"; @@ -251,7 +254,7 @@ function updateUUIDBySender(resultUUID) { currentSearchSpan.innerHTML = currentStatus.query + " Results"; var sendersDiv = document.getElementById("topTable"); - var table = ""; + var table = "
SenderBrowse
"; var x = currentSearchBySender.resultBatches; for (var [senderName, senderBatch] of x) { table += "" } + table += "" table += ""; } table += "
SenderBrowseTrust
" @@ -263,6 +266,7 @@ function updateUUIDBySender(resultUUID) { else table += "" + getBrowseLink(senderBatch.senderB64) + "" + senderBatch.trust + "
";