idk/muwire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove jsp from urls, thanks to zzz

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-12-08 13:45:26 +00:00
parent 1325a8dc65
commit 2ec15cfbbc
12 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plug/templates/plugin.config.template
View File

@@ -10,6 +10,6 @@ min-i2p-version=${i2pVersion}
min-java-version=11
consoleLinkName=MuWire
consoleLinkTooltip=Anonymous File Sharing
consoleLinkURL=/MuWire/index.jsp
consoleLinkURL=/MuWire/
console-icon=images/muwire.png
<% println "date="+System.currentTimeMillis() %>

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

@@ -128,6 +128,6 @@ public class DownloadServlet extends HttpServlet {
downloadManager.cancel(infoHash);
}
// P-R-G
resp.sendRedirect("/MuWire/Downloads.jsp");
resp.sendRedirect("/MuWire/Downloads");
}
}

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

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

4
webui/src/main/java/com/muwire/webui/MuWireServlet.java
View File

@@ -48,7 +48,7 @@ public class MuWireServlet extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
if (client.needsMWInit()) {
resp.sendRedirect("/MuWire/MuWire.jsp");
resp.sendRedirect("/MuWire/MuWire");
} else {
if (client.getCore() == null) {
resp.setContentType("text/html");
@@ -71,7 +71,7 @@ public class MuWireServlet extends HttpServlet {
"</body></html>");
resp.setIntHeader("Refresh", 5);
} else
resp.sendRedirect("/MuWire/Home.jsp");
resp.sendRedirect("/MuWire/Home");
}
}

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

@@ -32,7 +32,7 @@ public class SearchServlet extends HttpServlet {
}
String search = req.getParameter("search");
searchManager.newSearch(search);
resp.sendRedirect("/MuWire/Home.jsp");
resp.sendRedirect("/MuWire/Home");
}

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

@@ -32,10 +32,10 @@
<div class="menubox">
<% if (groupBy.equals("sender")) { %>
<h2><%=Util._t("Active Searches By Sender")%></h2>
<a class="menuitem" href="Home.jsp?groupBy=file"><%=Util._t("Group By File")%></a>
<a class="menuitem" href="Home?groupBy=file"><%=Util._t("Group By File")%></a>
<% } else { %>
<h2><%=Util._t("Active Searches By File")%></h2>
<a class="menuitem" href="Home.jsp?groupBy=sender"><%=Util._t("Group By Sender")%></a>
<a class="menuitem" href="Home?groupBy=sender"><%=Util._t("Group By Sender")%></a>
<% } %>
</div>

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

@@ -18,7 +18,7 @@
%>
<p><%=Util._t("Welcome to MuWire! Please select a nickname and download locations")%></p>
<form action="/MuWire/init.jsp" method="post">
<form action="/MuWire/init" method="post">
<%=Util._t("Nickname")%>:
<input type="text" name="nickname"><br>
<%=Util._t("Directory for saving downloaded files")%>:

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

@@ -35,9 +35,9 @@ if (viewAs == null)
<input type="submit" value="<%=Util._t("Share")%>">
</form>
<% if (viewAs.equals("tree")) { %>
<a class="menuitem" href="SharedFiles.jsp?viewAs=table"><%=Util._t("View As Table")%></a>
<a class="menuitem" href="SharedFiles?viewAs=table"><%=Util._t("View As Table")%></a>
<% } else { %>
<a class="menuitem" href="SharedFiles.jsp?viewAs=tree"><%=Util._t("View As Tree")%></a>
<a class="menuitem" href="SharedFiles?viewAs=tree"><%=Util._t("View As Tree")%></a>
<% } %>
</div>
<div class="menubox-divider"></div>

2
webui/src/main/webapp/header.jsi
View File

@@ -1,6 +1,6 @@
<header class="titlebar">
<div class="title">
<a href="Home.jsp"><img src="images/muwire.png" alt=""></a>
<a href="Home"><img src="images/muwire.png" alt=""></a>
<br><%=Util._t("Welcome to MuWire")%>
</div>
<div class="subtitle">

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

@@ -19,6 +19,6 @@
client.initMWProps(nickname, new File(downloadLocation), new File(incompleteLocation));
client.start();
%>
<c:redirect url="/index.jsp"/>
<c:redirect url="/index"/>
</body>
</html>

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

@@ -7,15 +7,15 @@
<div class="menubox-divider"></div>
<div class="menubox">
<h2><%=Util._t("Pages")%></h2>
<a class="menuitem" href="Downloads.jsp"><%=Util._t("Downloads")%></a>
<a class="menuitem" href="Home.jsp"><%=Util._t("Search")%></a>
<a class="menuitem" href="SharedFiles.jsp"><%=Util._t("Shared Files")%></a>
<a class="menuitem" href="BrowseHost.jsp">Util._t("Browse")</a>
<a class="menuitem" href="Downloads"><%=Util._t("Downloads")%></a>
<a class="menuitem" href="Home"><%=Util._t("Search")%></a>
<a class="menuitem" href="SharedFiles"><%=Util._t("Shared Files")%></a>
<a class="menuitem" href="BrowseHost"><%=Util._t("Browse")%></a>
</div>
<div class="menubox-divider"></div>
<div class="menubox">
<h2><%=Util._t("Configuration")%></h2>
<a class="menuitem settings" href="settings.jsp">
<a class="menuitem settings" href="settings">
<div class="menu-icon"></div>
<div class="menu-text"><%=Util._t("Settings")%></div>
</a>
@@ -23,7 +23,7 @@
<div class="menubox-divider"></div>
<div class="menubox">
<h2><%=Util._t("Help")%></h2>
<a class="menuitem" href="userGuide.jsp"><%=Util._t("User Guide")%></a>
<a class="menuitem" href="faq.jsp"><%=Util._t("FAQ")%></a>
<a class="menuitem" href="about.jsp"><%=Util._t("About")%></a>
<a class="menuitem" href="userGuide"><%=Util._t("User Guide")%></a>
<a class="menuitem" href="faq"><%=Util._t("FAQ")%></a>
<a class="menuitem" href="about"><%=Util._t("About")%></a>
</div>

45
webui/templates/web.xml.template
View File

@@ -63,4 +63,49 @@
__JASPER__
<!--
Mappings without the .jsp suffix
-->
<servlet-mapping>
<servlet-name>com.muwire.webui.MuWireServlet</servlet-name>
<!-- empty pattern handles the root -->
<url-pattern></url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.MuWireServlet</servlet-name>
<url-pattern>/index</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.BrowseHost_jsp</servlet-name>
<url-pattern>/BrowseHost</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.Downloads_jsp</servlet-name>
<url-pattern>/Downloads</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.Home_jsp</servlet-name>
<url-pattern>/Home</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.MuWire_jsp</servlet-name>
<url-pattern>/MuWire</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.SharedFiles_jsp</servlet-name>
<url-pattern>/SharedFiles</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.init_jsp</servlet-name>
<url-pattern>/init</url-pattern>
</servlet-mapping>
</web-app>