I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge of '5e3805e16ba810425b936134bb3ea92c08a8b0eb'

Browse Source 
and 'f232d5bc50d8723d65c9fcb1092ebcb8333a83e4'
This commit is contained in:
zzz
2009-07-11 19:16:04 +00:00
parent 02fc700ac0 dbb9eefe70
commit 9af239aa65
71 changed files with 1890 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/i2ptunnel/jsp/index.jsp
View File

@ -6,7 +6,8 @@
<head>
<title>I2PTunnel Webmanager - List</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta htt
p-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<% if (indexBean.allowCSS()) {
@ -17,7 +18,7 @@
%>
</head>
<body id="tunnelListPage">
<div id="pageHeader">
<div id="pageHeader">
</div>
<div id="statusMessagePanel" class="panel">

2
apps/routerconsole/jsp/config.jsp
View File

@ -11,7 +11,7 @@
<jsp:useBean class="net.i2p.router.web.ConfigNetHelper" id="nethelper" scope="request" />
<jsp:setProperty name="nethelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<h1>I2P Network Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

2
apps/routerconsole/jsp/configadvanced.jsp
View File

@ -13,7 +13,9 @@
<jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" />
<jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<h1>I2P Advanced Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
<jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" />

2
apps/routerconsole/jsp/configclients.jsp
View File

@ -17,7 +17,7 @@ button span.hide{
<jsp:useBean class="net.i2p.router.web.ConfigClientsHelper" id="clientshelper" scope="request" />
<jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<h1>I2P Client Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

2
apps/routerconsole/jsp/configkeyring.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Keyring Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

2
apps/routerconsole/jsp/configlogging.jsp
View File

@ -11,7 +11,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Logging Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

3
apps/routerconsole/jsp/confignav.jsp
View File

@ -1,5 +1,6 @@
<div class="confignav" id="confignav">
<center>
<!--
<b>
<% if (request.getRequestURI().indexOf("config.jsp") != -1) {
%>Network<% }
@ -22,6 +23,7 @@
else if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) {
%>Advanced<% }%>
Configuration</b>
-->
<h4><% if (request.getRequestURI().indexOf("config.jsp") != -1) {
%>Network | <% } else { %><a href="config.jsp">Network</a> | <% }
if (request.getRequestURI().indexOf("configservice.jsp") != -1) {
@ -43,5 +45,4 @@ Configuration</b>
if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) {
%>Advanced<% } else { %><a href="configadvanced.jsp">Advanced</a><% } %></h4>
</center>
<hr />
</div>

2
apps/routerconsole/jsp/configpeer.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Peer Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

2
apps/routerconsole/jsp/configservice.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Service Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

2
apps/routerconsole/jsp/configstats.jsp
View File

@ -54,7 +54,7 @@ function toggleAll(category)
</head><body onLoad="init();">
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Stats Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

2
apps/routerconsole/jsp/configtunnels.jsp
View File

@ -12,7 +12,7 @@
<jsp:useBean class="net.i2p.router.web.ConfigTunnelsHelper" id="tunnelshelper" scope="request" />
<jsp:setProperty name="tunnelshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<h1>I2P Tunnel Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

2
apps/routerconsole/jsp/configupdate.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Update Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>

2
apps/routerconsole/jsp/graphs.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Performance Graphs</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
<jsp:setProperty name="graphHelper" property="*" />

23
apps/routerconsole/jsp/help.jsp
View File

@ -9,17 +9,20 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Router Help & Support</h1>
<div class="main" id="main">
<h2>Help</h2>
Sorry, there's not much help text here yet, so also check out the
<a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
or the
<a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.
You may also try the
<a href="http://forum.i2p/">forum</a>
or IRC.
<br />
If you'd like to help improve or translate the documentation, or
other help with other aspects of the project, please see the documentation for
<a href="http://www.i2p2.i2p/getinvolved.html">volunteers.</a>
<br><br>Further assistance is available here:
<br>
<ul>
<li><a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
<li><a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.
</ul>
<br>
You may also try the <a href="http://forum.i2p/">I2P forum</a>
or IRC.<br />
<h2>Summary Bar Information</h2>
Many of the stats on the summary bar may be

1
apps/routerconsole/jsp/index.jsp
View File

@ -17,6 +17,7 @@ if (System.getProperty("router.consoleNonce") == null) {
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Router Console</h1>
<div class="news" id="news">
<jsp:useBean class="net.i2p.router.web.ContentHelper" id="newshelper" scope="request" />
<% File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml"); %>

2
apps/routerconsole/jsp/jobs.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Router Job Queue</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" />
<jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />

2
apps/routerconsole/jsp/logs.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Router Logs</h1>
<div class="main" id="main">
<h4>Version:</h4><a name="version"> </a>
Please include this information in bug reports.

2
apps/routerconsole/jsp/netdb.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Network Database Summary</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.NetDbHelper" id="netdbHelper" scope="request" />
<jsp:setProperty name="netdbHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />

2
apps/routerconsole/jsp/oldconsole.jsp
View File

@ -13,7 +13,7 @@
<jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="conhelper" scope="request" />
<jsp:setProperty name="conhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<jsp:setProperty name="conhelper" property="writer" value="<%=out%>" />
<h1>I2P Router &raquo; Old Console</h1>
<div class="main" id="main">
<jsp:getProperty name="conhelper" property="console" />
</div>

2
apps/routerconsole/jsp/oldstats.jsp
View File

@ -13,7 +13,7 @@
<jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="oldhelper" scope="request" />
<jsp:setProperty name="oldhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<jsp:setProperty name="oldhelper" property="writer" value="<%=out%>" />
<h1>I2P Router Statistics</h1>
<div class="main" id="main">
<jsp:getProperty name="oldhelper" property="stats" />
</div>

2
apps/routerconsole/jsp/peers.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Network Peers</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.PeerHelper" id="peerHelper" scope="request" />
<jsp:setProperty name="peerHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />

2
apps/routerconsole/jsp/profiles.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Network Peer Profiles</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
<jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />

7
apps/routerconsole/jsp/summary.jsp
View File

@ -1,5 +1,6 @@
<% // put width here too to prevent bad layout at startup %>
<div class="routersummaryouter" style="width: 215px;">
<div class="routersummaryouter" style="width: 200px;">
<%
// skip the iframe if refresh disabled
String d = request.getParameter("refresh");
@ -21,10 +22,10 @@
} else {
// since we don't have an iframe this will reload the base page, and
// the new delay will be passed to the iframe above
out.print("<hr /><p><form action=\"" + request.getRequestURI() + "\" method=\"GET\">\n");
out.print("<hr /><p><center><form action=\"" + request.getRequestURI() + "\" method=\"GET\">\n");
out.print("<b>Refresh (s):</b> <input size=\"3\" type=\"text\" name=\"refresh\" value=\"60\" />\n");
out.print("<button type=\"submit\">Enable</button>\n");
out.print("</form></p></div>\n");
out.print("</form></center></p></div>\n");
}
%>
</div>

2
apps/routerconsole/jsp/summaryframe.jsp
View File

@ -13,6 +13,7 @@
<title>Summary Bar</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%
out.print("<center>\n");
// try hard to avoid an error page in the iframe after shutdown
String action = request.getParameter("action");
String d = request.getParameter("refresh");
@ -49,6 +50,7 @@
shutdownSoon = true;
}
}
out.print("</center>\n");
%>
<%@include file="css.jsp" %>
</head>

