diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java index 28484a57a..7a80c181f 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java @@ -345,7 +345,7 @@ public class I2PTunnelConnectClient extends I2PTunnelClientBase implements Runna if (targetRequest != null) { out.write(targetRequest.getBytes()); if (usingWWWProxy) - out.write(("
WWW proxy: " + wwwProxy).getBytes()); + out.write(("
WWW proxy: " + wwwProxy).getBytes()); } out.write("".getBytes()); out.write("\n\n".getBytes()); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 59169a18c..075483529 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -388,7 +388,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable String conflictURL = protocol + alias + ".i2p/?" + initialFragments; out.write(header); out.write(("To visit the destination in your host database, click here. To visit the conflicting addresshelper link by temporarily giving it a random alias, click here.

").getBytes()); - out.write("

I2P HTTP Proxy Server
Generated on: ".getBytes()); + out.write("

I2P HTTP Proxy Server
Generated on: ".getBytes()); out.write(new Date().toString().getBytes()); out.write("

\n".getBytes()); out.flush(); @@ -705,9 +705,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable out.write("\">http://".getBytes()); out.write(uri.getBytes()); out.write("".getBytes()); - if (usingWWWProxy) out.write(("
WWW proxy: " + wwwProxy).getBytes()); + if (usingWWWProxy) out.write(("
WWW proxy: " + wwwProxy).getBytes()); if (showAddrHelper) { - out.write("

Click a link below to look for an address helper by using a \"jump\" service:
".getBytes()); + out.write("

Click a link below to look for an address helper by using a \"jump\" service:
".getBytes()); for (int i = 0; i < jumpServers.length; i++) { // Skip jump servers we don't know String jumphost = jumpServers[i].substring(7); // "http://" @@ -719,7 +719,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable continue; } - out.write("
".getBytes()); @@ -729,7 +729,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable } } } - out.write("

I2P HTTP Proxy Server
Generated on: ".getBytes()); + out.write("

I2P HTTP Proxy Server
Generated on: ".getBytes()); out.write(new Date().toString().getBytes()); out.write("

\n".getBytes()); out.flush(); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index 45d9325cc..b5ca6c3a1 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -464,7 +464,7 @@ public class TunnelController implements Logging { private void getHttpClientSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) - buf.append("").append(description).append("
\n"); + buf.append("").append(description).append("
\n"); buf.append("HTTP proxy listening on port ").append(getListenPort()); String listenOn = getListenOnInterface(); if ("0.0.0.0".equals(listenOn)) @@ -473,19 +473,19 @@ public class TunnelController implements Logging { buf.append(" (reachable locally only)"); else buf.append(" (reachable at the ").append(listenOn).append(" interface)"); - buf.append("
\n"); + buf.append("
\n"); String proxies = getProxyList(); if ( (proxies == null) || (proxies.trim().length() <= 0) ) - buf.append("Outproxy: default [squid.i2p]
\n"); + buf.append("Outproxy: default [squid.i2p]
\n"); else - buf.append("Outproxy: ").append(proxies).append("
\n"); + buf.append("Outproxy: ").append(proxies).append("
\n"); getOptionSummary(buf); } private void getClientSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) - buf.append("").append(description).append("
\n"); + buf.append("").append(description).append("
\n"); buf.append("Client tunnel listening on port ").append(getListenPort()); buf.append(" pointing at ").append(getTargetDestination()); String listenOn = getListenOnInterface(); @@ -495,58 +495,58 @@ public class TunnelController implements Logging { buf.append(" (reachable locally only)"); else buf.append(" (reachable at the ").append(listenOn).append(" interface)"); - buf.append("
\n"); + buf.append("
\n"); getOptionSummary(buf); } private void getServerSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) - buf.append("").append(description).append("
\n"); + buf.append("").append(description).append("
\n"); buf.append("Server tunnel pointing at port ").append(getTargetPort()); buf.append(" on ").append(getTargetHost()); - buf.append("
\n"); - buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("
\n"); + buf.append("
\n"); + buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("
\n"); getOptionSummary(buf); } private void getHttpServerSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) - buf.append("").append(description).append("
\n"); + buf.append("").append(description).append("
\n"); buf.append("Server tunnel pointing at port ").append(getTargetPort()); buf.append(" on ").append(getTargetHost()); buf.append(" for the site ").append(getSpoofedHost()); - buf.append("
\n"); - buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("
\n"); + buf.append("
\n"); + buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("
\n"); getOptionSummary(buf); } private void getOptionSummary(StringBuilder buf) { String opts = getClientOptions(); if ( (opts != null) && (opts.length() > 0) ) - buf.append("Network options: ").append(opts).append("
\n"); + buf.append("Network options: ").append(opts).append("
\n"); if (_running) { List sessions = _tunnel.getSessions(); for (int i = 0; i < sessions.size(); i++) { I2PSession session = (I2PSession)sessions.get(i); Destination dest = session.getMyDestination(); if (dest != null) { - buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("
\n"); + buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("
\n"); if ( ("server".equals(getType())) || ("httpserver".equals(getType())) ) { buf.append("Full destination: "); buf.append("\n"); long val = new Random().nextLong(); if (val < 0) val = 0 - val; - buf.append("
You can You can view"); buf.append(" it in a browser (only when you're using the eepProxy)\n"); - buf.append("
If you are going to share this on IRC, you need to split it up:
\n"); + buf.append("
If you are going to share this on IRC, you need to split it up:
\n"); String str = dest.toBase64(); - buf.append(str.substring(0, str.length()/2)).append("
\n"); - buf.append(str.substring(str.length()/2)).append("
\n"); - buf.append("You can also post it to Eepsite announcement forum
"); + buf.append(str.substring(0, str.length()/2)).append("
\n"); + buf.append(str.substring(str.length()/2)).append("
\n"); + buf.append("You can also post it to Eepsite announcement forum
"); } } } diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index ae24c9ab7..0ae098b8f 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -50,7 +50,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
<% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType)) { @@ -197,7 +197,7 @@
-
+
@@ -265,7 +265,7 @@
-
+
@@ -286,7 +286,7 @@ <% if (!"streamrclient".equals(tunnelType)) { // streamr client sends pings so it will never be idle %>
-
+
@@ -314,7 +314,7 @@
-
+
@@ -335,10 +335,10 @@
class="tickbox" /> - Enable + Enable class="tickbox" /> - Disable + Disable
@@ -349,7 +349,7 @@
-
+
@@ -366,7 +366,7 @@ <% } // !streamrclient %>
-
+
<% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType)) { %> @@ -393,7 +393,7 @@
-
+
<% } %> diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 195fd84cd..2acc75183 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -50,7 +50,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -110,7 +110,7 @@
-
+
<% if ("httpserver".equals(tunnelType)) { @@ -164,7 +164,7 @@
-
+
@@ -232,7 +232,7 @@
-
+
@@ -252,7 +252,7 @@
-
+
@@ -281,7 +281,7 @@
-
+
@@ -304,7 +304,7 @@
-
+
@@ -332,7 +332,7 @@
-
+
@@ -382,7 +382,7 @@
-
+
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index d0bf6d667..c38b3e7ca 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -27,13 +27,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
-
+
@@ -74,7 +74,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<% for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) { @@ -106,7 +106,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" /> Preview <% } else if (indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) { - %>Base32 Address:
<%=indexBean.getDestHashBase32(curServer)%>.b32.i2p + %>Base32 Address:
<%=indexBean.getDestHashBase32(curServer)%>.b32.i2p <% } else { %>No Preview @@ -141,13 +141,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<% } %>
-
+
@@ -194,7 +194,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<% for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) { @@ -262,13 +262,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<% } %>
-
+
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java index 6cd4346cc..0a7bc1b0a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -74,7 +74,7 @@ public class ConfigTunnelsHelper extends HelperBase { out.getQuantity() + out.getBackupQuantity() >= WARN_QUANTITY) buf.append("PERFORMANCE WARNING - Settings include high tunnel quantities."); -buf.append("\"Inbound\"  Inbound\"Outbound  Outbound\n"); +buf.append("\"Inbound\"  Inbound\"Outbound  Outbound\n"); // buf.append("InboundOutbound\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java index a771f52ef..c65a6beb3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -66,7 +66,7 @@ public class GraphHelper extends HelperBase { + "&periodCount=" + _periodCount + "&width=" + _width + "&height=" + (_height - 14) - + "\" title=\"Combined bandwidth graph\" />\n"); + + "\" alt=\"Combined bandwidth graph\" title=\"Combined bandwidth graph\">\n"); } for (Iterator iter = ordered.iterator(); iter.hasNext(); ) { @@ -80,7 +80,7 @@ public class GraphHelper extends HelperBase { + "&periodCount=" + (3 * _periodCount) + "&width=" + (3 * _width) + "&height=" + (3 * _height) - + "\" target=\"_blank\" />"); + + "\" target=\"_blank\">"); _out.write("\n"); + + "\" alt=\"" + title + + "\" title=\"" + title + "\">\n"); } if (_refreshDelaySeconds > 0) // shorten the refresh by 3 seconds so we beat the iframe - _out.write("\n"); + _out.write("\n"); } catch (IOException ioe) { ioe.printStackTrace(); @@ -103,17 +104,16 @@ public class GraphHelper extends HelperBase { } public String getForm() { try { - _out.write("

Configure Graph Display

"); - _out.write("

[Select Stats to Graph]

"); + _out.write("

Configure Graph Display [Select Stats]

"); _out.write("
"); - _out.write("Periods:
\n"); - _out.write("Plot averages: "); - _out.write("or plot events:
\n"); + _out.write("Periods:
\n"); + _out.write("Plot averages: "); + _out.write("or plot events:
\n"); _out.write("Image sizes: width: pixels, height:
\n"); + + "\"> pixels, height:
\n"); _out.write("Refresh delay:
\n"); - _out.write("
"); + _out.write("
"); } catch (IOException ioe) { ioe.printStackTrace(); } diff --git a/apps/routerconsole/jsp/css.jsp b/apps/routerconsole/jsp/css.jsp index ed7a8c2b1..affe83099 100644 --- a/apps/routerconsole/jsp/css.jsp +++ b/apps/routerconsole/jsp/css.jsp @@ -17,5 +17,5 @@ %> " /> -console.css" rel="stylesheet" type="text/css" /> +console.css" rel="stylesheet" type="text/css"> \ No newline at end of file diff --git a/apps/routerconsole/jsp/i2ptunnel/index.jsp b/apps/routerconsole/jsp/i2ptunnel/index.jsp index edba596ef..8c7eefc2e 100644 --- a/apps/routerconsole/jsp/i2ptunnel/index.jsp +++ b/apps/routerconsole/jsp/i2ptunnel/index.jsp @@ -1,8 +1,7 @@ -I2PTunnel Disabled +I2P Tunnel Manager Not Running -I2PTunnel is not running. Go to the config clients page -to start it. +The I2P Tunnel Manager is not currently running. Please visit theClient Configuration page to start it. diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index a69454535..1387defe3 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -20,7 +20,8 @@ img { pre { overflow: auto; font-size: 8pt !important; - width: 100%; + width: 95%; + padding-top: 10px; } div.logo { diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 8c1e82035..6d9b6bc65 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 14; + public final static long BUILD = 15; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index becd8fe68..e84bfe6f1 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -992,7 +992,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { if (full) size *= 4; StringBuilder buf = new StringBuilder(size); - out.write("

Network Database Contents

\n"); + out.write("

Network Database Contents (View LeaseSets)

\n"); if (!_initialized) { buf.append("Not initialized\n"); out.write(buf.toString()); @@ -1000,7 +1000,6 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { return; } - out.write("View LeaseSets"); Hash us = _context.routerHash(); out.write("

Routers (\n"); } } - buf.append("

\n"); + buf.append("
\n"); out.write(buf.toString()); out.flush(); } diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index 651f2dd62..da48ad7d7 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1854,7 +1854,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } if (_context.shitlist().isShitlisted(peer.getRemotePeer(), STYLE)) { if (!appended) buf.append("
"); - buf.append(" Shitlist"); + buf.append(" Banned"); appended = true; } //byte[] ip = getIP(peer.getRemotePeer()); @@ -2000,7 +2000,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append("   "); buf.append(numPeers > 0 ? rtoTotal/numPeers : 0); buf.append("\n   "); - buf.append(sendTotal).append(" ").append(recvTotal).append("\n"); + buf.append(sendTotal).append(" ").append(recvTotal).append("\n"); buf.append(" ").append(resentTotal); buf.append(" ").append(dupRecvTotal).append("\n"); buf.append("

\n");