35
apps/routerconsole/jsp/summarynoframe.jsp
View File

@ -10,16 +10,34 @@
<jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="uhelper" scope="request" />
<jsp:setProperty name="uhelper" property="*" />
<jsp:setProperty name="uhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<center><b><a href="config.jsp" target="_top">Configuration</a>&nbsp;&nbsp;<a href="help.jsp" target="_top">Help</a></b></center>
<centre><a href="index.jsp" target="_top"><img src="/themes/console/images/i2plogo.png" alt="I2P Router Console" title="I2P Router Console"/></a></centre><hr />
<centre>
<u><b>I2P Services</b></u><br />
<a href="susimail/susimail" target="blank">Susimail</a>
<a href="susidns/index.jsp" target="_blank">SusiDNS</a>
<a href="i2psnark/" target="_blank">I2PSnark</a>
<a href="http://127.0.0.1:7658/" target="_blank">Eepsite</a><hr />
<u><b>I2P Internals</b></u><br />
<a href="i2ptunnel/index.jsp" target="_blank">I2PTunnel</a>
<a href="tunnels.jsp" target="_top">Tunnels</a>
<a href="profiles.jsp" target="_top">Profiles</a>
<a href="netdb.jsp" target="_top">NetDB</a>
<a href="logs.jsp" target="_top">Logs</a>
<a href="jobs.jsp" target="_top">Jobs</a>
<a href="graphs.jsp" target="_top">Graphs</a>
<a href="oldstats.jsp" target="_top">Stats</a> <!--
<a href="oldconsole.jsp" target="_top">Internals</a> -->
<a href="config.jsp" target="_top">Configuration</a>
<a href="help.jsp" target="_top">Help</a></b>
</center>
<hr />
<u><b>General</b></u><br />
<b>Ident:</b> (<a title="Your router identity is <jsp:getProperty name="helper" property="ident" />, never reveal it to anyone" href="netdb.jsp?r=." target="_top">view</a>)<br />
<b>Version:</b> <jsp:getProperty name="helper" property="version" /><br />
<b>Uptime:</b> <jsp:getProperty name="helper" property="uptime" /><br />
<b>Now:</b> <jsp:getProperty name="helper" property="time" /><br />
<b>Reachability:</b> <a href="config.jsp#help" target="_top"><jsp:getProperty name="helper" property="reachability" /></a><%
<b>Reachability:</b> <a href="config.jsp#help" target="_top"><jsp:getProperty name="helper" property="reachability" /></a>
<%
if (helper.updateAvailable()) {
// display all the time so we display the final failure message
out.print("<br />" + update.getStatus());
@ -30,17 +48,16 @@
if (prev != null) System.setProperty("net.i2p.router.web.UpdateHandler.noncePrev", prev);
System.setProperty("net.i2p.router.web.UpdateHandler.nonce", nonce+"");
String uri = request.getRequestURI();
out.print("<p><form action=\"" + uri + "\" method=\"GET\">\n");
out.print("<p><center><form action=\"" + uri + "\" method=\"GET\">\n");
out.print("<input type=\"hidden\" name=\"updateNonce\" value=\"" + nonce + "\" />\n");
out.print("<input type=\"submit\" value=\"Download " + uhelper.getUpdateVersion() + " Update\" /></form></p>\n");
out.print("<input type=\"submit\" value=\"Download " + uhelper.getUpdateVersion() + " Update\" /></form></center></p>\n");
}
}
%>
<p>
<p><center>
<%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%>
</p>
</center></p>
<hr />
<u><b><a href="peers.jsp" target="_top">Peers</a></b></u><br />
<b>Active:</b> <jsp:getProperty name="helper" property="activePeers" />/<jsp:getProperty name="helper" property="activeProfiles" /><br />
<b>Fast:</b> <jsp:getProperty name="helper" property="fastPeers" /><br />

2
apps/routerconsole/jsp/tunnels.jsp
View File

@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
<h1>I2P Tunnel Summary</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.TunnelHelper" id="tunnelHelper" scope="request" />
<jsp:setProperty name="tunnelHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />