diff --git a/LICENSE.txt b/LICENSE.txt index ff288844e4..6a6ba534cf 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -244,6 +244,7 @@ Applications: - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/ Silk icons: See licenses/LICENSE-SilkIcons.txt FatCow icons: See licenses/LICENSE-FatCowIcons.txt + Fugue Icons: See licenses/LICENSE-FugueIcons.txt GeoIP Data: This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/ diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml index 3ecde03938..523d9f3660 100644 --- a/apps/i2psnark/java/build.xml +++ b/apps/i2psnark/java/build.xml @@ -276,7 +276,7 @@ - diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java index 1cf1d9aaae..73588d12a9 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java @@ -173,7 +173,7 @@ public class Peer implements Comparable if (state != null) { String r = state.getRequests(); if (r != null) - return sock.toString() + "
Requests: " + r; + return sock.toString() + "
Requests: " + r + ""; } return sock.toString(); } diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index c1b70f0025..ecb6708395 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -795,14 +795,17 @@ public class SnarkManager implements CompleteListener, ClientApp { updateConfig(); } + public boolean getUniversalTheming() { + return _context.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING); + } + /** * Get current theme. * @return String -- the current theme */ public String getTheme() { String theme = _config.getProperty(PROP_THEME); - boolean universalTheming = _context.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING); - if (universalTheming) { + if (getUniversalTheming()) { // Fetch routerconsole theme (or use our default if it doesn't exist) theme = _context.getProperty(RC_PROP_THEME, DEFAULT_THEME); // Ensure that theme exists @@ -1246,7 +1249,7 @@ public class SnarkManager implements CompleteListener, ClientApp { if (theme != null) { if(!theme.equals(_config.getProperty(PROP_THEME))) { _config.setProperty(PROP_THEME, theme); - addMessage(_t("{0} theme loaded, return to main i2psnark page to view.", theme)); + addMessage(_t("{0} theme loaded.", theme)); changed = true; } } diff --git a/apps/i2psnark/java/src/org/klomp/snark/dht/DHTNodes.java b/apps/i2psnark/java/src/org/klomp/snark/dht/DHTNodes.java index 8207090698..55778eea2c 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/dht/DHTNodes.java +++ b/apps/i2psnark/java/src/org/klomp/snark/dht/DHTNodes.java @@ -138,7 +138,7 @@ class DHTNodes { * @since 0.9.4 */ public void renderStatusHTML(StringBuilder buf) { - buf.append(_kad.toString().replace("\n", "
\n")); + buf.append(_kad.toString().replace("\n", "
\n")); } /** */ diff --git a/apps/i2psnark/java/src/org/klomp/snark/dht/DHTTracker.java b/apps/i2psnark/java/src/org/klomp/snark/dht/DHTTracker.java index 784d8e6bff..9b8fb32c52 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/dht/DHTTracker.java +++ b/apps/i2psnark/java/src/org/klomp/snark/dht/DHTTracker.java @@ -140,7 +140,7 @@ class DHTTracker { * Debug info, HTML formatted */ public void renderStatusHTML(StringBuilder buf) { - buf.append("DHT tracker: ").append(_torrentCount).append(" torrents ") + buf.append("DHT tracker: ").append(_torrentCount).append(" torrents ") .append(_peerCount).append(" peers ") .append(DataHelper.formatDuration(_expireTime)).append(" expiration
"); } diff --git a/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java b/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java index 1ebf975109..46d4476dce 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java +++ b/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java @@ -682,17 +682,17 @@ public class KRPC implements I2PSessionMuxedListener, DHT { public String renderStatusHTML() { long uptime = Math.max(1000, _context.clock().now() - _started); StringBuilder buf = new StringBuilder(256); - buf.append("
DHT DEBUG
TX: ").append(_txPkts.get()).append(" pkts / ") + buf.append("
DHT DEBUG
TX: ").append(_txPkts.get()).append(" pkts / ") .append(DataHelper.formatSize2(_txBytes.get())).append("B / ") .append(DataHelper.formatSize2(_txBytes.get() * 1000 / uptime)).append("Bps
" + - "RX: ").append(_rxPkts.get()).append(" pkts / ") + "RX: ").append(_rxPkts.get()).append(" pkts / ") .append(DataHelper.formatSize2(_rxBytes.get())).append("B / ") .append(DataHelper.formatSize2(_rxBytes.get() * 1000 / uptime)).append("Bps
" + - "DHT Peers: ").append( _knownNodes.size()).append("
" + - "Blacklisted: ").append(_blacklist.size()).append("
" + - "Sent tokens: ").append(_outgoingTokens.size()).append("
" + - "Rcvd tokens: ").append(_incomingTokens.size()).append("
" + - "Pending queries: ").append(_sentQueries.size()).append("
"); + "DHT Peers: ").append( _knownNodes.size()).append("
" + + "Blacklisted: ").append(_blacklist.size()).append("
" + + "Sent tokens: ").append(_outgoingTokens.size()).append("
" + + "Rcvd tokens: ").append(_incomingTokens.size()).append("
" + + "Pending queries: ").append(_sentQueries.size()).append("

"); _tracker.renderStatusHTML(buf); _knownNodes.renderStatusHTML(buf); return buf.toString(); diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 1612ff2fab..2584e01e55 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -62,7 +62,7 @@ public class I2PSnarkServlet extends BasicServlet { private String _themePath; private String _imgPath; private String _lastAnnounceURL; - + private static final String DEFAULT_NAME = "i2psnark"; public static final String PROP_CONFIG_FILE = "i2psnark.configFile"; private static final String WARBASE = "/.resources/"; @@ -264,7 +264,7 @@ public class I2PSnarkServlet extends BasicServlet { sendRedirect(req, resp, peerString); return; } - + setHTMLHeaders(resp); PrintWriter out = resp.getWriter(); out.write(DOCTYPE + "\n" + @@ -283,7 +283,7 @@ public class I2PSnarkServlet extends BasicServlet { if ("2".equals(peerParam)) out.write(" | Debug Mode"); out.write("\n"); - + // we want it to go to the base URI so we don't refresh with some funky action= value int delay = 0; if (!isConfigure) { @@ -291,7 +291,8 @@ public class I2PSnarkServlet extends BasicServlet { if (delay > 0) { String jsPfx = _context.isRouterContext() ? "" : ".resources"; String downMsg = _context.isRouterContext() ? _t("Router is down") : _t("I2PSnark has stopped"); - //out.write("\n"); + // fallback to metarefresh when javascript is disabled + out.write("\n"); out.write("\n" + "\n"); buf.append("\n
"); - toThemeImg(buf, "arrow_refresh"); - buf.append("  "); if (_contextName.equals(DEFAULT_NAME)) buf.append(_t("I2PSnark")); else buf.append(_contextName); buf.append("
\n"); - + if (parent) // always true - buf.append("
"); + buf.append("
\n
"); // for stop/start/check if (showStopStart || showPriority) { buf.append("
\n"); @@ -2936,17 +2986,17 @@ public class I2PSnarkServlet extends BasicServlet { //buf.append("").append(_t("Maggot link")).append(": ") // .append(MAGGOT).append(hex).append(':').append(hex).append(""); - buf.append(""); + buf.append(""); toThemeImg(buf, "size"); - buf.append("") + buf.append("") .append(_t("Size")) .append(": ") .append(formatSize(snark.getTotalLength())); int pieces = snark.getPieces(); double completion = (pieces - snark.getNeeded()) / (double) pieces; - buf.append(" "); + buf.append(" "); toThemeImg(buf, "head_rx"); - buf.append(" "); + buf.append(""); if (completion < 1.0) buf.append(_t("Completion")) .append(": ") @@ -2954,16 +3004,16 @@ public class I2PSnarkServlet extends BasicServlet { else buf.append(_t("Complete")).append(""); // up ratio - buf.append(" "); + buf.append(" "); toThemeImg(buf, "head_tx"); - buf.append(" ") + buf.append("") .append(_t("Upload ratio")) .append(": "); long uploaded = snark.getUploaded(); if (uploaded > 0) { double ratio = uploaded / ((double) snark.getTotalLength()); buf.append((new DecimalFormat("0.000")).format(ratio)); - buf.append(" x"); + buf.append(" x"); } else { buf.append('0'); } @@ -2974,18 +3024,18 @@ public class I2PSnarkServlet extends BasicServlet { needed = snark.getRemainingLength(); } if (needed > 0) { - buf.append(" "); + buf.append(" "); toThemeImg(buf, "head_rx"); - buf.append(" ") + buf.append("") .append(_t("Remaining")) .append(": ") .append(formatSize(needed)); } long skipped = snark.getSkippedLength(); if (skipped > 0) { - buf.append(" "); + buf.append(" "); toThemeImg(buf, "head_rx"); - buf.append(" ") + buf.append("") .append(_t("Skipped")) .append(": ") .append(formatSize(skipped)); @@ -2993,35 +3043,35 @@ public class I2PSnarkServlet extends BasicServlet { if (meta != null) { List> files = meta.getFiles(); int fileCount = files != null ? files.size() : 1; - buf.append(" "); + buf.append(" "); toThemeImg(buf, "file"); - buf.append(" ") + buf.append("") .append(_t("Files")) .append(": ") .append(fileCount); } - buf.append(" "); + buf.append(" "); toThemeImg(buf, "file"); - buf.append(" ") + buf.append("") .append(_t("Pieces")) .append(": ") .append(pieces); - buf.append(" "); + buf.append(" "); toThemeImg(buf, "file"); - buf.append(" ") + buf.append("") .append(_t("Piece size")) .append(": ") .append(formatSize(snark.getPieceLength(0))) - .append("\n"); + .append("\n"); // buttons if (showStopStart) { - buf.append(""); + buf.append(""); if (snark.isChecking()) { - buf.append("").append(_t("Checking")).append("… ") + buf.append("").append(_t("Checking")).append("… ") .append((new DecimalFormat("0.00%")).format(snark.getCheckingProgress())) - .append("   ") - .append(_t("Refresh page for results")).append(""); + .append(" ") + .append(_t("Refresh page for results")).append(""); } else if (snark.isStarting()) { buf.append("").append(_t("Starting")).append("…"); } else if (snark.isAllocating()) { @@ -3033,30 +3083,38 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(_t("Stop")).append("\" name=\"stop\" class=\"stoptorrent\">\n"); else buf.append(_t("Start")).append("\" name=\"start\" class=\"starttorrent\">\n"); - buf.append("   \n"); + buf.append("\" class=\"disabled\" disabled=\"disabled\" title=\"") + .append(_t("Stop the torrent in order to check file integrity")) + .append("\">\n"); else - buf.append("\" class=\"reload\">\n"); + buf.append("\" class=\"reload\" title=\"") + .append(_t("Check integrity of the downloaded file(s)")) + .append("\">\n"); } buf.append("\n"); } } else { // snark == null // shouldn't happen - buf.append("Not found
resource=\"").append(r.toString()) - .append("\"
base=\"").append(base) - .append("\"
torrent=\"").append(torrentName) - .append("\"\n"); + buf.append("\n"); } buf.append("
") + .append(_t("Resource Not found")) + .append("
").append(_t("Resource")).append(":").append(r.toString()) + .append("
").append(_t("Base")).append(":").append(base) + .append("
").append(_t("Torrent")).append(":").append(torrentName) + .append("
\n"); if (snark != null && !r.exists()) { // fixup TODO - buf.append("

Does not exist
resource=\"").append(r.toString()) - .append("\"
base=\"").append(base) - .append("\"
torrent=\"").append(torrentName) - .append("\"

"); + buf.append("
") + .append(_t("Resource Does Not Exist")) + .append("
").append(_t("Resource")).append(":").append(r.toString()) + .append("
").append(_t("Base")).append(":").append(base) + .append("
").append(_t("Torrent")).append(":").append(torrentName) + .append("
"); return buf.toString(); } @@ -3064,7 +3122,7 @@ public class I2PSnarkServlet extends BasicServlet { if (r.isDirectory()) { ls = r.listFiles(); } // if r is not a directory, we are only showing torrent info section - + if (ls == null) { // We are only showing the torrent info section buf.append(""); @@ -3141,7 +3199,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(""); } - tx = _t("Status"); + tx = _t("Download Status"); toThemeImg(buf, "status", tx, showRemainingSort ? _t("Sort by {0}", _t("Remaining")) : tx); if (showRemainingSort) @@ -3153,7 +3211,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(""); } - tx = _t("Priority"); + tx = _t("Download Priority"); toThemeImg(buf, "priority", tx, showSort ? _t("Sort by {0}", tx) : tx); if (showSort) @@ -3174,18 +3232,18 @@ public class I2PSnarkServlet extends BasicServlet { boolean showSaveButton = false; boolean rowEven = true; for (Sorters.FileAndIndex fai : fileList) - { + { //String encoded = encodePath(ls[i].getName()); // bugfix for I2P - Backport from Jetty 6 (zero file lengths and last-modified times) // http://jira.codehaus.org/browse/JETTY-361?page=com.atlassian.jira.plugin.system.issuetabpanels%3Achangehistory-tabpanel#issue-tabs // See resource.diff attachment //Resource item = addPath(encoded); File item = fai.file; - + String rowClass = (rowEven ? "snarkTorrentEven" : "snarkTorrentOdd"); rowEven = !rowEven; buf.append(""); - + // Get completeness and status string boolean complete = false; String status = ""; @@ -3218,7 +3276,8 @@ public class I2PSnarkServlet extends BasicServlet { else status = toImg("clock_red"); status += " " + - (100 * (length - remaining) / length) + "% " + _t("complete") + + ("") + + (100 * (length - remaining) / length) + "% " + ("") + _t("complete") + ("") + " (" + DataHelper.formatSize2(remaining) + "B " + _t("remaining") + ")"; } @@ -3262,20 +3321,26 @@ public class I2PSnarkServlet extends BasicServlet { if (showPriority) { buf.append(""); if ((!complete) && (!item.isDirectory())) { - buf.append("\n") + .append("\n 0) buf.append("checked=\"checked\""); - buf.append('>').append(_t("High")); + buf.append('>') + .append(_t("High")).append(""); - buf.append("\n") + .append("\n').append(_t("Normal")); + buf.append('>') + .append(_t("Normal")).append(""); - buf.append("\n") + .append("\n').append(_t("Skip")); + buf.append('>') + .append(_t("Skip")).append(""); showSaveButton = true; } buf.append(""); @@ -3283,14 +3348,14 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); } if (showSaveButton) { - buf.append(" " + - "") + buf.append("" + + "") .append(toImg("clock_red")).append(_t("Set all high")).append("\n" + "") .append(toImg("clock")).append(_t("Set all normal")).append("\n" + "") - .append(toImg("cancel")).append(_t("Skip all")).append("\n" + - "

\n" + + "\n" + "\n"); } @@ -3345,10 +3410,11 @@ public class I2PSnarkServlet extends BasicServlet { else if (mime.equals("text/plain") || mime.equals("text/x-sfv") || mime.equals("application/rtf") || - mime.equals("application/epub+zip") || - mime.equals("application/x-mobipocket-ebook") || plc.endsWith(".azw4")) icon = "page"; + else if (mime.equals("application/epub+zip") || + mime.equals("application/x-mobipocket-ebook")) + icon = "ebook"; else if (mime.equals("application/java-archive") || plc.endsWith(".deb")) icon = "package"; @@ -3374,7 +3440,7 @@ public class I2PSnarkServlet extends BasicServlet { icon = "compress"; else if (plc.endsWith(".exe")) icon = "application"; - else if (plc.endsWith(".iso")) + else if (plc.endsWith(".iso") || plc.endsWith(".nrg")) icon = "cd"; else if (mime.equals("application/x-bittorrent")) icon = "magnet"; @@ -3382,7 +3448,7 @@ public class I2PSnarkServlet extends BasicServlet { icon = "page_white"; return icon; } - + /** * Icon file in the .war. Always 16x16. * @@ -3402,7 +3468,7 @@ public class I2PSnarkServlet extends BasicServlet { private String toImg(String icon, String altText) { return "\"""; } - + /** * Image file in the theme. * @@ -3412,7 +3478,7 @@ public class I2PSnarkServlet extends BasicServlet { private String toThemeImg(String image) { return toThemeImg(image, "", ""); } - + /** * Image file in the theme. * diff --git a/apps/i2psnark/resources/icons/basket_put.png b/apps/i2psnark/resources/icons/basket_put.png index be62faaaab..01fc586107 100644 Binary files a/apps/i2psnark/resources/icons/basket_put.png and b/apps/i2psnark/resources/icons/basket_put.png differ diff --git a/apps/i2psnark/resources/icons/cancel.png b/apps/i2psnark/resources/icons/cancel.png index c149c2bc01..d6921565df 100644 Binary files a/apps/i2psnark/resources/icons/cancel.png and b/apps/i2psnark/resources/icons/cancel.png differ diff --git a/apps/i2psnark/resources/icons/cd.png b/apps/i2psnark/resources/icons/cd.png index ef4322357c..fae703d7a3 100644 Binary files a/apps/i2psnark/resources/icons/cd.png and b/apps/i2psnark/resources/icons/cd.png differ diff --git a/apps/i2psnark/resources/icons/compress.png b/apps/i2psnark/resources/icons/compress.png index 8606ff0fd2..183511d3ff 100644 Binary files a/apps/i2psnark/resources/icons/compress.png and b/apps/i2psnark/resources/icons/compress.png differ diff --git a/apps/i2psnark/resources/icons/ebook.png b/apps/i2psnark/resources/icons/ebook.png new file mode 100644 index 0000000000..8af80d3e88 Binary files /dev/null and b/apps/i2psnark/resources/icons/ebook.png differ diff --git a/apps/i2psnark/resources/icons/film.png b/apps/i2psnark/resources/icons/film.png index b0ce7bb198..91c2126e77 100644 Binary files a/apps/i2psnark/resources/icons/film.png and b/apps/i2psnark/resources/icons/film.png differ diff --git a/apps/i2psnark/resources/icons/folder.png b/apps/i2psnark/resources/icons/folder.png index 784e8fa482..87ff12017c 100644 Binary files a/apps/i2psnark/resources/icons/folder.png and b/apps/i2psnark/resources/icons/folder.png differ diff --git a/apps/i2psnark/resources/icons/html.png b/apps/i2psnark/resources/icons/html.png index 55d1072eaf..98cff2a2eb 100644 Binary files a/apps/i2psnark/resources/icons/html.png and b/apps/i2psnark/resources/icons/html.png differ diff --git a/apps/i2psnark/resources/icons/music.png b/apps/i2psnark/resources/icons/music.png index a8b3ede3df..e6dc2de8c8 100644 Binary files a/apps/i2psnark/resources/icons/music.png and b/apps/i2psnark/resources/icons/music.png differ diff --git a/apps/i2psnark/resources/icons/package.png b/apps/i2psnark/resources/icons/package.png index da3c2a2d74..a9ad768c2a 100644 Binary files a/apps/i2psnark/resources/icons/package.png and b/apps/i2psnark/resources/icons/package.png differ diff --git a/apps/i2psnark/resources/icons/page.png b/apps/i2psnark/resources/icons/page.png index 03ddd799fa..8c1184dffe 100644 Binary files a/apps/i2psnark/resources/icons/page.png and b/apps/i2psnark/resources/icons/page.png differ diff --git a/apps/i2psnark/resources/icons/page_white.png b/apps/i2psnark/resources/icons/page_white.png index 8b8b1ca000..0847f096db 100644 Binary files a/apps/i2psnark/resources/icons/page_white.png and b/apps/i2psnark/resources/icons/page_white.png differ diff --git a/apps/i2psnark/resources/icons/page_white_acrobat.png b/apps/i2psnark/resources/icons/page_white_acrobat.png index 8f8095e46f..641a419720 100644 Binary files a/apps/i2psnark/resources/icons/page_white_acrobat.png and b/apps/i2psnark/resources/icons/page_white_acrobat.png differ diff --git a/apps/i2psnark/resources/icons/photo.png b/apps/i2psnark/resources/icons/photo.png index 6c2aaaaaf3..607c25d102 100644 Binary files a/apps/i2psnark/resources/icons/photo.png and b/apps/i2psnark/resources/icons/photo.png differ diff --git a/apps/i2psnark/resources/icons/plugin.png b/apps/i2psnark/resources/icons/plugin.png index 6187b15aec..3ca4d1b594 100644 Binary files a/apps/i2psnark/resources/icons/plugin.png and b/apps/i2psnark/resources/icons/plugin.png differ diff --git a/apps/i2psnark/resources/icons/tick.png b/apps/i2psnark/resources/icons/tick.png index a9925a06ab..a7d7a96be3 100644 Binary files a/apps/i2psnark/resources/icons/tick.png and b/apps/i2psnark/resources/icons/tick.png differ diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java index 399269c5a9..5f4d28eb54 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java @@ -743,7 +743,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem if (first) { first = false; - out.write("

"); + out.write("

\n
\n

"); out.write(_t("Click a link below for an address helper from a jump service")); out.write("

\n"); } else { @@ -759,7 +759,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem } } } - out.write("
"); + out.write("\n\n"); writeFooter(out); } @@ -791,7 +791,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem StringBuilder buf = new StringBuilder(128); buf.append("

I2P HTTP Proxy Server
Generated on: ") .append(new Date().toString()) - .append("

\n"); + .append("\n\n\n"); return buf.toString(); } diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index c28f6fb130..72ffd56254 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -23,8 +23,7 @@ <% if (editBean.allowCSS()) { %> - - + <% } %> - + <% if (editBean.isInitialized()) { @@ -41,19 +39,18 @@ input.default { width: 1px; height: 1px; visibility: hidden; } %> -
-
+
<% String tunnelTypeName; String tunnelType; if (curTunnel >= 0) { tunnelTypeName = editBean.getTunnelType(curTunnel); tunnelType = editBean.getInternalType(curTunnel); - %>

<%=intl._t("Edit proxy settings")%>

<% + %>

<%=intl._t("Edit proxy settings")%> (<%=editBean.getTunnelName(curTunnel)%>)

<% } else { tunnelTypeName = editBean.getTypeName(request.getParameter("type")); tunnelType = net.i2p.data.DataHelper.stripHTML(request.getParameter("type")); - %>

<%=intl._t("New proxy settings")%>

<% + %>

<%=intl._t("New proxy settings")%>

<% } %> @@ -79,70 +76,88 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% } %> -
- -
-
-
-
- - -
-
- - <%=tunnelTypeName%> -
-
- - -
- -
-
-
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + <% - if ("streamrclient".equals(tunnelType)) { - out.write("Host:"); + if ("streamrclient".equals(tunnelType)) { %> + <% } else { %> - <%=intl._t("Reachable by")%>(R): - + + <% } /* streamrclient */ %> - + + <% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType)) { - %>
-
+ + + + + <% } /* tunnel types */ %> -
-
-
- <% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) { - %>
- - -
+ %> + + + + + + + <% if ("httpclient".equals(tunnelType)) { - %>
- - -
+ %> + + + + + + + <% } // httpclient %> -
- - class="tickbox" /> - <%=intl._t("(Check the Box for 'YES')")%> -
+ + + + + + <% } else if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "streamrclient".equals(tunnelType)) { - %>
-
+ + + + + + <% } %> + <% if (!"streamrclient".equals(tunnelType)) { %> -
- - class="tickbox" /> - <%=intl._t("(Share tunnels with other clients and irc/httpclients? Change requires restart of client proxy)")%> -
+ + + + + + + <% } // !streamrclient %> -
- - class="tickbox" /> - <%=intl._t("(Check the Box for 'YES')")%> -
+ <% if ("ircclient".equals(tunnelType)) { %> -
- - class="tickbox" /> - <%=intl._t("(Check the Box for 'YES')")%> -
+ + + + + + + <% } // ircclient %> - -
-
- +
+ <%=intl._t("Name")%> + + <%=intl._t("Type")%> +
+ + + <%=tunnelTypeName%> +
+ <%=intl._t("Description")%> + + <%=intl._t("Auto Start Tunnel")%> +
+ + + +
<% if ("streamrclient".equals(tunnelType)) { %> - + <%=intl._t("Target")%> <% } else { %> - + <%=intl._t("Access Point")%> <% } /* streamrclient */ %> - -
-
+ <%=intl._t("Port")%>: <% String value = editBean.getClientPort(curTunnel); if (value == null || "".equals(value.trim())) { - out.write(" ("); + out.write(" ("); out.write(intl._t("required")); - out.write(")"); + out.write(")"); } %> - - - -
-
+ <%=intl._t("Host")%>: + <% String targetHost = editBean.getTargetHost(curTunnel); if (targetHost == null || "".equals(targetHost.trim())) { - out.write(" ("); + out.write(" ("); out.write(intl._t("required")); - out.write(")"); - } + out.write(")"); + } %> - - + + + + <%=intl._t("Reachable by")%>: + + +
<%=intl._t("Use SSL?")%> - - class="tickbox" /> - +
+ +
+ <%=intl._t("Outproxies")%> +
+  (<%=intl._t("comma separated eg. proxy1.i2p,proxy2.i2p")%>) +
+ <%=intl._t("SSL Outproxies")%> +
+ +
+ <%=intl._t("Use Outproxy Plugin")%> + +
+ + +
+ <%=intl._t("Tunnel Destination")%> +
<% String value2 = editBean.getClientDestination(curTunnel); if (value2 == null || "".equals(value2.trim())) { - out.write(" ("); + out.write(" ("); out.write(intl._t("required")); - out.write(")"); - } + out.write(")"); + } %> - - - (<%=intl._t("name, name:port, or destination")%> + + + (<%=intl._t("name, name:port, or destination")%> <% if ("streamrclient".equals(tunnelType)) { /* deferred resolution unimplemented in streamr client */ %> - <%=intl._t("b32 not recommended")%> <% } %> ) - - +
+ <%=intl._t("Shared Client")%> +
+ +
+ <%=intl._t("Enable DCC")%> +
+ +
-
-
-

<%=intl._t("Advanced networking options")%>


- <%=intl._t("(NOTE: when this client proxy is configured to share tunnels, then these options are for all the shared proxy clients!)")%> -
+

<%=intl._t("Advanced Networking Options")%>

-
-
-
- -
- -
-
- + + + +<% if (!"streamrclient".equals(tunnelType)) { %> <% // no shared client tunnels for streamr %> + + + + <% } // !streamrclient %> + + + + + + + + + + + + + + + + + + + + + + + + + + <% if (!"streamrclient".equals(tunnelType)) { %> -
- -
+ + + + + + + + -
-
-
+ + <% } // !streamrclient %> -
- -
-
- - readonly="readonly" <% } %> /> -
-
- - readonly="readonly" <% } %> /> -
- + + + + + + + + + + + <% if (!"streamrclient".equals(tunnelType)) { // streamr client sends pings so it will never be idle %> -
-
-
-
- -
-
- - class="tickbox" /> -
+ + + + + + + + <% } // !streamrclient %> - -
-
-
- -
- -
-
- - class="tickbox" /> -
-
- - -
-
- - -
- -
-
-
- -
- -
-
- - class="tickbox" /> -
-
- -
+ <%=intl._t("Note: When this client proxy is configured to share tunnels, then these options are for all the shared proxy clients!")%> +
+ <%=intl._t("Tunnel Options")%> +
+ <%=intl._t("Length")%> + + <%=intl._t("Variance")%> +
- -
- +
- -
- + %> +
+ <%=intl._t("Count")%> + + <%=intl._t("Backup Count")%> +
- -
- + +
- - -
-
-
+ %> +
+ <%=intl._t("Profile")%> + + <%=intl._t("Delay Connect")%> +
+ - -
- - class="tickbox" /> - (<%=intl._t("for request/response connections")%>) -
+ + 		+ +
+ <%=intl._t("Router I2CP Address")%> +
+ <%=intl._t("Host")%>: + readonly="readonly" <% } %> /> + + <%=intl._t("Port")%>: + readonly="readonly" <% } %> /> +
+ <%=intl._t("Delay tunnel open until required")%> +
+ +
- - - - -
class="tickbox" /><%=intl._t("Enable")%> class="tickbox" /><%=intl._t("Disable")%>
-
-
- - -
- -
-
-
+ + + + <%=intl._t("Reduce tunnel quantity when idle")%> + + + + + + + + + + + + <%=intl._t("Reduced tunnel count")%>: + + + + + <%=intl._t("Idle period")%>: + + minutes + + + + + + <%=intl._t("Close tunnels when idle")%> + + + + + + + + + + <%=intl._t("Idle period")%>: + + minutes + + + + + + <%=intl._t("New Keys on Reopen")%>: + + + + + + + + <% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "socksirctunnel".equals(tunnelType) || "sockstunnel".equals(tunnelType)) { %> -
- -
-
- - class="tickbox" /> -
-
- - -
- <% - String destb64 = editBean.getDestinationBase64(curTunnel); - if (destb64.length() > 0) { - %>
- - -
-
- - <%=editBean.getDestHashBase32(curTunnel)%> -
- <% } // if destb64 %> -
-
-
+ + + <%=intl._t("Persistent private key")%> + + + + + + + + <%=intl._t("File")%>: + + + + <% + String destb64 = editBean.getDestinationBase64(curTunnel); + if (destb64.length() > 0) { + %> + + + + <%=intl._t("Local destination")%> + + + + + + + + + + + <%=intl._t("Local Base 32")%>: + <%=editBean.getDestHashBase32(curTunnel)%> + + + <% } // if destb64 %> <% } %> <% if ("httpclient".equals(tunnelType)) { %> -
- -
-
- - class="tickbox" /> -

-
- -
-
- - class="tickbox" /> -

-
- -
-
- - class="tickbox" /> -

-
- -
-
- - class="tickbox" /> -
-
-
-
+ + + + <%=intl._t("HTTP Filtering")%> + + + + + + + + + + + + + + + + + + + + + <% } // if httpclient %> - + <% if (true /* editBean.isAdvanced() */ ) { int currentSigType = editBean.getSigType(curTunnel, tunnelType); %> -
- -
-
-
- - class="tickbox" /> -
+ + + <%=intl._t("Signature type")%> (<%=intl._t("Experts only!")%>) + + + + + + + + + + <% if (editBean.isSigTypeAvailable(1)) { %> -
- - class="tickbox" /> -
+ + + + + + <% } + if (editBean.isSigTypeAvailable(2)) { %> -
- - class="tickbox" /> -
+ + + + + <% } if (editBean.isSigTypeAvailable(3)) { %> -
- - class="tickbox" /> -
+ + + + + + <% } if (editBean.isSigTypeAvailable(7)) { %> -
- - class="tickbox" /> -
+ + + + + + <% } // isAvailable %> -
- -
-
-
+ <% } // isAdvanced %> <% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) { %> -
- -
-
- - class="tickbox" /> -
-
- - -
-
- - -
-
-
-
-
- -
-
- - class="tickbox" /> -
-
- - -
-
- - -
-
-
-
+ + + <%=intl._t("Local Authorization")%> + + + + + + + + + + + <%=intl._t("Username")%>: + + + + <%=intl._t("Password")%>: + + + + + + + <%=intl._t("Outproxy Authorization")%> + + + + + + + + + + + <%=intl._t("Username")%>: + + + + + <%=intl._t("Password")%>: + + + + <% } // httpclient || connect || socks || socksirc %> <% if ("httpclient".equals(tunnelType)) { %> -
- -
-
- -
-
-
-
+ + + + <%=intl._t("Jump URL List")%> + + + + + + + + <% } // httpclient %> -
- - -
- -
-
-
-
-
-
-
+ + + <%=intl._t("Custom options")%> + + + + + + + + + + + - - -
-
-
- - + + + + + +
+ + <% } else { - %>Tunnels are not initialized yet, please reload in two minutes.<% + %>
<%=intl._t("Tunnels are not initialized yet, please reload in two minutes.")%>
<% } // isInitialized() %> diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index c93ceb6ac1..dc64441314 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -23,8 +23,7 @@ <% if (editBean.allowCSS()) { %> - - + <% } %> - + <% if (editBean.isInitialized()) { @@ -41,19 +39,19 @@ input.default { width: 1px; height: 1px; visibility: hidden; } %>
-
-
+
+ <% String tunnelTypeName; String tunnelType; if (curTunnel >= 0) { tunnelTypeName = editBean.getTunnelType(curTunnel); tunnelType = editBean.getInternalType(curTunnel); - %>

<%=intl._t("Edit server settings")%>

<% + %>

<%=intl._t("Edit Server Settings")%> (<%=editBean.getTunnelName(curTunnel)%>)

<% } else { tunnelTypeName = editBean.getTypeName(request.getParameter("type")); tunnelType = net.i2p.data.DataHelper.stripHTML(request.getParameter("type")); - %>

<%=intl._t("New server settings")%>

<% + %>

<%=intl._t("New Server Settings")%>

<% } %> @@ -79,103 +77,115 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% } %> -
- -
-
-
-
- - -
-
- - <%=tunnelTypeName%> -
-
- - -
-
- - class="tickbox" /> - <%=intl._t("(Check the Box for 'YES')")%> -
- -
-
-
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if (!"streamrserver".equals(tunnelType)) { %> -
- - -
+ <% } /* !streamrserver */ %> -
-
+ <% if (!"streamrserver".equals(tunnelType)) { %> -
- - class="tickbox" /> -
+ + + + <% if ("httpbidirserver".equals(tunnelType)) { %> -
-
-
-
- -
-
-
+ + + + + + + <% } /* httpbidirserver */ %> <% if ("httpbidirserver".equals(tunnelType) || "streamrserver".equals(tunnelType)) { %> -
- + +
<% } /* httpbidirserver || streamrserver */ %> + + -
-
-
- <% if (("httpserver".equals(tunnelType)) || ("httpbidirserver".equals(tunnelType))) { - %>
- - - <%=intl._t("(leave blank for outproxies)")%> -
+ %> + + + + + + + + + <% } - %>
-
+ + + + + + -
- - -
+ + + + + + + <% /****** @@ -238,7 +266,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } - + <% } // sig @@ -248,7 +276,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; } String b64 = editBean.getDestinationBase64(curTunnel); if (!"".equals(b64)) { %> -
+
+ <% b64 = b64.replace("=", "%3d"); String name = editBean.getSpoofedHost(curTunnel); @@ -257,46 +286,50 @@ input.default { width: 1px; height: 1px; visibility: hidden; } // mysite.i2p is set in the installed i2ptunnel.config if (name != null && !name.equals("") && !name.equals("mysite.i2p") && !name.contains(" ") && name.endsWith(".i2p")) { %> - <% } else { %> - - <%=intl._t("Set name with .i2p suffix to enable QR code generation")%> - <%=intl._t("Set name with .i2p suffix to enable registration authentication")%> + <% } // name %> - + + <% } // b64 %> -
-
- +
+ <%=intl._t("Name")%> + + <%=intl._t("Type")%> +
+ + + <%=tunnelTypeName%> +
+ <%=intl._t("Description")%> + + <%=intl._t("Auto Start Tunnel")%> +
+ + + +
<% if ("streamrserver".equals(tunnelType)) { %> - + <%=intl._t("Access Point")%> <% } else { %> - + <%=intl._t("Target")%> <% } %> - +
+ <%=intl._t("Host")%>: + + + <%=intl._t("Port")%>: <% String value = editBean.getTargetPort(curTunnel); if (value == null || "".equals(value.trim())) { - out.write(" ("); + out.write(" ("); out.write(intl._t("required")); - out.write(")"); - } + out.write(")"); + } %> - - - + +
+ <% } /* !streamrserver */ %> - +
+ <%=intl._t("Access Point")%> +
+ <%=intl._t("Port")%>: + <% String value4 = editBean.getClientPort(curTunnel); if (value4 == null || "".equals(value4.trim())) { - out.write(" ("); + out.write(" ("); out.write(intl._t("required")); - out.write(")"); + out.write(")"); } %> - - - + + + + <%=intl._t("Reachable by")%>: + - + +
+ <%=intl._t("Website Hostname")%> +
+ + <%=intl._t("(leave blank for outproxies)")%> +
+ <%=intl._t("Private key file")%> +
<% String value3 = editBean.getPrivateKeyFile(curTunnel); if (value3 == null || "".equals(value3.trim())) { - out.write(" ("); + out.write(" ("); out.write(intl._t("required")); - out.write(")"); + out.write(")"); } %> - - - + +
+ <%=intl._t("Local destination")%> +
+ +
" href="/imagegen/qr?s=320&t=<%=name%>&c=http%3a%2f%2f<%=name%>%2f%3fi2paddresshelper%3d<%=b64%>" target="_top"><%=intl._t("Generate QR Code")%> - <%=intl._t("Add to local addressbook")%> -      - <%=intl._t("Registration Authentication")%> + <%=intl._t("Registration Authentication")%> + + <%=intl._t("Note: In order to enable QR code generation or registration authentication, configure the Name field above with .i2p suffix eg. mynewserver.i2p")%> +
-
-
-

<%=intl._t("Advanced networking options")%>

-
+

<%=intl._t("Advanced Networking Options")%>

-
-
-
- -
- -
-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if (!"streamrserver".equals(tunnelType)) { %> -
- + +
+ + + + + + -
-
-
<% } /* !streamrserver */ %> -
- -
-
- - readonly="readonly" <% } %> /> -
-
- - readonly="readonly" <% } %> /> -
- -
-
-
- -
- -
-
- - class="tickbox" /> -
-
- - -
-
- - - <%=intl._t("(Tunnel must be stopped first)")%> -
- -
-
-
- -
- -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
- -
-
- - -
-
- - -
-
- - -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
+ + + + + + + + + + + <% if (("httpserver".equals(tunnelType)) || ("httpbidirserver".equals(tunnelType))) { - %>
-
- -
-
- - -
-
- - -
-
-
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
- <% } // httpserver - %>
-
-
- -
- -
-
- - class="tickbox" /> -
-
- - -
-
- - -
+ %> + + + + + + + + + + + + + <% } // httpserver + %> + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
- <% /***************** %>
+ + + + + + <% } // isAdvanced %> <% @@ -758,35 +823,34 @@ input.default { width: 1px; height: 1px; visibility: hidden; } } // ab64 %>
<% } // currentSigType %> - -
- - -
- -
-
- -
-
-
-
+ +
+ + + + + + + + + +
+ <%=intl._t("Tunnel Options")%> +
+ <%=intl._t("Length")%> + + <%=intl._t("Variance")%> +
- -
- +
- -
- + %> +
+ <%=intl._t("Count")%> + + <%=intl._t("Backup Count")%> +
- -
- + +
- - -
-
-
- + %> +
+ <%=intl._t("Profile")%> +
- + +
+ <%=intl._t("Router I2CP Address")%> +
+ <%=intl._t("Host")%>: + readonly="readonly" <% } %> /> + + <%=intl._t("Port")%>: + readonly="readonly" <% } %> /> +
+ <%=intl._t("Encrypt Leaseset")%> +
+ +
+ <%=intl._t("Encryption Key")%> + + <%=intl._t("Generate New Key")%> (<%=intl._t("Tunnel must be stopped first")%>) +
+ + + +
+ <%=intl._t("Restricted Access List")%> +
<% /* can't use
+ <%=intl._t("Access List")%> (<%=intl._t("Specify clients, 1 per line")%>) +
+ +
+ <%=intl._t("Server Access Options")%> +
+ + + +
+ + + " value="<%=editBean.getUserAgents(curTunnel)%>" class="freetext" /> +
+ + + +
+ <%=intl._t("Server Throttling")%> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if (("httpserver".equals(tunnelType)) || ("httpbidirserver".equals(tunnelType))) { + %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% } // httpserver + %> + + +
+ <%=intl._t("Inbound connection limits (0=unlimited)")%> +
<%=intl._t("Per Minute")%><%=intl._t("Per Hour")%><%=intl._t("Per Day")%>
<%=intl._t("Per Client")%> + + + + + +
<%=intl._t("Total")%> + + + + + +
<%=intl._t("Max concurrent connections (0=unlimited)")%>
+ +
+ <%=intl._t("POST limits (0=unlimited)")%> +
+ <%=intl._t("Per Period")%> + + <%=intl._t("Ban Duration")%> +
+ <%=intl._t("Per Client")%> + + + + + + <%=intl._t("minutes")%> +
+ <%=intl._t("Total")%> + + + + + + <%=intl._t("minutes")%> +
+ <%=intl._t("POST limit period")%> + + + + <%=intl._t("minutes")%> +
+
+ <%=intl._t("Reduce tunnel quantity when idle")%> +
+ +
+ <%=intl._t("Reduced tunnel count")%>: + + + <%=intl._t("Idle period")%>: + + <%=intl._t("minutes")%> +
+ <%=intl._t("Signature type")%> (<%=intl._t("Experts only! Changes B32!")%>) +
+ + + <% if (editBean.isSigTypeAvailable(1)) { %> -
- - class="tickbox" /> -
+ + + <% } if (editBean.isSigTypeAvailable(2)) { %> -
- - class="tickbox" /> -
+ + + <% } if (editBean.isSigTypeAvailable(3)) { %> -
- - class="tickbox" /> -
+ + + <% } if (editBean.isSigTypeAvailable(7)) { %> -
- - class="tickbox" /> -
+ + + <% } // isAvailable %> - - -
-
-
+ +
+ <%=intl._t("Custom options")%> +
+ +
- - - - - + + +
+
- + <% } else { - %>Tunnels are not initialized yet, please reload in two minutes.<% + %>
<%=intl._t("Tunnels are not initialized yet, please reload in two minutes.")%>
<% } // isInitialized() %> diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index f0faf2c946..1c6758c9b3 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -29,46 +29,42 @@ <% if (indexBean.allowCSS()) { %> - - + <% } %> - - -
-
-

<%=intl._t("Status Messages")%>

-
- -
-
-
+
+

<%=intl._t("Status Messages")%>

+ + + + -
-
-
-
-
+
+ + +
+
<%=intl._t("Refresh")%> - - - +
+
+ <% if (indexBean.isInitialized()) { String nextNonce = net.i2p.i2ptunnel.web.IndexBean.getNextNonce(); %> -
-
-
-
+ +
+

<%=intl._t("Global Tunnel Control")%>

+ + + + +
<%=intl._t("Tunnel Wizard")%> <%=intl._t("Stop All")%> <%=intl._t("Start All")%> @@ -77,52 +73,44 @@ //this is really bad because it stops and restarts all tunnels, which is probably not what you want <%=intl._t("Reload Config")%> --%> - - - +
+
+
+ +

<%=intl._t("I2P Hidden Services")%>

+ + + + + + + + + -
-
- -

<%=intl._t("I2P Hidden Services")%>

-
- - -
- -
- -
-
- -
-
- -
-
- -
- <% for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) { if (indexBean.isClient(curServer)) continue; %> -
- - <%=indexBean.getTunnelName(curServer)%> -
-
- - + + +
+ + + + + + + + + + + + -
- -
<%=indexBean.getTunnelDescription(curServer)%>
-
- -
-
-
<% } %> -
-
-
- -
-
-
- - + +
+ + +
<%=intl._t("Name")%><%=intl._t("Type")%><%=intl._t("Points at")%><%=intl._t("Preview")%><%=intl._t("Status")%><%=intl._t("Control")%>
+  <%=indexBean.getTunnelName(curServer)%>"><%=indexBean.getTunnelName(curServer)%> + <%=indexBean.getTunnelType(curServer)%> <% if (indexBean.isServerTargetLinkValid(curServer)) { if (indexBean.isSSLEnabled(curServer)) { %> - <%=indexBean.getServerTarget(curServer)%> SSL + " target="_top"><%=indexBean.getServerTarget(curServer)%> SSL <% } else { %> - <%=indexBean.getServerTarget(curServer)%> + " target="_top"><%=indexBean.getServerTarget(curServer)%> <% } } else { @@ -133,64 +121,66 @@ <% } } - %> - -
+ %> +
<% if (("httpserver".equals(indexBean.getInternalType(curServer)) || ("httpbidirserver".equals(indexBean.getInternalType(curServer)))) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) { - %> - <%=intl._t("Preview")%> + %> + " href="http://<%=indexBean.getDestHashBase32(curServer)%>" target="_top"><%=intl._t("Preview")%> <% } else if (indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) { - %><%=intl._t("Base32 Address")%>:
<%=indexBean.getDestHashBase32(curServer)%> + %><%=intl._t("Base32 Address")%>:<%=indexBean.getDestHashBase32(curServer)%> <% } else { - %><%=intl._t("No Preview")%> + %><%=intl._t("No Preview")%> <% } - %> -
- + %> +
<% switch (indexBean.getTunnelStatus(curServer)) { case IndexBean.STARTING: - %>
<%=intl._t("Starting...")%>
- <%=intl._t("Stop")%> + %>
"><%=intl._t("Starting...")%>
+ 		+ " href="list?nonce=<%=nextNonce%>&action=stop&tunnel=<%=curServer%>"><%=intl._t("Stop")%> <% break; case IndexBean.RUNNING: - %>
<%=intl._t("Running")%>
- <%=intl._t("Stop")%> + %>
"><%=intl._t("Running")%>
+ 		+ " href="list?nonce=<%=nextNonce%>&action=stop&tunnel=<%=curServer%>"><%=intl._t("Stop")%> <% break; case IndexBean.NOT_RUNNING: - %>
<%=intl._t("Stopped")%>
- <%=intl._t("Start")%> + %>
"><%=intl._t("Stopped")%>
+ 		+ " href="list?nonce=<%=nextNonce%>&action=start&tunnel=<%=curServer%>"><%=intl._t("Start")%> <% break; } - %> + %> +
+ Description: + <%=indexBean.getTunnelDescription(curServer)%> +
+ + <%=intl._t("New hidden service")%>:  " /> - - - +
+
+
+

<%=intl._t("I2P Client Tunnels")%>

-
-
- -

<%=intl._t("I2P Client Tunnels")%>

-
+ + + + + + + + + - -
- -
- -
-
- -
-
- -
-
- -
-
- -
- -
-
-
<% for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) { if (!indexBean.isClient(curClient)) continue; - %> -
- - <%=indexBean.getTunnelName(curClient)%> -
-
- - - <% - String cPort= indexBean.getClientPort2(curClient); - out.write(cPort); - if (indexBean.isSSLEnabled(curClient)) - out.write(" SSL"); - %> - -
-
- - <%=indexBean.getTunnelType(curClient)%> -
-
- - + %> + + +
+ + + + + + + + + + + + + + <% /* TODO SSL outproxy for httpclient if plugin not present */ %> - -
- -
<%=indexBean.getTunnelDescription(curClient)%>
-
- -
-
-
+ + + <% } - %> -
-
-
- -
+ %> +
+ + +
<%=intl._t("Name")%><%=intl._t("Type")%><%=intl._t("Interface")%><%=intl._t("Port")%><%=intl._t("Status")%><%=intl._t("Control")%>
+  <%=indexBean.getTunnelName(curClient)%>"><%=indexBean.getTunnelName(curClient)%> + <%=indexBean.getTunnelType(curClient)%> <% /* should only happen for streamr client */ String cHost= indexBean.getClientInterface(curClient); @@ -270,45 +232,60 @@ out.write(cHost); } %> - - -
- +
+ <% + String cPort= indexBean.getClientPort2(curClient); + out.write(cPort); + if (indexBean.isSSLEnabled(curClient)) + out.write(" SSL"); + %> + <% switch (indexBean.getTunnelStatus(curClient)) { case IndexBean.STARTING: - %>
<%=intl._t("Starting...")%>
- <%=intl._t("Stop")%> + %>
"><%=intl._t("Starting...")%>
+ 		+ " href="list?nonce=<%=nextNonce%>&action=stop&tunnel=<%=curClient%>"><%=intl._t("Stop")%> <% break; case IndexBean.STANDBY: - %>
<%=intl._t("Standby")%>
+ %>
"><%=intl._t("Standby")%>
+ 		<%=intl._t("Stop")%> <% break; case IndexBean.RUNNING: - %>
<%=intl._t("Running")%>
+ %>
"><%=intl._t("Running")%>
+ 		<%=intl._t("Stop")%> <% break; case IndexBean.NOT_RUNNING: - %>
<%=intl._t("Stopped")%>
- <%=intl._t("Start")%> + %>
"><%=intl._t("Stopped")%>
+ 		+ " href="list?nonce=<%=nextNonce%>&action=start&tunnel=<%=curClient%>"><%=intl._t("Start")%> <% break; } - %> - -
-
+ <% if ("httpclient".equals(indexBean.getInternalType(curClient)) || "connectclient".equals(indexBean.getInternalType(curClient)) || "sockstunnel".equals(indexBean.getInternalType(curClient)) || "socksirctunnel".equals(indexBean.getInternalType(curClient))) { %> - <%=intl._t("Outproxy")%>: + <%=intl._t("Outproxy")%>: <% } else { %> - <%=intl._t("Destination")%>: + <%=intl._t("Destination")%>: <% } %> - -
+ <% if (indexBean.getIsUsingOutproxyPlugin(curClient)) { %><%=intl._t("internal plugin")%><% @@ -322,30 +299,22 @@ %><%=intl._t("none")%><% } } %> -
- +
+ <%=intl._t("Description")%>: + <%=indexBean.getTunnelDescription(curClient)%> +
-
- - + <%=intl._t("New client tunnel")%>:  " /> -
- - +
+
+ <% } // isInitialized() %> - + diff --git a/apps/i2ptunnel/jsp/register.jsp b/apps/i2ptunnel/jsp/register.jsp index 4bd2f693f8..0b3c2aff14 100644 --- a/apps/i2ptunnel/jsp/register.jsp +++ b/apps/i2ptunnel/jsp/register.jsp @@ -29,25 +29,22 @@ <% if (editBean.allowCSS()) { %> - - + <% } %> - - + + <% if (editBean.isInitialized()) { %>
-
-
+
<% String tunnelTypeName; String tunnelType; @@ -55,11 +52,11 @@ input.default { width: 1px; height: 1px; visibility: hidden; } if (curTunnel >= 0) { tunnelTypeName = editBean.getTunnelType(curTunnel); tunnelType = editBean.getInternalType(curTunnel); - %>

<%=intl._t("Registration Helper")%>

<% + %>

<%=intl._t("Registration Helper")%> (<%=editBean.getTunnelName(curTunnel)%>)

<% } else { tunnelTypeName = "new"; tunnelType = "new"; - %>

Fail

Tunnel not found

<% + %>

Fail

Tunnel not found

<% } String b64 = editBean.getDestinationBase64(curTunnel); String name = editBean.getSpoofedHost(curTunnel); @@ -70,87 +67,95 @@ input.default { width: 1px; height: 1px; visibility: hidden; } -
<% if (!"new".equals(tunnelType)) { %> -
+ + + + + + + + + <% if (("httpserver".equals(tunnelType)) || ("httpbidirserver".equals(tunnelType))) { - %>
- - <%=editBean.getSpoofedHost(curTunnel)%> -
+ %> + <% } %> + -
-
-
+ <% if (b64 == null || b64.length() < 516) { - %><%=intl._t("Local destination is not available. Start the tunnel.")%><% + %><% } else if (name == null || name.equals("") || name.contains(" ") || !name.endsWith(".i2p")) { if (("httpserver".equals(tunnelType)) || ("httpbidirserver".equals(tunnelType))) { - %><%=intl._t("To enable registration verification, edit tunnel and set name (or website name) to a valid host name ending in '.i2p'")%><% + %><% } else { - %><%=intl._t("To enable registration verification, edit tunnel and set name to a valid host name ending in '.i2p'")%><% + %><% } } else { SigningPrivateKey spk = editBean.getSigningPrivateKey(curTunnel); if (spk == null) { - %><%=intl._t("Destination signing key is not available. Start the tunnel.")%><% + %><% } else { valid = true; OrderedProperties props = new OrderedProperties(); HostTxtEntry he = new HostTxtEntry(name, b64, props); he.sign(spk); - %>
- - -
- -
-
-

<%=intl._t("Advanced authentication strings")%>

-
+ %> + +
+ + + + + +
<%=intl._t("Please be sure to select, copy, and paste the entire contents of the appropriate authentication data into the form of your favorite registration site")%> -
-
-
-
-
- - <%=editBean.getTunnelName(curTunnel)%> -
+
+ <%=intl._t("Tunnel Name")%>: <%=editBean.getTunnelName(curTunnel)%> +
<%=intl._t("Website Name")%>: <%=editBean.getSpoofedHost(curTunnel)%>
<%=intl._t("Local destination is not available. Start the tunnel.")%>
<%=intl._t("To enable registration verification, edit tunnel and set name (or website name) to a valid host name ending in '.i2p'")%>
<%=intl._t("To enable registration verification, edit tunnel and set name to a valid host name ending in '.i2p'")%>
<%=intl._t("Destination signing key is not available. Start the tunnel.")%>
+ <%=intl._t("Authentication for adding host {0}", name)%> +
+ +
+ +

<%=intl._t("Advanced authentication strings")%>

+ <% props.remove(HostTxtEntry.PROP_SIG); props.setProperty(HostTxtEntry.PROP_ACTION, HostTxtEntry.ACTION_REMOVE); he.signRemove(spk); - %>
- - - <%=intl._t("This will remove the entry for {0}", name)%> -
-
-
-
+ %> + + + + + + + + + <% String oldname = wrequest.getParameter("oldname"); String olddestfile = wrequest.getFilename("olddestfile"); @@ -173,90 +178,135 @@ input.default { width: 1px; height: 1px; visibility: hidden; } } } props.remove(HostTxtEntry.PROP_SIG); - %>
-
+ + <% if (oldname != null && oldname.length() > 0 && !oldname.equals(name)) { props.setProperty(HostTxtEntry.PROP_ACTION, HostTxtEntry.ACTION_CHANGENAME); props.setProperty(HostTxtEntry.PROP_OLDNAME, oldname); he.sign(spk); - %> - <%=intl._t("This will change the name from {0} to {1}, using the same destination", oldname, name)%> + %> + + + + + + + <% } else { - %><%=intl._t("This tunnel must be configured with the new host name.")%> - <%=intl._t("Enter old host name below.")%> + %> <% } - %> -
-
-
+ %> + <% props.remove(HostTxtEntry.PROP_SIG); - %>
-
+ + <% if (oldname != null && oldname.length() > 0 && !oldname.equals(name)) { props.setProperty(HostTxtEntry.PROP_ACTION, HostTxtEntry.ACTION_ADDNAME); props.setProperty(HostTxtEntry.PROP_OLDNAME, oldname); he.sign(spk); - %> - <%=intl._t("This will add an alias {0} for {1}, using the same destination", name, oldname)%> + %> + + + + + + <% } else { - %><%=intl._t("This tunnel must be configured with the new host name.")%> - <%=intl._t("Enter old host name below.")%> + %> <% } - %> -
-
-
+ %> + <% props.remove(HostTxtEntry.PROP_SIG); props.remove(HostTxtEntry.PROP_OLDNAME); - %>
-
+ + + <% if (spk2 != null) { props.setProperty(HostTxtEntry.PROP_ACTION, HostTxtEntry.ACTION_CHANGEDEST); props.setProperty(HostTxtEntry.PROP_OLDDEST, olddest); he.signInner(spk2); he.sign(spk); - %> - <%=intl._t("This will change the destination for {0}", name)%> + %> + + + + + + + + <% } else { - %><%=intl._t("This tunnel must be configured with the new destination.")%> - <%=intl._t("Enter old destination below.")%> + %> <% } - %> -
-
-
+ %> + <% props.remove(HostTxtEntry.PROP_SIG); props.remove(HostTxtEntry.PROP_OLDSIG); - %>
-
+ + + <% if (spk2 != null) { props.setProperty(HostTxtEntry.PROP_ACTION, HostTxtEntry.ACTION_ADDDEST); props.setProperty(HostTxtEntry.PROP_OLDDEST, olddest); he.signInner(spk2); he.sign(spk); - %> - <%=intl._t("This will add an alternate destination for {0}", name)%> + %> + + + + + + <% } else { // If set, use the configured alternate destination as the new alias destination, @@ -282,26 +332,29 @@ input.default { width: 1px; height: 1px; visibility: hidden; } props2.setProperty(HostTxtEntry.PROP_OLDDEST, b64); he2.signInner(spk); he2.sign(spk3); - %> - <%=intl._t("This will add an alternate destination for {0}", name)%> + %> + <% } else { - %><%=intl._t("This tunnel must be configured with the new destination.")%> - <%=intl._t("Enter old destination below.")%> + %> <% } // spk3 } // spk2 - %> -
-
-
+ %> + <% + + props.remove(HostTxtEntry.PROP_SIG); props.remove(HostTxtEntry.PROP_OLDSIG); - %>
-
+ + <% if (oldname != null && oldname.length() > 0 && !oldname.equals(name) && spk2 != null) { props.setProperty(HostTxtEntry.PROP_ACTION, HostTxtEntry.ACTION_ADDSUBDOMAIN); @@ -309,73 +362,98 @@ input.default { width: 1px; height: 1px; visibility: hidden; } props.setProperty(HostTxtEntry.PROP_OLDDEST, olddest); he.signInner(spk2); he.sign(spk); - %> - <%=intl._t("This will add a subdomain {0} of {1}, with a different destination", name, oldname)%> + %> + + + + + + + + <% } else { - %><%=intl._t("This tunnel must be configured with the new subdomain and destination.")%> - <%=intl._t("Enter higher-level domain and destination below.")%> + %> + + + + <% } - %> + %> -
-
<% } // spk != null } // valid b64 and name } // !"new".equals(tunnelType) if (!valid && curTunnel >= 0) { - %><%=intl._t("Go back and edit the tunnel")%><% + %> + + + + <% } %> - - <% if (valid) { %> -
-
-

<%=intl._t("Specify old name and destination")%>

-
- - <%=intl._t("This is only required for advanced authentication.")%> - <%=intl._t("See above for required items.")%> -
+ +
+ + + + + <% String oldname = wrequest.getParameter("oldname"); if (oldname == null) oldname = ""; - %>
- - -
-
- - -
-
-
+ %> +
+ + + + + + + + + <% } // valid %> + +
+ <%=intl._t("Authentication for removing host {0}", name)%> +
+ +
<%=intl._t("Authentication for changing name")%> - +
+ +
+ <%=intl._t("This will change the name from {0} to {1}, using the same destination", oldname, name)%> +
<%=intl._t("This tunnel must be configured with the new host name.")%> +  <%=intl._t("Enter old hostname below.")%>
<%=intl._t("Authentication for adding alias")%> - +
+ +
+ <%=intl._t("This will add an alias {0} for {1}, using the same destination", name, oldname)%> +
<%=intl._t("This tunnel must be configured with the new host name.")%> +  <%=intl._t("Enter old hostname below.")%>
<%=intl._t("Authentication for changing destination")%> - +
+ +
+ <%=intl._t("This will change the destination for {0}", name)%> +
<%=intl._t("This tunnel must be configured with the new destination.")%> +  <%=intl._t("Enter old destination below.")%>
<%=intl._t("Authentication for adding alternate destination")%> - +
+ +
+ <%=intl._t("This will add an alternate destination for {0}", name)%> +
<%=intl._t("This will add an alternate destination for {0}", name)%>
<%=intl._t("This tunnel must be configured with the new destination.")%> +  <%=intl._t("Enter old destination below.")%>
<%=intl._t("Authentication for adding subdomain")%> - +
+ +
+ <%=intl._t("This will add a subdomain {0} of {1}, with a different destination", name, oldname)%> +
+ <%=intl._t("This tunnel must be configured with the new subdomain and destination.")%> +  <%=intl._t("Enter higher-level domain and destination below.")%> +
+ <%=intl._t("Go back and edit the tunnel")%> +
+ <%=intl._t("Specify old name and destination")%> +
+ <%=intl._t("This is only required for advanced authentication.")%> +  <%=intl._t("See above for required items.")%> +
+ <%=intl._t("Old Hostname")%>: + +
+ <%=intl._t("Private Key File for old Destination")%>: + +
- - - +
+
- <% } else { - %>Tunnels are not initialized yet, please reload in two minutes.<% + %>
<%=intl._t("Tunnels are not initialized yet, please reload in two minutes.")%>
<% } // isInitialized() %> diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp index b8d7afae94..41bc725a17 100644 --- a/apps/i2ptunnel/jsp/wizard.jsp +++ b/apps/i2ptunnel/jsp/wizard.jsp @@ -63,48 +63,45 @@ <% if (editBean.allowCSS()) { %> - <% } %> -
">
-
+ <% if (curPage == 1) { - %>

<%=intl._t("Server or client tunnel?")%>

<% + %>

<%=intl._t("Server or client tunnel?")%>

<% } else if (curPage == 2) { - %>

<%=intl._t("Tunnel type")%>

<% + %>

<%=intl._t("Tunnel type")%>

<% } else if (curPage == 3) { - %>

<%=intl._t("Tunnel name and description")%>

<% + %>

<%=intl._t("Tunnel name and description")%>

<% } else if (curPage == 4 && tunnelIsClient) { - %>

<%=intl._t("Tunnel destination")%>

<% + %>

<%=intl._t("Tunnel destination")%>

<% } else if (curPage == 5) { - %>

<%=intl._t("Binding address and port")%>

<% + %>

<%=intl._t("Binding address and port")%>

<% } else if (curPage == 6) { - %>

<%=intl._t("Tunnel auto-start")%>

<% + %>

<%=intl._t("Tunnel auto-start")%>

<% } else if (curPage == 7) { - %>

<%=intl._t("Wizard completed")%>

<% + %>

<%=intl._t("Wizard completed")%>

<% } %> -
-
-
-
+ <% /* Page 1 - Whether to make a client or server tunnel */ if (curPage == 1) { - %>

+ %> +

+ + + + + + + <% } else { %><% } /* curPage 1 */ @@ -127,10 +134,18 @@ <% /* Page 2 - Tunnel type */ if (curPage == 2) { - %>

+ %> +

+ + + <% } else { %><% } /* curPage 2 */ @@ -221,22 +245,28 @@ <% /* Page 3 - Name and description */ if (curPage == 3) { - %>

+ %> +

+ + + + + + + + + <% } else { %>" /> " /><% @@ -249,36 +279,47 @@ if (tunnelIsClient) { if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) { if (curPage == 4) { - %>

+ %> +

+ + + + + + <% } else { %>" /><% } /* curPage 4 */ } else if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "streamrclient".equals(tunnelType)) { if (curPage == 4) { - %>

+ %> +

+ + + + + + <% } else { %>" /><% } /* curPage 4 */ @@ -291,16 +332,22 @@ if ((tunnelIsClient && "streamrclient".equals(tunnelType)) || (!tunnelIsClient && !"streamrserver".equals(tunnelType))) { if (curPage == 5) { - %>

- <%=intl._t("This is the IP that your service is running on, this is usually on the same machine so 127.0.0.1 is autofilled.")%><% - //XXX TODO<%=intl._t("For some reason streamrclient also uses this.")%> + %> +

+ + + + + + <% } else { %>" /><% } /* curPage 5 */ @@ -308,15 +355,21 @@ <% if (!tunnelIsClient) { if (curPage == 5) { - %>

+ %> +

+ + + + + + <% } else { %>" /><% } /* curPage 5 */ @@ -324,16 +377,22 @@ <% if (tunnelIsClient || "httpbidirserver".equals(tunnelType)) { if (curPage == 5) { - %>

+ %> +

+ + + + + + <% } else { %>" /><% } /* curPage 5 */ @@ -341,16 +400,20 @@ <% if ((tunnelIsClient && !"streamrclient".equals(tunnelType)) || "httpbidirserver".equals(tunnelType) || "streamrserver".equals(tunnelType)) { if (curPage == 5) { - %>

+ %> +

+ + + + + + <% } else { %>" /><% } /* curPage 5 */ @@ -380,17 +445,22 @@ <% /* Page 6 - Automatic start */ if (curPage == 6) { - %>

+ %> +

+ + + + + + <% } else { if ("1".equals(request.getParameter("startOnLoad"))) { %>" /><% @@ -402,7 +472,10 @@ <% /* Page 7 - Wizard complete */ if (curPage == 7) { - %>

+ %> +

+
+

<%=intl._t("This wizard will take you through the various options available for creating tunnels in I2P.")%>

@@ -112,12 +109,22 @@ <%=intl._t("If you need to connect to a remote service, such as an IRC server inside I2P or a code repository, then you will require a CLIENT tunnel.")%> <%=intl._t("On the other hand, if you wish to host a service for others to connect to you'll need to create a SERVER tunnel.")%>

-
- - - - -
<% +
+ + + + + + +
+

<%=intl._t("There are several types of tunnels to choose from:")%>

- <% + + + + + + + +
+ + <% if (tunnelIsClient) { %> <% } %> -
<%=intl._t("Standard")%> @@ -189,8 +204,12 @@
-
+ +
+ <%=intl._t("Select tunnel type")%>: + <% if (tunnelIsClient) { %><% } /* tunnelIsClient */ %> - <% +
+
+

<%=intl._t("Choose a name and description for your tunnel.")%> <%=intl._t("These can be anything you want - they are just for ease of identifying the tunnel in the routerconsole.")%>

-
- - " class="freetext" /> -
-
- +
+ <%=intl._t("Name")%>: + " class="freetext" /> +
+ <%=intl._t("Description")%>: " class="freetext" /> - <% +
+

<%=intl._t("If you know of any outproxies for this type of tunnel (either HTTP or SOCKS), fill them in below.")%> <%=intl._t("Separate multiple proxies with commas.")%>

-
- +
+ <%=intl._t("Outproxies")%>: " class="freetext" /> - <% +
+

<%=intl._t("Type in the I2P destination of the service that this client tunnel should connect to.")%> <%=intl._t("This could be the full base 64 destination key, or an I2P URL from your address book.")%>

-
- +
+ <%=intl._t("Tunnel Destination")%>: " class="freetext" /> - (<%=intl._t("name, name:port, or destination")%> +  (<%=intl._t("name, name:port, or destination")%> <% if ("streamrclient".equals(tunnelType)) { /* deferred resolution unimplemented in streamr client */ %> - <%=intl._t("b32 not recommended")%> <% } %> ) - - <% +
+

+ <%=intl._t("This is the IP that your service is running on, this is usually on the same machine so 127.0.0.1 is autofilled.")%> + <% //TODO For some reason streamrclient also uses this. %>

-
- - " class="freetext" /> -
<% +
+ <%=intl._t("Host")%>: + " class="freetext" /> +
+

<%=intl._t("This is the port that the service is accepting connections on.")%>

-
- +
+ <%=intl._t("Port")%>: " class="freetext" /> - <% +
+

<%=intl._t("This is the port that the client tunnel will be accessed from locally.")%> <%=intl._t("This is also the client port for the HTTPBidir server tunnel.")%>

-
- +
+ <%=intl._t("Port")%>: " class="freetext" /> - <% +
+

<%=intl._t("How do you want this tunnel to be accessed? By just this machine, your entire subnet, or external internet?")%> <%=intl._t("You will most likely want to just allow 127.0.0.1")%><% - //XXX TODO<%=intl._t("Note that it is relevant to most Client tunnels, and httpbidirserver and streamrserver tunnels.")%><% - //XXX TODO<%=intl._t("So the wording may need to change slightly for the client vs. server tunnels.")%> + //TODO Note that it is relevant to most Client tunnels, and httpbidirserver and streamrserver tunnels. + //TODO So the wording may need to change slightly for the client vs. server tunnels. %>

-
- +
+ <%=intl._t("Reachable by")%>: - <% +
+

<%=intl._t("The I2P router can automatically start this tunnel for you when the router is started.")%> <%=intl._t("This can be useful for frequently-used tunnels (especially server tunnels), but for tunnels that are only used occassionally it would mean that the I2P router is creating and maintaining unnecessary tunnels.")%>

-
- - class="tickbox" /> - <%=intl._t("(Check the Box for 'YES')")%> -
<% +
+ +
+

<%=intl._t("The wizard has now collected enough information to create your tunnel.")%> <%=intl._t("Upon clicking the Save button below, the wizard will set up the tunnel, and take you back to the main I2PTunnel page.")%> <% @@ -417,7 +490,11 @@

<%=intl._t("Below is a summary of the options you chose:")%>

- + + + + + + + + + <% } /* tunnelIsClient */ } /* curPage 7 */ /* End page 7 */ %> - - -
-
-
-
+
+ + +
+ @@ -440,10 +517,11 @@ Streamr<% } %> - <% + + + + + <% if (tunnelIsClient) { %> <% } %> - <% } if (!tunnelIsClient) { %> - <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetPort"))%>
<% + <% } if (tunnelIsClient || "httpbidirserver".equals(tunnelType)) { %> -
<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("port"))%><% + <% } if ((tunnelIsClient && !"streamrclient".equals(tunnelType)) || "httpbidirserver".equals(tunnelType) || "streamrserver".equals(tunnelType)) { %> -
<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("reachableBy"))%><% + <% } %> -
<%=intl._t("Server or client tunnel?")%> <%=(tunnelIsClient ? "Client" : "Server")%>
<%=intl._t("Tunnel name and description")%> - <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("name"))%>
- <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_description"))%> -
<%=intl._t("Tunnel name")%><%=net.i2p.data.DataHelper.stripHTML(request.getParameter("name"))%>
<%=intl._t("Tunnel description")%><%=net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_description"))%>
<%=intl._t("Tunnel destination")%><% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) { %> @@ -453,20 +531,20 @@ } %>
<%=intl._t("Binding address and port")%><% + <% if ((tunnelIsClient && "streamrclient".equals(tunnelType)) || (!tunnelIsClient && !"streamrserver".equals(tunnelType))) { %> - <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost"))%>
<% +
<%=intl._t("Binding address")%> + <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost"))%>
<%=intl._t("Tunnel port")%><%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetPort"))%>
<%=intl._t("Port")%><%=net.i2p.data.DataHelper.stripHTML(request.getParameter("port"))%>
<%=intl._t("Reachable by")%><%=net.i2p.data.DataHelper.stripHTML(request.getParameter("reachableBy"))%>
<%=intl._t("Tunnel auto-start")%><% if ("1".equals(request.getParameter("startOnLoad"))) { %> Yes<% @@ -475,6 +553,10 @@ } %>
+

<%=intl._t("Alongside these basic settings, there are a number of advanced options for tunnel configuration.")%> <%=intl._t("The wizard will set reasonably sensible default values for these, but you can view and/or edit these by clicking on the tunnel's name in the main I2PTunnel page.")%> @@ -524,35 +606,33 @@ http://stats.i2p/cgi-bin/jump.cgi?a=" /><% - <% + +

<%=intl._t("Cancel")%> <% if (curPage != 1 && curPage != 7) { - %><% + %><% } %> <% if (curPage == 7) { - %><% + %><% } else if (curPage == 6) { - %><% + %><% } else { - %><% + %><% } %> - - +
- diff --git a/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/QRServlet.java b/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/QRServlet.java index 272ac5a13d..9727719071 100644 --- a/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/QRServlet.java +++ b/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/QRServlet.java @@ -150,12 +150,13 @@ public class QRServlet extends HttpServlet { if (text != null) { BufferedImage bi = MatrixToImageWriter.toBufferedImage(matrix); Graphics2D g = bi.createGraphics(); - g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); - g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); - g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); - g.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); - g.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); + // anti-aliasing and hinting degrade text with 1bit input, so let's turn this off to improve quality +// g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); +// g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); +// g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); +// g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); +// g.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); +// g.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); Font font = DEFAULT_LARGE_FONT; g.setFont(font); // doesn't work diff --git a/apps/imagegen/imagegen/webapp/src/main/webapp/index.html b/apps/imagegen/imagegen/webapp/src/main/webapp/index.html index 16cb9e359b..b7baf9b44f 100644 --- a/apps/imagegen/imagegen/webapp/src/main/webapp/index.html +++ b/apps/imagegen/imagegen/webapp/src/main/webapp/index.html @@ -3,31 +3,132 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - Image Generator Webapp + I2P Imagegen + + -

Image Generator Webapp

-

This is the webapp that creates identification images.

-

Identicon Test

- - - - - - +

I2P Identification Image Generator

-

QR Test

- - +

+This is the webapp that creates identification images. They can be found in the host list and +hostname details section +of the addressbook, in the Sybils section of +the network database, and you can generate a QR code for your .i2p named website or hidden +service in the edit section of the Tunnel Manager. +You can use the tools below to generate arbitrary identicons, QR codes and "random art" images. +

+ +

Identicons

+ +
+ + + + + + + + + + + + + + + + + + + + +
Identicons for string: planet.i2p
16x1632x3264x64256x256
22x2248x4896x96
+ +
+
Identicon Generator
+ + + +
+
+ +

QR Codes

+ +
+ + + + + + + + + + + + + +
QR Codes for string: https://geti2p.net
128x128160x160256x256
+ +
+
QR Code Generator
+ + + + +
+
+ +

Random Art

+ +

This technique renders an ASCII-Art representation of a digital fingerprint so the human brain can profit from its built-in pattern recognition ability. "Hash Visualization: a New Technique to improve Real-World Security" by Perrig A. and Song D.

+ +
+ + + + + + + + + + + + +
Random Art for I2P address: i2p-projekt.i2p
HTML TestUTF-8 Text Test
+ +
+
Random Art Generator
+ + + +
+ +
+ +
+ + -

Random Art Test

- - diff --git a/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java index d8319165db..a137aff572 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java @@ -53,7 +53,7 @@ class BanlistRenderer { return; } - buf.append("
    "); + buf.append("
      "); for (Map.Entry e : entries.entrySet()) { Hash key = e.getKey(); @@ -81,8 +81,8 @@ class BanlistRenderer { buf.append(_t(entry.cause)); } if (!key.equals(Hash.FAKE_HASH)) { - buf.append(" (").append(_t("unban now")).append(")"); + buf.append(" [").append(_t("unban now")).append("]"); } buf.append("\n"); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index 42a3f0eca1..8602ac3190 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -112,7 +112,7 @@ public class ConfigClientsHelper extends HelperBase { /** clients */ public String getForm1() { StringBuilder buf = new StringBuilder(1024); - buf.append("\n" + + buf.append("
      \n" + "
      ").append(_t("Client")).append("") .append(_t("Run at Startup?")).append("") .append(_t("Control")).append("") @@ -198,7 +198,7 @@ public class ConfigClientsHelper extends HelperBase { /** webapps */ public String getForm2() { StringBuilder buf = new StringBuilder(1024); - buf.append("\n" + + buf.append("
      \n" + "
      ").append(_t("WebApp")).append("") .append(_t("Run at Startup?")).append("") .append(_t("Control")).append("") @@ -227,7 +227,7 @@ public class ConfigClientsHelper extends HelperBase { /** plugins */ public String getForm3() { StringBuilder buf = new StringBuilder(1024); - buf.append("\n" + + buf.append("
      \n" + "
      ").append(_t("Plugin")).append("") .append(_t("Run at Startup?")).append("") .append(_t("Control")).append("") @@ -290,15 +290,17 @@ public class ConfigClientsHelper extends HelperBase { } s = stripHTML(appProps, "websiteURL"); if (s != null) { - desc.append("
      ") - .append("").append(_t("Website")).append(" "); + desc.append("
      ") + .append(_t("Website")).append("").append(s).append(""); } String updateURL = stripHTML(appProps, "updateURL.su3"); if (updateURL == null) updateURL = stripHTML(appProps, "updateURL"); if (updateURL != null) { - desc.append("
      ") - .append("").append(_t("Update link")).append(" "); + desc.append("
      ") + .append(_t("Update link")).append("").append(updateURL).append(""); } desc.append("
      "); boolean isRunning = PluginStarter.isPluginRunning(app, _context); @@ -325,7 +327,7 @@ public class ConfigClientsHelper extends HelperBase { boolean showEditButton, boolean showUpdateButton, boolean showStopButton, boolean showDeleteButton, boolean showStartButton) { String escapedName = DataHelper.escapeHTML(name); - buf.append("
      "); + buf.append("
      "); if (urlify && enabled) { String link = "/"; if (! RouterConsoleRunner.ROUTERCONSOLE.equals(name)) @@ -338,41 +340,40 @@ public class ConfigClientsHelper extends HelperBase { buf.append("\" >"); } else { if (name.length() > 0) - buf.append(_t(escapedName)); + buf.append(""); } - buf.append(""); - // The icons were way too much, so there's an X in each button class, - // remove if you wnat to put them back + buf.append(">"); + if (showStartButton && (!ro) && !edit) { - buf.append(""); } if (showStopButton && (!edit)) - buf.append(""); if (isClientChangeEnabled() && showEditButton && (!edit) && !ro) - buf.append(""); if (showUpdateButton && (!edit) && !ro) { - buf.append(""); - buf.append(""); } if (showDeleteButton && (!edit) && !ro) { - buf.append(""); } - buf.append(""); + buf.append(""); if (edit && !ro) { buf.append("
      \n"); - buf.append("

      ").append(_t("Add additional logging statements above. Example: net.i2p.router.tunnel=WARN")).append("
      "); - buf.append("").append(_t("Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN")).append("
      "); - buf.append("").append(_t("Valid levels are DEBUG, INFO, WARN, ERROR, CRIT")).append("

      \n"); + buf.append("

      ").append(_t("Add additional logging statements above. Example: net.i2p.router.tunnel=WARN")).append("
      "); + buf.append(_t("Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN")).append("
      "); + buf.append(_t("Valid levels are DEBUG, INFO, WARN, ERROR, CRIT")).append("

      \n"); /**** // this is too big and ugly diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java index 758b990ce0..769c75f36a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java @@ -57,9 +57,7 @@ public class ConfigNavHelper extends HelperBase { */ public void renderNavBar(String requestURI, boolean graphical) throws IOException { StringBuilder buf = new StringBuilder(1024); - // TODO fix up the non-light themes - String theme = _context.getProperty(CSSHelper.PROP_THEME_NAME); - boolean span = graphical && (theme == null || theme.equals(CSSHelper.DEFAULT_THEME)); + boolean span = graphical; if (!span) buf.append("
      "); List tabs = new ArrayList(pages.length); @@ -84,9 +82,9 @@ public class ConfigNavHelper extends HelperBase { buf.append("").append(tabs.get(i).title).append(""); } if (span) - buf.append(" \n"); + buf.append("\n"); else if (i != pages.length - 1) - buf.append(" |\n"); + buf.append("  \n"); } if (!span) buf.append("
      "); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index 8222a05723..7127584c43 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -215,25 +215,21 @@ public class ConfigNetHelper extends HelperBase { } } StringBuilder buf = new StringBuilder(128); - buf.append("
      "); for (String addr : addrs) { - buf.append("\n      " + - " "); buf.append(addr); - buf.append("
      "); + buf.append("
      \n"); } - buf.append("\n        "); if (!addrs.isEmpty()) { buf.append(_t("Add host name or IP")) .append(": "); } - buf.append("" + - "
      "); + buf.append(""); return buf.toString(); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java index e511511c51..5b067a914a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java @@ -104,7 +104,8 @@ public class ConfigRestartBean { for (int i = 0; i < s.length; i+= 3) { buf.append("\n"); } buf.append("\n"); 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 6e93602f4a..2a0e6b0547 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -26,7 +26,7 @@ public class ConfigTunnelsHelper extends HelperBase { cur++; } - buf.append("\n"); + buf.append("
      \n"); TunnelPoolSettings exploratoryIn = _context.tunnelManager().getInboundSettings(); TunnelPoolSettings exploratoryOut = _context.tunnelManager().getOutboundSettings(); @@ -69,7 +69,7 @@ public class ConfigTunnelsHelper extends HelperBase { boolean advanced = isAdvanced(); - buf.append("\n"); if (in.getLength() <= 0 || in.getLength() + in.getLengthVariance() <= 0 || @@ -94,7 +94,7 @@ public class ConfigTunnelsHelper extends HelperBase { // tunnel depth int maxLength = advanced ? MAX_ADVANCED_LENGTH : MAX_LENGTH; - buf.append("\n"); + buf.append("\n"); buf.append("\n"); // tunnel depth variance - buf.append("\n"); + buf.append("\n"); buf.append("\n"); + buf.append("\n"); buf.append("\n"); + buf.append("\n"); buf.append("\n" + + buf.append("\n" + "\n" + + buf.append("\n" + "") + .append("
      "); + buf.append("
      "); buf.append(name).append("
      " + _t("Length") + ":
      " + _t("Length") + ":
      " + _t("Randomization") + ":
      " + _t("Randomization") + ":
      " + _t("Quantity") + ":
      " + _t("Quantity") + ":
      " + _t("Backup quantity") + ":
      " + _t("Backup quantity") + ":
      " + _t("Inbound options") + ":
      " + _t("Inbound options") + ":" + _t("Outbound options") + ":
      " + _t("Outbound options") + ":"); String current = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME); Set themes = themeSet(); for (String theme : themes) { - buf.append("") + .append("").append(_t(theme)).append("
      \n"); + buf.append("value=\"").append(theme).append("\">") + .append("") + .append("\"\"") + .append("
      ") + .append("
      ").append(_t(theme)).append("
      ") + .append("\n"); } boolean universalTheming = _context.getBooleanProperty(CSSHelper.PROP_UNIVERSAL_THEMING); - buf.append("
      "); + buf.append("
      \n"); return buf.toString(); } public String getForceMobileConsole() { StringBuilder buf = new StringBuilder(256); boolean forceMobileConsole = _context.getBooleanProperty(CSSHelper.PROP_FORCE_MOBILE_CONSOLE); - buf.append("") .append(_t("Force the mobile console to be used")) - .append("
      \n"); + .append("
      \n"); return buf.toString(); } @@ -71,6 +79,7 @@ public class ConfigUIHelper extends HelperBase { * Any language-specific flag added to the icon set must be * added to the top-level build.xml for the updater. * As of 0.9.12, ISO 639-2 three-letter codes are supported also. + * Note: To avoid truncation, ensure language name is no longer than 17 chars. */ private static final String langs[][] = { // @@ -111,7 +120,7 @@ public class ConfigUIHelper extends HelperBase { { "vi", "vn", _x("Vietnamese"), null }, { "zh", "cn", _x("Chinese"), null }, { "zh_TW", "tw", _x("Chinese"), "Taiwan" }, - { "xx", "a1", "Debug: Find untagged strings", null }, + { "xx", "a1", "Untagged strings", null }, }; @@ -150,11 +159,12 @@ public class ConfigUIHelper extends HelperBase { if (lang.equals("xx") && !isAdvanced()) continue; // we use "lang" so it is set automagically in CSSHelper - buf.append("") - .append("\"\" "); + .append("\"\"") + .append("
      "); int under = lang.indexOf('_'); String slang = (under > 0) ? lang.substring(0, under) : lang; buf.append(Messages.getDisplayLanguage(slang, langs[i][2], _context)); @@ -164,7 +174,7 @@ public class ConfigUIHelper extends HelperBase { .append(Messages.getString(name, _context, Messages.COUNTRY_BUNDLE_NAME)) .append(')'); } - buf.append("
      \n"); + buf.append("
      \n"); } return buf.toString(); } @@ -174,32 +184,38 @@ public class ConfigUIHelper extends HelperBase { StringBuilder buf = new StringBuilder(512); ConsolePasswordManager mgr = new ConsolePasswordManager(_context); Map userpw = mgr.getMD5(RouterConsoleRunner.PROP_CONSOLE_PW); - buf.append(""); + buf.append("
      "); if (userpw.isEmpty()) { buf.append(""); } else { - buf.append("\n"); for (String name : userpw.keySet()) { - buf.append("\n"); + .append("\">\n"); } } - buf.append("" + - "
      "); buf.append(_t("Add a user and password to enable.")); buf.append("
      ") + buf.append("
      ") .append(_t("Remove")) .append("") - .append(_t("User Name")) + .append(_t("Username")) .append(" 
      ") + .append("\" name=\"delete_") .append(name) - .append("
      ") - .append(_t("Add")).append(":" + - "" + - ""); - buf.append(_t("Password")).append(": " + - "
      \n"); + buf.append("
      ") + .append("").append(_t("Username")).append(": ") + .append("") + .append("").append(_t("Password")).append(": ") + .append("") + .append("
      \n"); return buf.toString(); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java index 3b3869025b..e101659ff1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -76,27 +76,27 @@ public class ConfigUpdateHelper extends HelperBase { public String getUpdateThroughProxy() { if (_context.getProperty(ConfigUpdateHandler.PROP_SHOULD_PROXY, ConfigUpdateHandler.DEFAULT_SHOULD_PROXY)) - return ""; + return ""; else - return ""; + return ""; } /** @since 0.9.9 */ public String getNewsThroughProxy() { if (_context.getProperty(ConfigUpdateHandler.PROP_SHOULD_PROXY_NEWS, ConfigUpdateHandler.DEFAULT_SHOULD_PROXY_NEWS)) - return ""; + return ""; else - return ""; + return ""; } public String getUpdateUnsigned() { - return "'; } /** @since 0.9.20 */ public String getUpdateDevSU3() { - return "'; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java index 9dd7892f28..280b2dbf6e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java @@ -99,16 +99,16 @@ public class EventLogHelper extends FormHandler { // So just use the "shared/console nonce". String nonce = CSSHelper.getNonce(); try { - _out.write("

      " + _t("Display Events") + "

      "); + _out.write("

      " + _t("Display Events") + "

      "); _out.write("
      \n" + "\n" + - "\n"); - _out.write(_t("Events since") + ": \n"); + _out.write(_t("Events since") + ":
      "); - _out.write(_t("Event type") + ":  "); + _out.write(_t("Event type") + ": " + - "
      "); + " "); } catch (IOException ioe) { ioe.printStackTrace(); } @@ -175,7 +175,7 @@ public class EventLogHelper extends FormHandler { return _t("No \"{0}\" events found in previous {1}", xev, DataHelper.formatDuration2(_age)); } StringBuilder buf = new StringBuilder(2048); - buf.append("
      "); + buf.append("
      "); buf.append(_t("Time")); buf.append(""); if (isAll) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java index 417305c018..be7ffc3c73 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java @@ -29,7 +29,7 @@ public class FileDumpHelper extends HelperBase { public String getFileSummary() { StringBuilder buf = new StringBuilder(16*1024); - buf.append("" + + buf.append("
      FileSizeDateSHA 256Revision
      " + ""); // jars added in wrapper.config 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 169a795f36..3320b8c69f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -32,7 +32,7 @@ public class GraphHelper extends FormHandler { private static final String PROP_REFRESH = "routerconsole.graphRefresh"; private static final String PROP_PERIODS = "routerconsole.graphPeriods"; private static final String PROP_EVENTS = "routerconsole.graphEvents"; - public static final int DEFAULT_X = 250; + public static final int DEFAULT_X = 400; public static final int DEFAULT_Y = 100; private static final int DEFAULT_REFRESH = 5*60; private static final int DEFAULT_PERIODS = 60; @@ -232,12 +232,13 @@ public class GraphHelper extends FormHandler { name = r.getRateStat().getName(); displayName = name; } - _out.write("

      "); + _out.write("

      "); _out.write(_t("{0} for {1}", displayName, DataHelper.formatDuration2(_periodCount * period))); if (_end > 0) _out.write(' ' + _t("ending {0} ago", DataHelper.formatDuration2(_end * period))); - _out.write("

      [" + _t("Return to main graphs page") + "]\n" + + "

      \n"); + + "\">

      \n"); if (_width < MAX_X && _height < MAX_Y) { _out.write(link(_stat, _showEvents, _periodCount, _end, _width * 3 / 2, _height * 3 / 2)); @@ -343,7 +344,7 @@ public class GraphHelper extends FormHandler { + "\">"; } - private static final int[] times = { 60, 2*60, 5*60, 10*60, 30*60, 60*60, -1 }; + private static final int[] times = { 15, 30, 60, 2*60, 5*60, 10*60, 30*60, 60*60, -1 }; public String getForm() { if (StatSummarizer.isDisabled()) @@ -353,17 +354,18 @@ public class GraphHelper extends FormHandler { // So just use the "shared/console nonce". String nonce = CSSHelper.getNonce(); try { - _out.write("

      " + _t("Configure Graph Display") + " [" + _t("Select Stats") + "]

      "); + _out.write("

      " + _t("Configure Graph Display") + " [" + _t("Select Stats") + "]

      "); _out.write("\n" + - "\n" + + "
      FileSizeDateSHA 256RevisionJDKBuiltByMods
      \n" + "\n"); - _out.write(_t("Periods") + ":
      \n"); - _out.write(_t("Plot averages") + ": "); - _out.write(_t("or")+ " " +_t("plot events") + ":
      \n"); - _out.write(_t("Image sizes") + ": " + _t("width") + ": " + _t("pixels") + ", " + _t("height") + ": " + _t("pixels") + "
      \n"); - _out.write(_t("Refresh delay") + ":       		" + _t("minutes") + "
      \n"); + _out.write(_t("Plot type") + ":"); + _out.write("   "); + _out.write ("
      \n"); + _out.write(_t("Graph size") + ":" + _t("pixels wide") + "   " + _t("pixels high") + "" + _t("Note: Dimensions are for graph only (excludes title, labels and legend).") + "
      \n"); + _out.write(_t("Refresh delay") + ":
      \n" + - _t("Store graph data on disk?") + - "
      \n" + _t("Persistence") + + ":
      " + + "
      "); } catch (IOException ioe) { ioe.printStackTrace(); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java index 1a61bac550..9a1aae4a93 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java @@ -28,49 +28,50 @@ public class HomeHelper extends HelperBase { // No commas allowed in text strings! static final String DEFAULT_SERVICES = _x("Addressbook") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/dns" + S + I + "book_addresses.png" + S + - _x("Configure Bandwidth") + S + _x("I2P Bandwidth Configuration") + S + "/config" + S + I + "action_log.png" + S + - _x("Configure Language") + S + _x("Console Language Selection") + S + "/configui" + S + I + "wrench_orange.png" + S + + _x("Configure Bandwidth") + S + _x("I2P Bandwidth Configuration") + S + "/config" + S + I + "info/bandwidth.png" + S + + _x("Configure UI") + S + _x("Select console theme & language & set optional console password") + S + "/configui" + S + I + "info/ui.png" + S + _x("Customize Home Page") + S + _x("I2P Home Page Configuration") + S + "/confighome" + S + I + "home_page.png" + S + _x("Email") + S + _x("Anonymous webmail client") + S + "/susimail/susimail" + S + I + "email.png" + S + _x("Help") + S + _x("I2P Router Help") + S + "/help" + S + I + "support.png" + S + - _x("Router Console") + S + _x("I2P Router Console") + S + "/console" + S + I + "toolbox.png" + S + + _x("Manage Plugins") + S + _x("Install and configure I2P plugins") + S + "/configplugins" + S + I + "plugin.png" + S + + _x("Router Console") + S + _x("I2P Router Console") + S + "/console" + S + I + "info/console.png" + S + _x("Torrents") + S + _x("Built-in anonymous BitTorrent Client") + S + "/i2psnark/" + S + I + "magnet.png" + S + - _x("Website") + S + _x("Local web server") + S + "http://127.0.0.1:7658/" + S + I + "server_32x32.png" + S + + _x("Web Server") + S + _x("Local web server for hosting your own content on I2P") + S + "http://127.0.0.1:7658/" + S + I + "server_32x32.png" + S + ""; // No commas allowed in text strings! static final String DEFAULT_FAVORITES = "anoncoin.i2p" + S + _x("The Anoncoin project") + S + "http://anoncoin.i2p/" + S + I + "anoncoin_32.png" + S + - _x("Bug Reports") + S + _x("Bug tracker") + S + "http://trac.i2p2.i2p/report/1" + S + I + "bug.png" + S + + _x("I2P Bug Reports") + S + _x("Bug tracker") + S + "http://trac.i2p2.i2p/report/1" + S + I + "bug.png" + S + //"colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http://colombo-bt.i2p/" + S + I + "colomboicon.png" + S + _x("Dev Forum") + S + _x("Development forum") + S + "http://zzz.i2p/" + S + I + "group_gear.png" + S + _x("diftracker") + S + _x("Bittorrent tracker") + S + "http://diftracker.i2p/" + S + I + "magnet.png" + S + "echelon.i2p" + S + _x("I2P Applications") + S + "http://echelon.i2p/" + S + I + "box_open.png" + S + "exchanged.i2p" + S + _x("Anonymous cryptocurrency exchange") + S + "http://exchanged.i2p/" + S + I + "exchanged.png" + S + - _x("FAQ") + S + _x("Frequently Asked Questions") + S + "http://i2p-projekt.i2p/faq" + S + I + "question.png" + S + - _x("Forum") + S + _x("Community forum") + S + "http://forum.i2p/" + S + I + "group.png" + S + - _x("Anonymous Git Hosting") + S + _x("A public anonymous Git hosting site - supports pulling via Git and HTTP and pushing via SSH") + S + "http://git.repo.i2p/" + S + I + "git-logo.png" + S + - //"hiddengate.i2p" + S + _x("HiddenGate") + S + "http://hiddengate.i2p/" + S + I + "hglogo32.png" + S + + _x("I2P FAQ") + S + _x("Frequently Asked Questions") + S + "http://i2p-projekt.i2p/faq" + S + I + "question.png" + S + + _x("I2P Forum") + S + _x("Community forum") + S + "http://forum.i2p/" + S + I + "group.png" + S + + "git.repo.i2p" + S + _x("A public anonymous Git hosting site - supports pulling via Git and HTTP and pushing via SSH") + S + "http://git.repo.i2p/" + S + I + "git-logo.png" + S + + //"hiddengate [ru]" + S + _x("Russian I2P-related wiki") + S + "http://hiddengate.i2p/" + S + I + "hglogo32.png" + S + _x("I2P Wiki") + S + _x("Anonymous wiki - share the knowledge") + S + "http://i2pwiki.i2p/" + S + I + "i2pwiki_logo.png" + S + //"Ident " + _x("Microblog") + S + _x("Your premier microblogging service on I2P") + S + "http://id3nt.i2p/" + S + I + "ident_icon_blue.png" + S + //_x("Javadocs") + S + _x("Technical documentation") + S + "http://i2p-javadocs.i2p/" + S + I + "education.png" + S + //"jisko.i2p" + S + _x("Simple and fast microblogging website") + S + "http://jisko.i2p/" + S + I + "jisko_console_icon.png" + S + //_x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "education.png" + S + //"killyourtv.i2p" + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "television_delete.png" + S + - _x("Free Web Hosting") + S + _x("Free eepsite hosting with PHP and MySQL") + S + "http://open4you.i2p/" + S + I + "open4you-logo.png" + S + - _x("Pastebin") + S + _x("I2P Pastebin") + S + "http://zerobin.i2p/" + S + I + "paste_plain.png" + S + + _x("Open4You") + S + _x("Free eepsite hosting with PHP and MySQL") + S + "http://open4you.i2p/" + S + I + "open4you-logo.png" + S + + _x("Pastebin") + S + _x("Encrypted I2P Pastebin") + S + "http://zerobin.i2p/" + S + I + "paste_plain.png" + S + _x("Planet I2P") + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "world.png" + S + - _x("Plugins") + S + _x("Add-on directory") + S + "http://i2pwiki.i2p/index.php?title=Plugins" + S + I + "plugin.png" + S + + _x("I2P Plugins") + S + _x("Add-on directory") + S + "http://i2pwiki.i2p/index.php?title=Plugins" + S + I + "plugin.png" + S + _x("Postman's Tracker") + S + _x("Bittorrent tracker") + S + "http://tracker2.postman.i2p/" + S + I + "magnet.png" + S + _x("Project Website") + S + _x("I2P home page") + S + "http://i2p-projekt.i2p/" + S + I + "info_rhombus.png" + S + - //_x("Russian News Feed") + S + "lenta.i2p" + S + "http://lenta.i2p/" + S + I + "lenta_main_logo.png" + S + + //_x("lenta news [ru]") + S + _x("Russian News Feed") + S + "http://lenta.i2p/" + S + I + "lenta_main_logo.png" + S + //"Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I + "salt_console.png" + S + "stats.i2p" + S + _x("I2P Network Statistics") + S + "http://stats.i2p/cgi-bin/dashboard.cgi" + S + I + "chart_line.png" + S + - _x("Technical Docs") + S + _x("Technical documentation") + S + "http://i2p-projekt.i2p/how" + S + I + "education.png" + S + + _x("I2P Technical Docs") + S + _x("Technical documentation") + S + "http://i2p-projekt.i2p/how" + S + I + "education.png" + S + _x("The Tin Hat") + S + _x("Privacy guides and tutorials") + S + "http://secure.thetinhat.i2p/" + S + I + "thetinhat.png" + S + _x("Trac Wiki") + S + S + "http://trac.i2p2.i2p/" + S + I + "billiard_marker.png" + S + //_x("Ugha's Wiki") + S + S + "http://ugha.i2p/" + S + I + "billiard_marker.png" + S + - //_x("Sponge's main site") + S + _x("Seedless and the Robert BitTorrent applications") + S + "http://sponge.i2p/" + S + I + "user_astronaut.png" + S + + //"sponge.i2p" + S + _x("Seedless and the Robert BitTorrent applications") + S + "http://sponge.i2p/" + S + I + "user_astronaut.png" + S + ""; @@ -175,7 +176,7 @@ public class HomeHelper extends HelperBase { } private String renderApps(Collection apps) { - String website = _t("Website"); + String website = _t("Web Server"); StringBuilder buf = new StringBuilder(1024); buf.append("
      "); for (App app : apps) { @@ -187,23 +188,18 @@ public class HomeHelper extends HelperBase { } else { url = app.url; } - buf.append("
      " + + buf.append("\n
      \n" + "
      " + - "" + - "\"\"\n" + - "
      " + - "
      " + + // usability: add tabindex -1 so we avoid 2 tabs per app + "" + + "\"\"" + + "\n" + + "
      " + "
      " + "").append(app.name).append("" + "
      " + - "
      " + - "\n"); + "
      \n" + + "
      "); } buf.append("
      \n"); return buf.toString(); @@ -211,21 +207,27 @@ public class HomeHelper extends HelperBase { private String renderConfig(Collection apps) { StringBuilder buf = new StringBuilder(1024); - buf.append("
      ") + buf.append("\n"); for (App app : apps) { buf.append("\n"); } - buf.append("" + ""); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java index 7bc28287fb..2dcd3eeff0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java @@ -47,13 +47,16 @@ public class JobQueueHelper extends HelperBase { int numRunners = _context.jobQueue().getJobs(readyJobs, timedJobs, activeJobs, justFinishedJobs); StringBuilder buf = new StringBuilder(32*1024); - buf.append("

      ").append(_t("I2P Job Queue")).append("


      ") + buf.append("
      ") + .append("

      ") .append(_t("Job runners")).append(": ").append(numRunners) - .append("
      \n"); + .append("

      \n"); long now = _context.clock().now(); - buf.append("
      ").append(_t("Active jobs")).append(": ").append(activeJobs.size()).append("
        \n"); + buf.append("

        ") + .append(_t("Active jobs")).append(": ").append(activeJobs.size()) + .append("

          "); for (int i = 0; i < activeJobs.size(); i++) { Job j = activeJobs.get(i); buf.append("
        1. (").append(_t("started {0} ago", DataHelper.formatDuration2(now-j.getTiming().getStartAfter()))).append("): "); @@ -61,7 +64,9 @@ public class JobQueueHelper extends HelperBase { } buf.append("
        \n"); - buf.append("
        ").append(_t("Just finished jobs")).append(": ").append(justFinishedJobs.size()).append("
          \n"); + buf.append("

          ") + .append(_t("Just finished jobs")).append(": ").append(justFinishedJobs.size()) + .append("

            "); for (int i = 0; i < justFinishedJobs.size(); i++) { Job j = justFinishedJobs.get(i); buf.append("
          1. (").append(_t("finished {0} ago", DataHelper.formatDuration2(now-j.getTiming().getActualEnd()))).append("): "); @@ -69,7 +74,9 @@ public class JobQueueHelper extends HelperBase { } buf.append("
          \n"); - buf.append("
          ").append(_t("Ready/waiting jobs")).append(": ").append(readyJobs.size()).append("
            \n"); + buf.append("

            ") + .append(_t("Ready/waiting jobs")).append(": ").append(readyJobs.size()) + .append("

              "); ObjectCounter counter = new ObjectCounter(); for (int i = 0; i < readyJobs.size(); i++) { Job j = readyJobs.get(i); @@ -86,7 +93,9 @@ public class JobQueueHelper extends HelperBase { out.write(buf.toString()); buf.setLength(0); - buf.append("
              ").append(_t("Scheduled jobs")).append(": ").append(timedJobs.size()).append("
                \n"); + buf.append("

                ") + .append(_t("Scheduled jobs")).append(": ").append(timedJobs.size()) + .append("

                  "); long prev = Long.MIN_VALUE; counter.clear(); for (int i = 0; i < timedJobs.size(); i++) { @@ -110,7 +119,9 @@ public class JobQueueHelper extends HelperBase { out.write(buf.toString()); buf.setLength(0); - buf.append("
                  ").append(_t("Total Job Statistics")).append("\n"); + buf.append("

                  ") + .append(_t("Total Job Statistics")) + .append("

                  \n"); getJobStats(buf); out.write(buf.toString()); } @@ -120,8 +131,8 @@ public class JobQueueHelper extends HelperBase { List names = new ArrayList(counter.objects()); if (names.size() < 4) return; - buf.append("
      ") .append(_t("Remove")) - .append("") + .append("") .append(_t("Name")) .append("") .append(_t("URL")) .append("
      "); if (app.icon != null) { buf.append("\"\""); } - buf.append("") + buf.append("
      ") + buf.append("
      ") .append(_t("Add")).append(":" + "
      \n" + - "
      ").append(_t("Job")).append("").append(_t("Queued")).append(""); + buf.append("\n" + + "\n"); Collections.sort(names, new JobCountComparator(counter)); for (String name : names) { buf.append("
      ").append(_t("Job")).append("").append(_t("Queued")).append("
      ").append(name) @@ -137,7 +148,7 @@ public class JobQueueHelper extends HelperBase { * @since 0.8.9 */ private void getJobStats(StringBuilder buf) { - buf.append("\n" + + buf.append("
      \n" + "" + "" + "\n
      ").append(_t("Job")).append("").append(_t("Runs")).append("").append(_t("Dropped")).append("").append(_t("Time")).append("").append(_t("Avg")).append("") diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java index 80c2fc8db3..548be82f4f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java @@ -75,7 +75,7 @@ public class LogsHelper extends HelperBase { */ public String getLogs() { String str = formatMessages(_context.logManager().getBuffer().getMostRecentMessages()); - return "

      " + _t("File location") + ": " + _context.logManager().currentFile() + "

      " + str; + return "

      " + _t("File location") + ": " + _context.logManager().currentFile() + "

      " + str; } /** @@ -131,7 +131,7 @@ public class LogsHelper extends HelperBase { return "

      " + _t("File not found") + ": " + f.getAbsolutePath() + "

      "; } else { str = str.replace("&", "&").replace("<", "<").replace(">", ">"); - return "

      " + _t("File location") + ": " + f.getAbsolutePath() + "

      " + str + "
      "; + return "

      " + _t("File location") + ": " + f.getAbsolutePath() + "

      " + str + "
      "; } } @@ -146,10 +146,10 @@ public class LogsHelper extends HelperBase { /** formats in reverse order */ private String formatMessages(List msgs) { if (msgs.isEmpty()) - return "

      " + _t("No log messages") + "

      "; + return "

      " + _t("No log messages") + "

      "; boolean colorize = _context.getBooleanPropertyDefaultTrue("routerconsole.logs.color"); StringBuilder buf = new StringBuilder(16*1024); - buf.append("
        "); + buf.append("
        "); for (int i = msgs.size() - 1; i >= 0; i--) { String msg = msgs.get(i); // don't display the dup message if it is last diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java index 4d824efa50..31961b11c5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java @@ -206,9 +206,7 @@ public class NetDbHelper extends HelperBase { private void renderNavBar() throws IOException { StringBuilder buf = new StringBuilder(1024); buf.append("
        "); - // TODO fix up the non-light themes - String theme = _context.getProperty(CSSHelper.PROP_THEME_NAME); - boolean span = _graphical && (theme == null || theme.equals(CSSHelper.DEFAULT_THEME)); + boolean span = _graphical; if (!span) buf.append("
        "); int tab = getTab(); @@ -229,13 +227,13 @@ public class NetDbHelper extends HelperBase { buf.append("").append(_t(titles[i])).append(""); } if (span) - buf.append(" \n"); + buf.append("\n"); else if (i != titles.length - 1) - buf.append(" |\n"); + buf.append("  \n"); } if (!span) buf.append("
        "); - buf.append("
        "); + buf.append("\n"); _out.write(buf.toString()); } @@ -243,23 +241,25 @@ public class NetDbHelper extends HelperBase { * @since 0.9.28 */ private void renderLookupForm() throws IOException { - _out.write("

        Pick One

        \n" + - "Caps e.g. f or XOfR
        \n" + - "Cost
        \n" + - "Country code e.g. ru
        \n" + - "Family
        \n" + - "Hash prefix
        \n" + - "IP host name, IPv4, or IPv6, /24,/16,/8 suffixes optional for IPv4
        \n" + - "IPv6 Prefix
        \n" + - "MTU
        \n" + - "Port
        \n" + - "Sig Type
        \n" + - "SSU Caps
        \n" + - "Version
        \n" + - "

        Add Sybil analysis (must pick one above):

        \n" + - "Sybil close to Router hash, dest hash, b32, or from address book
        \n" + - "or Sybil close to this router
        " + - "

        " + - "
        \n"); + _out.write("
        \n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "
        Network Database Search
        Select one search field only:
        Capabilities:e.g. f or XOfR
        Cost:
        Country Code:e.g. ru
        Router Family:
        Hash Prefix:
        IP or Hostname:host name, IPv4, or IPv6, /24,/16,/8 suffixes optional for IPv4
        IPv6 Prefix:
        MTU:
        Port Number:
        Signature Type:
        SSU Capabilities:
        Router Version:
        Add Sybil analysis (must pick one above):
        Sybil close to:Router hash, dest hash, b32, or from address book
        \n
        \n"); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index 0792c0fe35..8deac73f2f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -228,7 +228,7 @@ class NetDbRenderer { public void renderLeaseSetHTML(Writer out, boolean debug) throws IOException { StringBuilder buf = new StringBuilder(4*1024); if (debug) - buf.append("

        Debug mode - Sorted by hash distance, closest first

        \n"); + buf.append("

        Debug mode - Sorted by hash distance, closest first

        \n"); Hash ourRKey; Set leases; DecimalFormat fmt; @@ -246,9 +246,52 @@ class NetDbRenderer { int rapCount = 0; BigInteger median = null; int c = 0; + + + // Summary + FloodfillNetworkDatabaseFacade netdb = (FloodfillNetworkDatabaseFacade)_context.netDb(); + if (debug) { + buf.append("\n"); + } else { + buf.append("
        \n"); + } + buf.append("") + .append("\n") + .append("\n"); + if (debug) { + buf.append("\n") + .append("") + .append("\n") + .append("") + .append("\n"); + } + int ff = _context.peerManager().getPeersByCapability(FloodfillNetworkDatabaseFacade.CAPABILITY_FLOODFILL).size(); + buf.append("\n") + .append("\n"); + if (debug) { + buf.append("") + .append("\n"); + // 2 for 4 floodfills... -1 for median + // this can be way off for unknown reasons + int total = (int) Math.round(Math.pow(2, 2 + 256 - 1 - log2)); + buf.append("\n"); + buf.append("\n"); + } + buf.append("
        Leaseset Summary[") + .append(_t("Configure Floodfill Participation")) + .append("]
        Total Leasesets:").append(leases.size()).append("
        Published (RAP) Leasesets:").append(netdb.getKnownLeaseSets()).append("
        Mod Data:").append(DataHelper.getUTF8(_context.routerKeyGenerator().getModData())).append("Last Changed:").append(new Date(_context.routerKeyGenerator().getLastChanged())).append("
        Next Mod Data:").append(DataHelper.getUTF8(_context.routerKeyGenerator().getNextModData())).append("Change in:").append(DataHelper.formatDuration(_context.routerKeyGenerator().getTimeTillMidnight())).append("
        Known Floodfills:").append(ff).append("
        Currently Floodfill?").append(netdb.floodfillEnabled() ? "yes" : "no").append("
        Network data (only valid if floodfill):"); + //buf.append("

        Center of Key Space (router hash): " + ourRKey.toBase64()); + if (median != null) { + double log2 = biLog2(median); + buf.append("

        Median distance (bits):").append(fmt.format(log2)).append("
        Estimated total floodfills:").append(total).append("
        Estimated total leasesets:").append(total * rapCount / 4); + } else { + buf.append("Not floodfill or no data."); + } + buf.append("
        \n"); + if (leases.isEmpty()) { if (!debug) - buf.append("").append(_t("none")).append(""); + buf.append("
        ").append(_t("No Leasesets currently active.")).append("
        "); } else { if (debug) { // Find the center of the RAP leasesets @@ -258,109 +301,93 @@ class NetDbRenderer { } medianCount = rapCount / 2; } + long now = _context.clock().now(); for (LeaseSet ls : leases) { Destination dest = ls.getDestination(); Hash key = dest.calculateHash(); - buf.append("").append(_t("LeaseSet")).append(": ").append(key.toBase64()).append("\n"); + buf.append("\n") + .append(""); if (_context.clientManager().isLocal(dest)) { - buf.append(" (" + _t("Local") + " "); + buf.append("\n"); String host = _context.namingService().reverseLookup(dest); if (host == null) { - buf.append("").append(_t("Add to local addressbook")).append("
        \n"); + buf.append(""); } } else { - buf.append(" (").append(_t("Destination")).append(' '); + buf.append(""); } else { String b32 = dest.toBase32(); - buf.append(dest.toBase64().substring(0, 6)).append(")
        \n" + - "").append(b32).append("
        \n" + - "").append(_t("Add to local addressbook")).append("
        \n"); + buf.append("").append(dest.toBase64().substring(0, 6)).append("") + .append("\n") + .append("\n") + .append(""); } } + buf.append("\n\n"); if (debug) { - buf.append("RAP? " + ls.getReceivedAsPublished()); - buf.append(" RAR? " + ls.getReceivedAsReply()); + buf.append("\n\n"); + } for (int i = 0; i < ls.getLeaseCount(); i++) { Lease lease = ls.getLease(i); - buf.append(_t("Lease")).append(' ').append(i + 1).append(": ").append(_t("Gateway")).append(' '); + buf.append("\n"); } - buf.append("
        \n"); + buf.append("
        ").append(_t("LeaseSet")).append(": ").append(key.toBase64()).append("" + _t("Local") + " "); if (! _context.clientManager().shouldPublishLeaseSet(key)) buf.append(_t("Unpublished") + ' '); - buf.append(_t("Destination") + ' '); + buf.append("").append(_t("Destination")).append(": "); TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(key); if (in != null && in.getDestinationNickname() != null) buf.append(in.getDestinationNickname()); else buf.append(dest.toBase64().substring(0, 6)); - buf.append(")
        \n"); + buf.append("
        "); String b32 = dest.toBase32(); - buf.append("").append(b32).append("
        \n"); + buf.append("").append(b32).append("        		").append("").append(_t("Add to local addressbook")).append("").append(_t("Destination")).append(": "); String host = _context.namingService().reverseLookup(dest); if (host != null) { - buf.append("").append(host).append(")
        \n"); + buf.append("").append(host).append("
        ").append(b32).append("").append(_t("Add to local addressbook")).append("
        \n"); long exp = ls.getLatestLeaseDate()-now; if (exp > 0) - buf.append(_t("Expires in {0}", DataHelper.formatDuration2(exp))); + buf.append("").append(_t("Expires in {0}", DataHelper.formatDuration2(exp))).append(""); else - buf.append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exp))); - buf.append("
        \n"); + buf.append("").append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exp))).append(""); + buf.append("
        "); + buf.append("RAP? ").append(ls.getReceivedAsPublished()); + buf.append(" RAR? ").append(ls.getReceivedAsReply()); BigInteger dist = HashDistance.getDistance(ourRKey, ls.getRoutingKey()); if (ls.getReceivedAsPublished()) { if (c++ == medianCount) median = dist; } - buf.append(" Dist: ").append(fmt.format(biLog2(dist))).append("
        "); + buf.append(" Distance: ").append(fmt.format(biLog2(dist))).append(""); + buf.append("
        "); //buf.append(dest.toBase32()).append("
        "); - buf.append("Sig type: ").append(dest.getSigningPublicKey().getType()).append("
        "); - buf.append("Routing Key: ").append(ls.getRoutingKey().toBase64()); - buf.append("
        "); - buf.append("Encryption Key: ").append(ls.getEncryptionKey().toBase64().substring(0, 20)).append("...
        "); + buf.append("Signature type: ").append(dest.getSigningPublicKey().getType()); + buf.append(" Encryption Key: ").append(ls.getEncryptionKey().toBase64().substring(0, 20)).append("…"); + buf.append("
        "); + buf.append("Routing Key: ").append(ls.getRoutingKey().toBase64()); + buf.append("
        "); + buf.append("").append(_t("Lease")).append(' ').append(i + 1).append(": ").append(_t("Gateway")).append(' '); buf.append(_context.commSystem().renderPeerHTML(lease.getGateway())); buf.append(' ').append(_t("Tunnel")).append(' ').append(lease.getTunnelId().getTunnelId()).append(' '); if (debug) { long exl = lease.getEndDate().getTime() - now; if (exl > 0) - buf.append(_t("Expires in {0}", DataHelper.formatDuration2(exl))); + buf.append("").append(_t("Expires in {0}", DataHelper.formatDuration2(exl))).append(""); else - buf.append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exl))); + buf.append("").append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exl))).append(""); } - buf.append("
        \n"); + buf.append("
        \n"); out.write(buf.toString()); buf.setLength(0); } // for each } // !empty - if (debug) { - FloodfillNetworkDatabaseFacade netdb = (FloodfillNetworkDatabaseFacade)_context.netDb(); - buf.append("

        Total Leasesets: ").append(leases.size()); - buf.append("

        Published (RAP) Leasesets: ").append(netdb.getKnownLeaseSets()); - buf.append("

        Mod Data: \"").append(DataHelper.getUTF8(_context.routerKeyGenerator().getModData())) - .append("\" Last Changed: ").append(new Date(_context.routerKeyGenerator().getLastChanged())); - buf.append("

        Next Mod Data: \"").append(DataHelper.getUTF8(_context.routerKeyGenerator().getNextModData())) - .append("\" Change in: ").append(DataHelper.formatDuration(_context.routerKeyGenerator().getTimeTillMidnight())); - int ff = _context.peerManager().getPeersByCapability(FloodfillNetworkDatabaseFacade.CAPABILITY_FLOODFILL).size(); - buf.append("

        Known Floodfills: ").append(ff); - buf.append("

        Currently Floodfill? "); - buf.append(netdb.floodfillEnabled() ? "yes" : "no"); - buf.append("

        Network data (only valid if floodfill):"); - //buf.append("

        Center of Key Space (router hash): " + ourRKey.toBase64()); - if (median != null) { - double log2 = biLog2(median); - buf.append("

        Median distance (bits): ").append(fmt.format(log2)); - // 2 for 4 floodfills... -1 for median - // this can be way off for unknown reasons - int total = (int) Math.round(Math.pow(2, 2 + 256 - 1 - log2)); - buf.append("

        Estimated total floodfills: ").append(total); - buf.append("

        Estimated total leasesets: ").append(total * rapCount / 4); - } else { - buf.append("

        Not floodfill or no data"); - } - buf.append("

        "); - } out.write(buf.toString()); out.flush(); } @@ -442,14 +469,14 @@ class NetDbRenderer { if (!showStats) { // the summary table - buf.append("
        ") + buf.append("
        ") .append(_t("Network Database Router Statistics")) .append("
        "); // versions table List versionList = new ArrayList(versions.objects()); if (!versionList.isEmpty()) { Collections.sort(versionList, Collections.reverseOrder(new VersionComparator())); - buf.append("\n"); + buf.append("
        \n"); buf.append("\n"); for (String routerVersion : versionList) { int num = versions.count(routerVersion); @@ -468,7 +495,7 @@ class NetDbRenderer { start = end; // transports table - buf.append("
        " + _t("Version") + "" + _t("Count") + "
        \n"); + buf.append("
        \n"); buf.append("\n"); for (int i = 0; i < TNAMES.length; i++) { int num = transportCount[i]; @@ -490,12 +517,13 @@ class NetDbRenderer { List countryList = new ArrayList(countries.objects()); if (!countryList.isEmpty()) { Collections.sort(countryList, new CountryComparator()); - buf.append("
        " + _t("Transports") + "" + _t("Count") + "
        \n"); + buf.append("
        \n"); buf.append("\n"); for (String country : countryList) { int num = countries.count(country); - buf.append("\n"); } @@ -552,36 +580,47 @@ class NetDbRenderer { */ private void renderRouterInfo(StringBuilder buf, RouterInfo info, boolean isUs, boolean full) { String hash = info.getIdentity().getHash().toBase64(); - buf.append("
        " + _t("Country") + "" + _t("Count") + "
        \"").append(country.toUpperCase(Locale.US)).append("\""); "); + buf.append("
        "); + buf.append("\"").append(country.toUpperCase(Locale.US)).append("\"");"); buf.append(getTranslatedCountry(country)); buf.append("").append(num).append("
        "); + buf.append("") + .append("\n"); long age = _context.clock().now() - info.getPublished(); if (isUs && _context.router().isHidden()) { - buf.append("").append(_t("Hidden")).append(", ").append(_t("Updated")).append(": ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
        \n"); + buf.append("") + .append(""); } else if (age > 0) { - buf.append("").append(_t("Published")).append(": ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
        \n"); + buf.append("") + .append(""); } else { // shouldnt happen - buf.append("" + _t("Published") + ": in ").append(DataHelper.formatDuration2(0-age)).append("???
        \n"); + buf.append(""); } + buf.append("\n\n") + .append("") + .append("\n"); if (full) { - buf.append("
        "); if (isUs) { - buf.append("" + _t("Our info") + ": ").append(hash).append("
        \n"); + buf.append("" + _t("Our info") + ": ").append(hash).append(""); } else { - buf.append("" + _t("Peer info for") + ": ").append(hash).append("\n"); + buf.append("" + _t("Peer info for") + ": ").append(hash).append(""); if (!full) { - buf.append("[").append(_t("Full entry")).append("]"); + buf.append("[").append(_t("Full entry")).append("]"); } - buf.append("
        \n"); } - + buf.append("
        ").append(_t("Hidden")).append(", ").append(_t("Updated")).append(":") + .append(_t("{0} ago", DataHelper.formatDuration2(age))) + .append("").append(_t("Published")).append(":") + .append(_t("{0} ago", DataHelper.formatDuration2(age))) + .append("").append(_t("Published")).append(": in ").append(DataHelper.formatDuration2(0-age)).append("???
        "); buf.append("").append(_t("Signing Key")).append(": ") + .append("") .append(info.getIdentity().getSigningPublicKey().getType().toString()); - buf.append("
        \n" + _t("Address(es)") + ": "); + buf.append("
        " + _t("Address(es)") + ":"); String country = _context.commSystem().getCountry(info.getIdentity().getHash()); if(country != null) { + buf.append(""); buf.append("\"").append(country.toUpperCase(Locale.US)).append('\"'); "); + buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ").append(""); } for (RouterAddress addr : info.getAddresses()) { String style = addr.getTransportStyle(); @@ -598,7 +637,7 @@ class NetDbRenderer { } buf.append("
        " + _t("Stats") + ":
        "); + buf.append("
        " + _t("Stats") + ":"); Map p = info.getOptionsMap(); for (Map.Entry e : p.entrySet()) { String key = (String) e.getKey(); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java index 5bbf5a0712..f73bf64a4d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java @@ -78,9 +78,9 @@ public class NewsFeedHelper extends HelperBase { buf.append("

        "); if (entry.updated > 0) { Date date = new Date(entry.updated); - buf.append("") + buf.append("") .append(fmt.format(date)) - .append(": "); + .append(" "); } if (entry.link != null) buf.append(""); @@ -88,9 +88,9 @@ public class NewsFeedHelper extends HelperBase { if (entry.link != null) buf.append(""); if (entry.authorName != null) { - buf.append(" (") - .append(Messages.getString("by {0}", DataHelper.escapeHTML(entry.authorName), ctx)) - .append(")\n"); + buf.append(" ") + .append(Messages.getString("{0}", DataHelper.escapeHTML(entry.authorName), ctx)) + .append("\n"); } buf.append("

        \n
        \n") .append(entry.content) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java index f8bd51e6fd..3a75b7dcd4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java @@ -286,7 +286,7 @@ public class NewsHelper extends ContentHelper { public static String status(RouterContext ctx) { StringBuilder buf = new StringBuilder(128); long now = ctx.clock().now(); - buf.append(""); + buf.append(""); long lastUpdated = lastUpdated(ctx); long lastFetch = lastChecked(ctx); if (lastUpdated > 0) { @@ -300,7 +300,7 @@ public class NewsHelper extends ContentHelper { DataHelper.formatDuration2(now - lastFetch), ctx)); } - buf.append(""); + buf.append(""); String consoleNonce = CSSHelper.getNonce(); if (lastUpdated > 0 && consoleNonce != null) { if (shouldShowNews(ctx)) { @@ -311,9 +311,9 @@ public class NewsHelper extends ContentHelper { .append(Messages.getString("Show news", ctx)); } buf.append("" + - " - ") + " | ") .append(Messages.getString("Show all news", ctx)) - .append(""); + .append(""); } return buf.toString(); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index 2c7ca06aa0..499a8e6118 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -26,7 +26,7 @@ import net.i2p.stat.RateStat; class ProfileOrganizerRenderer { private final RouterContext _context; private final ProfileOrganizer _organizer; - + public ProfileOrganizerRenderer(ProfileOrganizer organizer, RouterContext context) { _context = context; _organizer = organizer; @@ -38,10 +38,10 @@ class ProfileOrganizerRenderer { public void renderStatusHTML(Writer out, int mode) throws IOException { boolean full = mode == 1; Set peers = _organizer.selectAllPeers(); - + long now = _context.clock().now(); long hideBefore = now - 90*60*1000; - + Set order = new TreeSet(mode == 2 ? new HashComparator() : new ProfileComparator()); int older = 0; int standard = 0; @@ -66,7 +66,7 @@ class ProfileOrganizerRenderer { } order.add(prof); } - + int fast = 0; int reliable = 0; int integrated = 0; @@ -78,26 +78,28 @@ class ProfileOrganizerRenderer { if (mode < 2) { //buf.append("

        ").append(_t("Peer Profiles")).append("

        \n

        "); + buf.append("

        "); buf.append(ngettext("Showing 1 recent profile.", "Showing {0} recent profiles.", order.size())).append('\n'); if (older > 0) buf.append(ngettext("Hiding 1 older profile.", "Hiding {0} older profiles.", older)).append('\n'); if (standard > 0) buf.append("").append(ngettext("Hiding 1 standard profile.", "Hiding {0} standard profiles.", standard)).append("\n"); buf.append("

        "); - buf.append(""); + buf.append("
        "); buf.append(""); buf.append(""); - buf.append(""); + buf.append(""); + buf.append(""); buf.append(""); buf.append(""); buf.append(""); buf.append(""); - buf.append(""); + buf.append(""); buf.append(""); int prevTier = 1; for (PeerProfile prof : order) { Hash peer = prof.getPeer(); - + int tier = 0; boolean isIntegrated = false; if (_organizer.isFast(peer)) { @@ -111,23 +113,23 @@ class ProfileOrganizerRenderer { } else { tier = 3; } - + if (_organizer.isWellIntegrated(peer)) { isIntegrated = true; integrated++; } - + if (tier != prevTier) - buf.append("\n"); + buf.append("\n"); prevTier = tier; - + buf.append(""); } - - buf.append(""); //buf.append("\n"); + buf.append(" +-\n"); buf.append(""); // let's not build the whole page in memory (~500 bytes per peer) out.write(buf.toString()); buf.setLength(0); } - buf.append("
        ").append(_t("Peer")).append("").append(_t("Groups (Caps)")).append("").append(_t("Groups")).append("").append(_t("Caps")).append("").append(_t("Speed")).append("").append(_t("Capacity")).append("").append(_t("Integration")).append("").append(_t("Status")).append(" ").append(_t("View/Edit")).append("
        "); buf.append(_context.commSystem().renderPeerHTML(peer)); // debug //if(prof.getIsExpandedDB()) // buf.append(" ** "); buf.append(""); - + switch (tier) { case 1: buf.append(_t("Fast, High Capacity")); break; case 2: buf.append(_t("High Capacity")); break; @@ -138,14 +140,14 @@ class ProfileOrganizerRenderer { RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); if (info != null) { // prevent HTML injection in the caps and version - buf.append(" (").append(DataHelper.stripHTML(info.getCapabilities())); + buf.append("").append(DataHelper.stripHTML(info.getCapabilities())); String v = info.getOption("router.version"); if (v != null) buf.append(' ').append(DataHelper.stripHTML(v)); - buf.append(')'); + } else { + buf.append("").append(_t("unknown")).append("").append(num(prof.getSpeedValue())); + buf.append("").append(num(prof.getSpeedValue())); long bonus = prof.getSpeedBonus(); if (bonus != 0) { if (bonus > 0) @@ -177,18 +179,19 @@ class ProfileOrganizerRenderer { if (total / fails <= 10) // hide if < 10% buf.append(' ').append(fails).append('/').append(total).append(' ').append(_t("Test Fails")); } + buf.append(" ").append(_t("profile")).append(""); buf.append("").append(_t("profile")).append(""); - buf.append(" +-
        "); + buf.append("
        "); //// //// don't bother reindenting @@ -197,7 +200,7 @@ class ProfileOrganizerRenderer { //buf.append("

        ").append(_t("Floodfill and Integrated Peers")) // .append(" (").append(integratedPeers.size()).append(")

        \n"); - buf.append(""); + buf.append("
        "); buf.append(""); buf.append(""); buf.append(""); @@ -250,7 +253,7 @@ class ProfileOrganizerRenderer { } buf.append("\n"); } - buf.append("
        ").append(_t("Peer")).append("").append(_t("Caps")).append("
        "); + buf.append("
        "); //// //// don't bother reindenting @@ -258,21 +261,81 @@ class ProfileOrganizerRenderer { } if (mode < 2) { - buf.append("

        ").append(_t("Thresholds")).append("

        "); - buf.append("

        ").append(_t("Speed")).append(": ").append(num(_organizer.getSpeedThreshold())) - .append(" (").append(fast).append(' ').append(_t("fast peers")).append(")
        "); - buf.append("").append(_t("Capacity")).append(": ").append(num(_organizer.getCapacityThreshold())) - .append(" (").append(reliable).append(' ').append(_t("high capacity peers")).append(")
        "); - buf.append("").append(_t("Integration")).append(": ").append(num(_organizer.getIntegrationThreshold())) - .append(" (").append(integrated).append(' ').append(_t(" well integrated peers")).append(")

        "); - buf.append("

        ").append(_t("Definitions")).append("

          "); - buf.append("
        • ").append(_t("groups")).append(": ").append(_t("as determined by the profile organizer")).append("
          • "); - buf.append("
        • ").append(_t("caps")).append(": ").append(_t("capabilities in the netDb, not used to determine profiles")).append("
          • "); - buf.append("
        • ").append(_t("speed")).append(": ").append(_t("peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel")).append("
          • "); - buf.append("
        • ").append(_t("capacity")).append(": ").append(_t("how many tunnels can we ask them to join in an hour?")).append("
          • "); - buf.append("
        • ").append(_t("integration")).append(": ").append(_t("how many new peers have they told us about lately?")).append("
          • "); - buf.append("
        • ").append(_t("status")).append(": ").append(_t("is the peer banned, or unreachable, or failing tunnel tests?")).append("
          • "); - buf.append("
        "); + buf.append("

        ").append(_t("Thresholds")).append("

        \n") + .append("") + .append("
        ") + .append(_t("Speed")).append(": ").append(num(_organizer.getSpeedThreshold())) + .append("") + .append(_t("Capacity")).append(": ").append(num(_organizer.getCapacityThreshold())) + .append("") + .append(_t("Integration")).append(": ").append(num(_organizer.getIntegrationThreshold())) + .append("
        ") + .append(fast).append(' ').append(_t("fast peers")) + .append("") + .append(reliable).append(' ').append(_t("high capacity peers")) + .append("") + .append(integrated).append(' ').append(_t(" well integrated peers")) + .append("
        \n"); + buf.append("

        ").append(_t("Definitions")).append("

        \n") + .append(""); + buf.append(""); + buf.append(""); + buf.append(""); // profile_defs + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append("
        ") + .append(_t("groups")).append(":").append(_t("as determined by the profile organizer")) + .append("
        ") + .append(_t("caps")).append(":").append(_t("capabilities in the netDb, not used to determine profiles")) + .append("
        "); + buf.append("") + .append("") + .append("") + .append(""); + buf.append("") + .append("") + .append("") + .append(""); + buf.append("") + .append("") + .append("") + .append(""); + buf.append("") + .append("") + .append("") + .append(""); + buf.append("") + .append("") + .append("") + .append(""); + buf.append("") + .append("") + .append("") + .append(""); + buf.append("") + .append("") + .append(""); + buf.append(""); + buf.append("
         B:").append(_t("SSU Testing")).append("C:").append(_t("SSU Introducer")).append(" 
         f:").append(_t("Floodfill")).append("H:").append(_t("Hidden")).append(" 
         K:").append(_t("Under {0} shared bandwidth", "12KBps")).append("L:").append(_t("{0} shared bandwidth", "12 - 32KBps")).append(" 
         M:").append(_t("{0} shared bandwidth", "32 - 64KBps")).append("N:").append(_t("{0} shared bandwidth", "64 - 128KBps")).append(" 
         O:").append(_t("{0} shared bandwidth", "128 - 256KBps")).append("P:").append(_t("{0} shared bandwidth", "256 - 2000KBps")).append(" 
         R:").append(_t("Reachable")).append("U:").append(_t("Unreachable")).append(" 
         X:").append(_t("Over {0} shared bandwidth", "2000KBps")).append("   
         ").append(_t("Note: For P and X bandwidth tiers, O is included for the purpose of backward compatibility in the NetDB.")) + .append("
        ") + .append(_t("speed")) + .append(":") + .append(_t("peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel")) + .append("
        ") + .append(_t("capacity")) + .append(":") + .append(_t("how many tunnels can we ask them to join in an hour?")) + .append("
        ") + .append(_t("integration")) + .append(":") + .append(_t("how many new peers have they told us about lately?")) + .append("
        ") + .append(_t("status")) + .append(":") + .append(_t("is the peer banned, or unreachable, or failing tunnel tests?")) + .append("
        \n"); // thresholds //// //// don't bother reindenting @@ -282,7 +345,7 @@ class ProfileOrganizerRenderer { out.write(buf.toString()); out.flush(); } - + private class ProfileComparator extends HashComparator { public int compare(PeerProfile left, PeerProfile right) { if (_context.profileOrganizer().isFast(left.getPeer())) { @@ -319,7 +382,7 @@ class ProfileOrganizerRenderer { } } } - + /** * Used for floodfill-only page * As of 0.9.29, sorts in true binary order, not base64 string @@ -329,9 +392,9 @@ class ProfileOrganizerRenderer { public int compare(PeerProfile left, PeerProfile right) { return DataHelper.compareTo(left.getPeer().getData(), right.getPeer().getData()); } - + } - + private final static DecimalFormat _fmt = new DecimalFormat("###,##0.00"); private final static String num(double num) { synchronized (_fmt) { return _fmt.format(num); } } private final static String NA = HelperBase._x("n/a"); @@ -378,6 +441,10 @@ class ProfileOrganizerRenderer { return Messages.getString(s, _context); } + private String _t(String s, Object o) { + return Messages.getString(s, o, _context); + } + /** translate (ngettext) @since 0.8.5 */ public String ngettext(String s, String p, int n) { return Messages.getString(n, s, p, _context); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java index 3236d1f126..e9a3eb531c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java @@ -9,7 +9,7 @@ public class ProfilesHelper extends HelperBase { private static final String titles[] = {_x("High Capacity"), // 0 - _x("Floodfill "), // 1 + _x("Floodfill"), // 1 _x("Banned"), // 2 _x("All"), }; // 3 @@ -93,9 +93,7 @@ public class ProfilesHelper extends HelperBase { private void renderNavBar() throws IOException { StringBuilder buf = new StringBuilder(1024); buf.append("
        "); - // TODO fix up the non-light themes - String theme = _context.getProperty(CSSHelper.PROP_THEME_NAME); - boolean span = _graphical && (theme == null || theme.equals(CSSHelper.DEFAULT_THEME)); + boolean span = _graphical; if (!span) buf.append("
        "); int tab = getTab(); @@ -112,9 +110,9 @@ public class ProfilesHelper extends HelperBase { buf.append("").append(_t(titles[i])).append(""); } if (span) - buf.append(" \n"); + buf.append("\n"); else if (i != titles.length - 1) - buf.append(" |\n"); + buf.append("  \n"); } if (!span) buf.append("
        "); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java index 634940edf5..568253bfeb 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java @@ -30,11 +30,21 @@ public class StatsGenerator { public void generateStatsPage(Writer out, boolean showAll) throws IOException { StringBuilder buf = new StringBuilder(16*1024); - buf.append("
        "); - buf.append(""); out.write(buf.toString()); buf.setLength(0); - + Map> unsorted = _context.statManager().getStatsByGroup(); Map> groups = new TreeMap>(new AlphaComparator()); groups.putAll(unsorted); @@ -56,25 +66,19 @@ public class StatsGenerator { } buf.append(" "); buf.append(""); - - buf.append(_t("Statistics gathered during this router's uptime")).append(" ("); - long uptime = _context.router().getUptime(); - buf.append(DataHelper.formatDuration2(uptime)); - buf.append("). ").append( _t("The data gathered is quantized over a 1 minute period, so should just be used as an estimate.")); - buf.append(' ').append( _t("These statistics are primarily used for development and debugging.")); out.write(buf.toString()); buf.setLength(0); - + for (Map.Entry> entry : groups.entrySet()) { String group = entry.getKey(); Set stats = entry.getValue(); - buf.append("

        "); buf.append(_t(group)); buf.append("

        "); - buf.append("
          "); + buf.append("
            "); out.write(buf.toString()); buf.setLength(0); for (String stat : stats) { @@ -82,7 +86,7 @@ public class StatsGenerator { buf.append(stat); buf.append("\">"); buf.append(stat); - buf.append("
            "); + buf.append(": "); if (_context.statManager().isFrequency(stat)) renderFrequency(stat, buf); else @@ -102,7 +106,7 @@ public class StatsGenerator { buf.append(freq.getDescription()); buf.append("
            "); if (freq.getEventCount() <= 0) { - buf.append(_t("No lifetime events")).append("
            \n"); + buf.append("
            • ").append(_t("No lifetime events")).append("
            \n"); return; } long uptime = _context.router().getUptime(); @@ -153,7 +157,7 @@ public class StatsGenerator { buf.append("
            "); } if (rate.getLifetimeEventCount() <= 0) { - buf.append(_t("No lifetime events")).append("
            \n"); + buf.append("
            • ").append(_t("No lifetime events")).append("
            \n"); return; } long now = _context.clock().now(); @@ -214,7 +218,7 @@ public class StatsGenerator { buf.append(")"); } if (curRate.getSummaryListener() != null) { - buf.append(" ").append(_t("Graph Data")).append(" - "); buf.append(" SECTION_NAMES; static { @@ -49,6 +49,7 @@ class SummaryBarRenderer { aMap.put("TunnelStatus", "Tunnel Status"); aMap.put("Destinations", "Local Tunnels"); aMap.put("NewsHeadings", "News & Updates"); + aMap.put("Advanced", "Advanced"); SECTION_NAMES = Collections.unmodifiableMap(aMap); } @@ -88,6 +89,8 @@ class SummaryBarRenderer { buf.append(renderI2PServicesHTML()); else if ("I2PInternals".equals(section)) buf.append(renderI2PInternalsHTML()); + else if ("Advanced".equals(section)) + buf.append(renderAdvancedHTML()); else if ("General".equals(section)) buf.append(renderGeneralHTML()); else if ("ShortGeneral".equals(section)) @@ -123,7 +126,7 @@ class SummaryBarRenderer { public String renderHelpAndFAQHTML() { StringBuilder buf = new StringBuilder(512); - buf.append("

            ") .append(_t("Help & FAQ")) @@ -139,7 +142,7 @@ class SummaryBarRenderer { .append(_t("I2P Services")) .append("

            \n" + - "
            " + + "
            " + "") - .append(nbsp(_t("Website"))) + .append(nbsp(_t("Web Server"))) .append("\n") .append(NavHelper.getClientAppLinks(_context)) @@ -177,12 +180,44 @@ class SummaryBarRenderer { .append(_t("I2P Internals")) .append("
            \n" + - "
            \n" + + "
            \n" + - "") - .append(nbsp(_t("Tunnels"))) + .append(nbsp(_t("Addressbook"))) + .append("\n"); + + if (!StatSummarizer.isDisabled()) { + buf.append("") + .append(nbsp(_t("Graphs"))) + .append("\n"); + } + + buf.append("") + .append(nbsp(_t("Hidden Services Manager"))) + .append("\n" + + + // "") + // .append(_t("Jobs")) + // .append("\n" + + + "") + .append(nbsp(_t("Logs"))) + .append("\n" + + + "") + .append(nbsp(_t("NetDB"))) .append("\n" + "\n" + - "") - .append(nbsp(_t("NetDB"))) - .append("\n" + - - "") - .append(nbsp(_t("Logs"))) + .append(nbsp(_t("Tunnels"))) .append("\n"); - // "") - // .append(_t("Jobs")) - // .append("\n" + + buf.append("
            \n"); + return buf.toString(); + } - if (!StatSummarizer.isDisabled()) { - buf.append("") - .append(nbsp(_t("Graphs"))) - .append("\n"); - } + public String renderAdvancedHTML() { + StringBuilder buf = new StringBuilder(512); - buf.append("") - .append(nbsp(_t("Stats"))) - .append("\n" + + buf.append("

            ") + .append(_t("Advanced")) + .append("

            \n") - "") - .append(nbsp(_t("Addressbook"))) - .append("\n" + + .append("
            ") - "") - .append(nbsp(_t("Hidden Services Manager"))) + .append("") + .append(nbsp(_t("Certs"))) + .append("\n") + + .append("") + .append(nbsp(_t("Changelog"))) + .append("\n") + + .append("") + .append(nbsp(_t("Debug"))) + .append("\n") + + .append("") + .append(nbsp(_t("Jars"))) .append("\n"); - if (_context.getBooleanProperty(HelperBase.PROP_ADVANCED)) - buf.append("Debug\n"); File javadoc = new File(_context.getBaseDir(), "docs/javadoc/index.html"); if (javadoc.exists()) buf.append("Javadoc\n"); - buf.append("
            \n"); + + buf.append("") + .append(nbsp(_t("Leasesets"))) + .append("\n") + + .append("") + .append(nbsp(_t("NetDB Search"))) + .append("\n") + + .append("") + .append(nbsp(_t("Proof"))) + .append("\n") + + .append("") + .append(nbsp(_t("Stats"))) + .append("\n") + + .append("") + .append(nbsp(_t("Sybils"))) + .append("\n") + + .append("
            "); return buf.toString(); } @@ -259,7 +324,7 @@ class SummaryBarRenderer { .append(_t("General")) .append("
            \n" + - "" + + "
            " + "\n" + - "
            " + // fix for some rows with a big left side and some with a big right side + "
            " + // fix for some rows with a big left side and some with a big right side "" + @@ -288,7 +353,7 @@ class SummaryBarRenderer { .append(_helper.getVersion()) .append("\n" + - "
            " + // fix for some rows with a big left side and some with a big right side + "
            " + // fix for some rows with a big left side and some with a big right side "" + @@ -304,7 +369,7 @@ class SummaryBarRenderer { public String renderShortGeneralHTML() { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); - buf.append("
            " + + buf.append("
            " + "" + @@ -330,7 +395,7 @@ class SummaryBarRenderer { public String renderNetworkReachabilityHTML() { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); - buf.append("

            ") .append(_t("Network")) @@ -387,7 +452,7 @@ class SummaryBarRenderer { .append(_t("Peers")) .append("

            \n" + - "
            \n" + + "
            \n" + "") .append(_t("Bandwidth in/out")) .append("
            " + - "
            \n" + + "
            \n" + "
            ") .append(DataHelper.formatDuration2(3 * 1000)) // lie and say 3 sec since 1 sec would appear as 1000 ms @@ -500,7 +565,7 @@ class SummaryBarRenderer { .append("\">") .append(_t("Tunnels")) .append("
            " + - "\n" + + "
            \n" + "") .append(_t("Congestion")) .append("
            " + - "
            \n" + + "
            \n" + " clients = new ArrayList(_context.clientManager().listClients()); - + StringBuilder buf = new StringBuilder(512); buf.append("

            ").append(_t("Local Tunnels")) - .append("

            "); + .append("
            "); if (!clients.isEmpty()) { Collections.sort(clients, new AlphaComparator()); - buf.append("
            "); - + buf.append("
            "); + for (Destination client : clients) { String name = getName(client); Hash h = client.calculateHash(); - + buf.append("\n"); + buf.append(" ").append(_t("ago")).append(". ").append(_t("Rebuilding")).append("…\">\n"); } else { // green light buf.append("\n"); @@ -478,10 +479,9 @@ public class SummaryHelper extends HelperBase { } else { buf.append("
            ").append(_t("none")).append("
            "); } - buf.append("\n"); return buf.toString(); } - + /** * Compare translated nicknames - put "shared clients" first in the sort * Inner class, can't be Serializable @@ -529,7 +529,7 @@ public class SummaryHelper extends HelperBase { else return _context.tunnelManager().getFreeTunnelCount(); } - + /** * How many active outbound tunnels we have. * @@ -540,7 +540,7 @@ public class SummaryHelper extends HelperBase { else return _context.tunnelManager().getOutboundTunnelCount(); } - + /** * How many inbound client tunnels we have. * @@ -551,7 +551,7 @@ public class SummaryHelper extends HelperBase { else return _context.tunnelManager().getInboundClientTunnelCount(); } - + /** * How many active outbound client tunnels we have. * @@ -562,7 +562,7 @@ public class SummaryHelper extends HelperBase { else return _context.tunnelManager().getOutboundClientTunnelCount(); } - + /** * How many tunnels we are participating in. * @@ -591,7 +591,7 @@ public class SummaryHelper extends HelperBase { public String getJobLag() { if (_context == null) return "0"; - + RateStat rs = _context.statManager().getRate("jobQueue.jobLag"); if (rs == null) return "0"; @@ -603,14 +603,14 @@ public class SummaryHelper extends HelperBase { * How long it takes us to pump out a message, averaged over the last minute * (pretty printed with the units attached) * - */ + */ public String getMessageDelay() { if (_context == null) return "0"; - + return DataHelper.formatDuration2(_context.throttle().getMessageDelay()); } - + /** * How long it takes us to test our tunnels, averaged over the last 10 minutes * (pretty printed with the units attached) @@ -619,23 +619,23 @@ public class SummaryHelper extends HelperBase { public String getTunnelLag() { if (_context == null) return "0"; - + return DataHelper.formatDuration2(_context.throttle().getTunnelLag()); } - + public String getTunnelStatus() { if (_context == null) return ""; return _context.throttle().getTunnelStatus(); } - + public String getInboundBacklog() { if (_context == null) return "0"; - + return String.valueOf(_context.tunnelManager().getInboundBuildQueueSize()); } - + /******* public String getPRNGStatus() { Rate r = _context.statManager().getRate("prng.bufferWaitTime").getRate(60*1000); @@ -697,7 +697,7 @@ public class SummaryHelper extends HelperBase { String status = NewsHelper.getUpdateStatus(); boolean needSpace = false; if (status.length() > 0) { - buf.append("

            ").append(status).append("

            \n"); + buf.append("

            ").append(status).append("

            \n"); needSpace = true; } String dver = NewsHelper.updateVersionDownloaded(); @@ -713,7 +713,7 @@ public class SummaryHelper extends HelperBase { buf.append("
            "); else needSpace = true; - buf.append("

            ").append(_t("Update downloaded")).append("
            "); + buf.append("

            ").append(_t("Update downloaded")).append("
            "); if (_context.hasWrapper()) buf.append(_t("Click Restart to install")); else @@ -734,7 +734,7 @@ public class SummaryHelper extends HelperBase { buf.append("
            "); else needSpace = true; - buf.append("

            ").append(_t("Update available")).append(":
            "); + buf.append("

            ").append(_t("Update available")).append(":
            "); buf.append(_t("Version {0}", getUpdateVersion())).append("
            "); buf.append(constraint).append("

            "); avail = false; @@ -746,7 +746,7 @@ public class SummaryHelper extends HelperBase { buf.append("
            "); else needSpace = true; - buf.append("

            ").append(_t("Update available")).append(":
            "); + buf.append("

            ").append(_t("Update available")).append(":
            "); buf.append(_t("Version {0}", getUnsignedUpdateVersion())).append("
            "); buf.append(unsignedConstraint).append("

            "); unsignedAvail = false; @@ -758,7 +758,7 @@ public class SummaryHelper extends HelperBase { buf.append("
            "); else needSpace = true; - buf.append("

            ").append(_t("Update available")).append(":
            "); + buf.append("

            ").append(_t("Update available")).append(":
            "); buf.append(_t("Version {0}", getDevSU3UpdateVersion())).append("
            "); buf.append(devSU3Constraint).append("

            "); devSU3Avail = false; @@ -821,7 +821,7 @@ public class SummaryHelper extends HelperBase { public String getFirewallAndReseedStatus() { StringBuilder buf = new StringBuilder(256); if (showFirewallWarning()) { - buf.append("

            ") .append(_t("Check network connection and NAT/firewall")) @@ -833,7 +833,7 @@ public class SummaryHelper extends HelperBase { if (allowReseed()) { if (reseedInProgress) { // While reseed occurring, show status message instead - buf.append("").append(_context.netDb().reseedChecker().getStatus()).append("
            "); + buf.append("
            ").append(_context.netDb().reseedChecker().getStatus()).append("
            "); } else { // While no reseed occurring, show reseed link long nonce = _context.random().nextLong(); @@ -843,14 +843,15 @@ public class SummaryHelper extends HelperBase { String uri = getRequestURI(); buf.append("

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

            \n"); + buf.append("

            \n"); } } // If a new reseed ain't running, and the last reseed had errors, show error message if (!reseedInProgress) { String reseedErrorMessage = _context.netDb().reseedChecker().getError(); if (reseedErrorMessage.length() > 0) { - buf.append("").append(reseedErrorMessage).append("
            "); + buf.append("
            ").append(reseedErrorMessage).append("
            "); } } if (buf.length() <= 0) @@ -929,7 +930,7 @@ public class SummaryHelper extends HelperBase { String imgPath = CSSHelper.BASE_THEME_PATH + theme + "/images/"; StringBuilder buf = new StringBuilder(2048); - buf.append("

            \"Server\""); @@ -462,9 +463,9 @@ public class SummaryHelper extends HelperBase { if (ls != null && _context.tunnelManager().getOutboundClientTunnelCount(h) > 0) { long timeToExpire = ls.getEarliestLeaseDate() - _context.clock().now(); if (timeToExpire < 0) { - // red or yellow light + // red or yellow light buf.append("\"").append(_t("Rebuilding")).append("…\"
            \"Ready\"
            ") + buf.append("\n"); for (String section : sections) { int i = sections.indexOf(section); - buf.append("
            ") .append(_t("Remove")) .append("") .append(_t("Name")) @@ -938,11 +939,15 @@ public class SummaryHelper extends HelperBase { .append("
            ") + .append("\">" + "") - .append(_t("Add")).append(": " + - "") + .append("
            "); + buf.append(""); double distance = 0; if (isUs) { - buf.append("" + _t("Our info") + ": ").append(hash).append("\n"); } else { - buf.append("" + _t("Router") + ": ").append(hash).append("\n"); + buf.append("\n"); if (us != null) { BigInteger dist = HashDistance.getDistance(us, info.getHash()); distance = biLog2(dist); - buf.append("Hash Distance: ").append(fmt.format(distance)).append("
            "); + buf.append("\n"); } } - buf.append("Routing Key: ").append(info.getRoutingKey().toBase64()).append("
            \n"); - buf.append("Version: ").append(DataHelper.stripHTML(info.getVersion())).append("
            \n"); - buf.append("Caps: ").append(DataHelper.stripHTML(info.getCapabilities())).append("
            \n"); + buf.append("\n"); + buf.append("\n"); + buf.append("\n"); String fam = info.getOption("family"); if (fam != null) - buf.append("Family: ").append(DataHelper.escapeHTML(fam)).append("
            \n"); + buf.append("\n"); String kls = info.getOption("netdb.knownLeaseSets"); if (kls != null) - buf.append("Lease Sets: ").append(DataHelper.stripHTML(kls)).append("
            \n"); + buf.append("\n"); String kr = info.getOption("netdb.knownRouters"); if (kr != null) - buf.append("Routers: ").append(DataHelper.stripHTML(kr)).append("
            \n"); + buf.append("\n"); long now = _context.clock().now(); if (!isUs) { @@ -825,46 +826,46 @@ class SybilRenderer { long heard = prof.getFirstHeardAbout(); if (heard > 0) { long age = Math.max(now - heard, 1); - buf.append("First heard about: ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } heard = prof.getLastHeardAbout(); if (heard > 0) { long age = Math.max(now - heard, 1); - buf.append("Last heard about: ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } heard = prof.getLastHeardFrom(); if (heard > 0) { long age = Math.max(now - heard, 1); - buf.append("Last heard from: ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } DBHistory dbh = prof.getDBHistory(); if (dbh != null) { heard = dbh.getLastLookupSuccessful(); if (heard > 0) { long age = Math.max(now - heard, 1); - buf.append("Last lookup successful: ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } heard = dbh.getLastLookupFailed(); if (heard > 0) { long age = Math.max(now - heard, 1); - buf.append("Last lookup failed: ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } heard = dbh.getLastStoreSuccessful(); if (heard > 0) { long age = Math.max(now - heard, 1); - buf.append("Last store successful: ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } heard = dbh.getLastStoreFailed(); if (heard > 0) { long age = Math.max(now - heard, 1); - buf.append("Last store failed: ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } } // any other profile stuff? @@ -872,20 +873,21 @@ class SybilRenderer { } long age = Math.max(now - info.getPublished(), 1); if (isUs && _context.router().isHidden()) { - buf.append("").append(_t("Hidden")).append(", ").append(_t("Updated")).append(": ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } else { - buf.append("").append(_t("Published")).append(": ") - .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            \n"); + buf.append("\n"); } - buf.append("").append(_t("Signing Key")).append(": ") - .append(info.getIdentity().getSigningPublicKey().getType().toString()); - buf.append("
            \n" + _t("Addresses") + ": "); + buf.append("\n"); + buf.append("
            \n"); + buf.append("" + _t("Our info") + ": ").append(hash).append("
            " + _t("Router") + ": ").append(hash).append("\n"); if (!full) { - buf.append("[").append(_t("Full entry")).append("]"); + buf.append("[").append(_t("Full entry")).append("]"); } - buf.append(" "); - buf.append("
            \n"); + buf.append(" "); + buf.append("
            Hash Distance:").append(fmt.format(distance)).append("
            Routing Key:").append(info.getRoutingKey().toBase64()).append("
            Version:").append(DataHelper.stripHTML(info.getVersion())).append("
            Caps:").append(DataHelper.stripHTML(info.getCapabilities())).append("
            Family:").append(DataHelper.escapeHTML(fam)).append("
            Lease Sets:").append(DataHelper.stripHTML(kls)).append("
            Routers:").append(DataHelper.stripHTML(kr)).append("
            First heard about:") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            Last heard about:") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            Last heard from:") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            Last lookup successful:") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            Last lookup failed: ") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            Last store successful:") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            Last store failed:") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            ").append(_t("Hidden")).append(", ").append(_t("Updated")).append(":") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            ").append(_t("Published")).append(":") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
            ").append(_t("Signing Key")).append(":") + .append(info.getIdentity().getSigningPublicKey().getType().toString()).append("
            " + _t("Addresses") + ":"); String country = _context.commSystem().getCountry(info.getIdentity().getHash()); if(country != null) { + buf.append(""); buf.append("\"").append(country.toUpperCase(Locale.US)).append('\"'); "); + buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ").append(""); } for (RouterAddress addr : info.getAddresses()) { String style = addr.getTransportStyle(); @@ -920,7 +922,7 @@ class SybilRenderer { return; final DecimalFormat fmt = new DecimalFormat("#0.00"); XORComparator xor = new XORComparator(Hash.FAKE_HASH); - out.write("

            Group Distances

            \n"); + out.write("

            Group Distances

            HashDistance from previous
            \n"); Collections.sort(sybils, xor); Hash prev = null; for (Hash h : sybils) { @@ -951,8 +953,8 @@ class SybilRenderer { prev = null; final int limit = Math.min(10, sybils.size()); for (int i = start; i <= days; i++) { - out.write("

            Distance for " + new Date(now) + - "

            HashDistance from previous
            \n"); + out.write("

            Distance for " + new Date(now) + + "

            HashDistanceDistance from previous
            \n"); Hash rkey = rkgen.getRoutingKey(from, now); xor = new XORComparator(rkey); Collections.sort(sybils, xor); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java index 61bddd0e01..0a4fc2c5dc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -33,7 +33,7 @@ class TunnelRenderer { } public void renderStatusHTML(Writer out) throws IOException { - out.write("

            " + _t("Exploratory tunnels") + " (" + _t("configure") + ")

            \n"); + out.write("

            " + _t("Exploratory tunnels") + " [" + _t("configure") + "]

            \n"); renderPool(out, _context.tunnelManager().getInboundExploratoryPool(), _context.tunnelManager().getOutboundExploratoryPool()); List destinations = null; @@ -54,20 +54,20 @@ class TunnelRenderer { name = outPool.getSettings().getDestinationNickname(); if (name == null) name = client.toBase64().substring(0,4); - out.write("

            " + _t("Client tunnels for") + ' ' + DataHelper.escapeHTML(_t(name))); if (isLocal) - out.write(" (" + _t("configure") + ")

            \n"); + out.write(" [" + _t("configure") + "]\n"); else - out.write(" (" + _t("dead") + ")\n"); + out.write(" (" + _t("dead") + ")\n"); renderPool(out, in, outPool); } List participating = _context.tunnelDispatcher().listParticipatingTunnels(); - out.write("

            " + _t("Participating tunnels") + "

            \n"); + out.write("

            " + _t("Participating tunnels") + "

            \n"); if (!participating.isEmpty()) { Collections.sort(participating, new TunnelComparator()); - out.write("
            HashDistanceDistance from previous
            " + _t("Receive on") + "" + _t("From") + "" + out.write("" + "\n"); } @@ -131,12 +131,11 @@ class TunnelRenderer { if (displayed > DISPLAY_LIMIT) out.write("
            " + _t("Limited display to the {0} tunnels with the highest usage", DISPLAY_LIMIT) + "
            \n"); if (inactive > 0) - out.write("
            " + _t("Inactive participating tunnels") + ": " + inactive + "
            \n"); + out.write("
            " + _t("Inactive participating tunnels") + ":  " + inactive + "
            \n"); else if (displayed <= 0) out.write("
            " + _t("none") + "
            \n"); - out.write("
            " + _t("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B
            \n"); + out.write("
            " + _t("Lifetime bandwidth usage") + ":  " + DataHelper.formatSize2(processed*1024) + "B
            \n"); //renderPeers(out); - out.write(""); } private static class TunnelComparator implements Comparator, Serializable { @@ -164,7 +163,8 @@ class TunnelRenderer { if (info.getLength() > maxLength) maxLength = info.getLength(); } - out.write("
            " + _t("Receive on") + "" + _t("From") + "" + _t("Send on") + "" + _t("To") + "" + _t("Expiration") + "" + _t("Usage") + "" + _t("Rate") + "" + _t("Role") + "
            "); + out.write("
            " + _t("In/Out") + "" + _t("Expiry") + "" + _t("Usage") + "" + _t("Gateway") + "
            "); if (maxLength > 3) { out.write(""); @@ -215,7 +215,7 @@ class TunnelRenderer { // PooledTunnelCreatorConfig List pending = in.listPending(); if (!pending.isEmpty()) { - out.write("
            " + _t("Build in progress") + ": " + pending.size() + " " + _t("inbound") + "
            \n"); + out.write("
            " + _t("Build in progress") + ":  " + pending.size() + " " + _t("inbound") + "
            \n"); live += pending.size(); } } @@ -223,13 +223,13 @@ class TunnelRenderer { // PooledTunnelCreatorConfig List pending = outPool.listPending(); if (!pending.isEmpty()) { - out.write("
            " + _t("Build in progress") + ": " + pending.size() + " " + _t("outbound") + "
            \n"); + out.write("
            " + _t("Build in progress") + ":  " + pending.size() + " " + _t("outbound") + "
            \n"); live += pending.size(); } } if (live <= 0) out.write("
            " + _t("No tunnels; waiting for the grace period to end.") + "
            \n"); - out.write("
            " + _t("Lifetime bandwidth usage") + ": " + + out.write("
            " + _t("Lifetime bandwidth usage") + ":  " + DataHelper.formatSize2(processedIn*1024) + "B " + _t("in") + ", " + DataHelper.formatSize2(processedOut*1024) + "B " + _t("out") + "
            "); } diff --git a/apps/routerconsole/jsp/certs.jsp b/apps/routerconsole/jsp/certs.jsp index 3c4e59cf62..1eba5d7001 100644 --- a/apps/routerconsole/jsp/certs.jsp +++ b/apps/routerconsole/jsp/certs.jsp @@ -9,7 +9,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %>

            <%=intl._t("Certificates")%>

            -
            +
            " /> <% certhelper.storeWriter(out); %> diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 5e9c0de92f..c7cbac7e4f 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -15,21 +15,22 @@ " />

            <%=intl._t("I2P Bandwidth Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> -
            -

            <%=intl._t("Bandwidth limiter")%>

            - + +

            <%=intl._t("Bandwidth Limiter")%> [<%=intl._t("Advanced Network Configuration")%>]

            +
            ") + _t("In/Out") + + "" + _t("Expiry") + "" + _t("Usage") + "" + _t("Gateway") + "" + _t("Participants") + "
            + + + +
            <%=intl._t("I2P will work best if you configure your rates to match the speed of your internet connection.")%> -

            -
            + <% /******** @@ -55,8 +56,9 @@
            " > +
            " > <%=intl._t("KBps In")%> ()
            <%=intl._t("Share")%> () -
            -

            <% int share = nethelper.getShareBandwidth(); +

            +<% int share = nethelper.getShareBandwidth(); if (share < 12) { out.print(""); out.print(intl._t("NOTE")); @@ -73,11 +75,11 @@ out.print(intl._t("The higher the share bandwidth the more you improve your anonymity and help the network.")); } - %>

            -

            <%=intl._t("Advanced network configuration page")%>

            -
            + %>
            " > " > - +
            - + diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index 3ba2deed10..ed8a388859 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -16,7 +16,7 @@ " />

            <%=intl._t("I2P Advanced Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> @@ -24,9 +24,14 @@ <%@include file="formhandler.jsi" %>
            -

            <%=intl._t("Floodfill Configuration")%>

            -

            <%=intl._t("Floodill participation helps the network, but may use more of your computer's resources.")%> -

            + +

            <%=intl._t("Floodfill Configuration")%>

            +
            + + + + + +
            +<%=intl._t("Floodfill participation helps the network, but may use more of your computer's resources.")%> +
            <% if (advancedhelper.isFloodfill()) { %><%=intl._t("This router is currently a floodfill participant.")%><% @@ -34,33 +39,51 @@ %><%=intl._t("This router is not currently a floodfill participant.")%><% } %> -

            - +
            - > -<%=intl._t("Automatic")%>
            - > -<%=intl._t("Force On")%>
            - > -<%=intl._t("Disable")%>
            -
            +<%=intl._t("Enrollment")%>: +  +  + +
            " > - -

            <%=intl._t("Advanced I2P Configuration")%>

            +
            + + +

            <%=intl._t("Advanced I2P Configuration")%> [Additional Options]

            <% if (advancedhelper.isAdvanced()) { %>
            <% } // isAdvanced %> -
            + <% if (advancedhelper.isAdvanced()) { %> -
            +
            +<% } else { %> + +<% } // isAdvanced %> + +<% if (advancedhelper.isAdvanced()) { %> + +<% } // isAdvanced %> +
            +<%=intl._t("NOTE")%>: <%=intl._t("Some changes may require a restart to take effect.")%> +
            +<%=intl._t("To make changes, edit the file {0}.", "" + advancedhelper.getConfigFileName() + "")%> +
            + +
            " > " > -
            <%=intl._t("NOTE")%>: <%=intl._t("Some changes may require a restart to take effect.")%> - -<% } else { %> -<%=intl._t("To make changes, edit the file {0}.", "" + advancedhelper.getConfigFileName() + "")%> +
            +<% if (advancedhelper.isAdvanced()) { %> + <% } // isAdvanced %>
            diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 59f236071e..73a8a16817 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -21,31 +21,37 @@ input.default { width: 1px; height: 1px; visibility: hidden; } " /> " />

            <%=intl._t("I2P Client Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %>
            -

            <%=intl._t("Client Configuration")%>

            - <%=intl._t("The Java clients listed below are started by the router and run in the same JVM.")%>
            - <%=intl._t("Be careful changing any settings here. The 'router console' and 'application tunnels' are required for most uses of I2P. Only advanced users should change these.")%> +

            <%=intl._t("Client Configuration")%>  + + ">[I2CP]  + ">[Plugins]  + ">[WebApps] + +

            +

            + <%=intl._t("The Java clients listed below are started by the router and run in the same JVM.")%>  + <%=intl._t("To change other client options, edit the file")%> + <%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext()).getAbsolutePath()%>. + <%=intl._t("All changes require restart to take effect.")%> +

            +

            + <%=intl._t("Be careful changing any settings here. The 'router console' and 'application tunnels' are required for most uses of I2P. Only advanced users should change these.")%>

            -

            <%=intl._t("To change other client options, edit the file")%> - <%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext()).getAbsolutePath()%>. - <%=intl._t("All changes require restart to take effect.")%> -

            +
            " /> <% if (clientshelper.isClientChangeEnabled() && request.getParameter("edit") == null) { %> " /> <% } %> " />
            -
            -

            <%=intl._t("Advanced Client Interface Configuration")%>

            -

            <%=intl._t("WebApp Configuration")%>

            -

            <%=intl._t("Plugin Configuration")%>

            +
            diff --git a/apps/routerconsole/jsp/configfamily.jsp b/apps/routerconsole/jsp/configfamily.jsp index 119239098d..905701a71f 100644 --- a/apps/routerconsole/jsp/configfamily.jsp +++ b/apps/routerconsole/jsp/configfamily.jsp @@ -14,13 +14,13 @@ " />

            <%=intl._t("I2P Router Family Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> -

            <%=intl._t("Routers in the same family share a family key.")%> +

            <%=intl._t("Routers in the same family share a family key.")%> <%=intl._t("To join an existing family, import the private key you exported from a router in the family.")%> <%=intl._t("To start a new family, enter a family name.")%>

            @@ -30,27 +30,35 @@ if (family.length() <= 0) { // no family yet %> -
            + -

            <%=intl._t("Join Existing Router Family")%>

            -

            <%=intl._t("Import the secret family key that you exported from an existing router in the family.")%> -

            <%=intl._t("Select secret key file")%> : +

            + + + + + +
            <%=intl._t("Join Existing Router Family")%>
            <%=intl._t("Import the secret family key that you exported from an existing router in the family.")%>
            <%=intl._t("Select secret key file")%>: -

            -
            -" /> -
            +             		+" /> +
            -
            + + -

            <%=intl._t("Create New Router Family")%>

            -

            <%=intl._t("Family Name")%> : +

            + + + + + +
            <%=intl._t("Create New Router Family")%>
            <%=intl._t("Family Name")%>: -

            -
            -" /> -
            +             		+" /> +
            <% } else { // family is configured @@ -58,30 +66,36 @@ if (keypw.length() > 0) { // family is active %> -
            + -

            <%=intl._t("Export Family Key")%>

            -

            <%=intl._t("Export the secret family key to be imported into other routers you control.")%> -

            -
            +
            + + + + +
            <%=intl._t("Export Family Key")%>
            <%=intl._t("Export the secret family key to be imported into other routers you control.")%>
            " /> - +
            <% } else { // family is not active %> -

            <%=intl._t("Restart required to activate family {0}.", '"' + family + '"')%> +

            <%=intl._t("Restart required to activate family {0}.", '"' + family + '"')%> <%=intl._t("After restarting, you may export the family key.")%>

            <% } %> -
            + + -

            <%=intl._t("Leave Router Family")%>

            -

            <%=intl._t("No longer be a member of the family {0}.", '"' + family + '"')%> -

            -" /> -
            + + + + + +
            <%=intl._t("Leave Router Family")%>
            <%=intl._t("No longer be a member of the family {0}.", '"' + family + '"')%> +" /> +
            <% } %> diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp index 56be7b8bd0..b73a2bfa22 100644 --- a/apps/routerconsole/jsp/confighome.jsp +++ b/apps/routerconsole/jsp/confighome.jsp @@ -18,7 +18,7 @@ input.default { <%@include file="summary.jsi" %>

            <%=intl._t("I2P Home Page Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> @@ -26,24 +26,32 @@ input.default { " /> -

            <%=intl._t("Default Home Page")%>

            +

            <%=intl._t("Default Home Page")%>

            - > - <%=intl._t("Use old home page")%> + + + + + +
            + + " > +
            <% if (homehelper.shouldShowSearch()) { %> -

            <%=intl._t("Search Engines")%>

            +

            <%=intl._t("Search Engines")%>

            -
            +
            " > " > " > @@ -54,13 +62,12 @@ input.default { <% } // shouldShowSearch() %> - -

            <%=intl._t("Hidden Services of Interest")%>

            +

            <%=intl._t("Applications and Configuration")%>

            - - -
            + + +
            " > " > " > @@ -69,12 +76,12 @@ input.default {
            -

            <%=intl._t("Applications and Configuration")%>

            +

            <%=intl._t("Hidden Services of Interest")%>

            - - -
            + + +
            " > " > " > diff --git a/apps/routerconsole/jsp/configi2cp.jsp b/apps/routerconsole/jsp/configi2cp.jsp index f2e481f052..a4cee0ae67 100644 --- a/apps/routerconsole/jsp/configi2cp.jsp +++ b/apps/routerconsole/jsp/configi2cp.jsp @@ -21,24 +21,33 @@ input.default { width: 1px; height: 1px; visibility: hidden; } " /> " />

            <%=intl._t("I2P Client Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %>
            -

            <%=intl._t("Advanced Client Interface Configuration")%>

            +

            <%=intl._t("Advanced Client Interface Configuration")%>

            -

            -<%=intl._t("External I2CP (I2P Client Protocol) Interface Configuration")%>
            - > -<%=intl._t("Enabled without SSL")%>
            - > -<%=intl._t("Enabled with SSL required")%>
            - > -<%=intl._t("Disabled - Clients outside this Java process may not connect")%>
            -<%=intl._t("I2CP Interface")%>: + + + + + + + + + +
            +<%=intl._t("The default settings will work for most people.")%> +<%=intl._t("Any changes made here must also be configured in the external client.")%> +<%=intl._t("Many clients do not support SSL or authorization.")%> +<%=intl._t("All changes require restart to take effect.")%> +
            <%=intl._t("External I2CP (I2P Client Protocol) Interface Configuration")%>
            +
            +
            +
            +
            +<%=intl._t("I2CP Interface")%>:
            -<%=intl._t("I2CP Port")%>: -" >
            -<%=intl._t("Authorization")%>
            - > -<%=intl._t("Require username and password")%>
            -<%=intl._t("Username")%>: -
            -<%=intl._t("Password")%>: -
            -

            <%=intl._t("The default settings will work for most people.")%> -<%=intl._t("Any changes made here must also be configured in the external client.")%> -<%=intl._t("Many clients do not support SSL or authorization.")%> -<%=intl._t("All changes require restart to take effect.")%> -

            +  +<%=intl._t("I2CP Port")%>: +" > +
            <%=intl._t("Authorization")%>
            +
            +
            +<%=intl._t("Username")%>: +  +<%=intl._t("Password")%>: + +
            " /> " /> " /> - +
            +

            diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index 3653a94790..1985b42b02 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -11,36 +11,35 @@ <%@include file="summary.jsi" %>

            <%=intl._t("I2P Keyring Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> " /> -

            <%=intl._t("Keyring")%>

            +

            <%=intl._t("The router keyring is used to decrypt encrypted leaseSets.")%> <%=intl._t("The keyring may contain keys for local or remote encrypted destinations.")%>

            -
            -
            -
            -

            <%=intl._t("Manual Keyring Addition")%>

            +

            <%=intl._t("Manual Keyring Addition")%>

            + + +
            <%=intl._t("Enter keys for encrypted remote destinations here.")%> <%=intl._t("Keys for local destinations must be entered on the")%> <%=intl._t("I2PTunnel page")%>. -

            -
            - - + + + - +
            <%=intl._t("Dest. name, hash, or full key")%>:
            <%=intl._t("Dest. name, hash, or full key")%>:
            <%=intl._t("Encryption Key")%>:<%=intl._t("Encryption Key")%>:
            " > " > " > -
            +
            diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index b68a8865b4..7785791451 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -14,40 +14,40 @@ <%@include file="summary.jsi" %>

            <%=intl._t("I2P Logging Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> -
            -

            <%=intl._t("Configure I2P Logging Options")%>

            -
            - - +

            <%=intl._t("Configure I2P Logging Options")%> " href="/logs">[<%=intl._t("View Logs")%>]

            +
            <%=intl._t("Log file")%>:
            + - + + + - + + + - - - - - - - - - - + + + + + + + + + + + + +
            <%=intl._t("Log file")%>: " value="" > -

            <%=intl._t("(the symbol '@' will be replaced during log rotation)")%>

            <%=intl._t("Log record format")%>:<%=intl._t("(the symbol '@' will be replaced during log rotation)")%>
            <%=intl._t("Log record format")%>: " > -

            <%=intl._t("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%> -

            <%=intl._t("Log date format")%>:<%=intl._t("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%>
            <%=intl._t("Log date format")%>: " > -

            <%=intl._t("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%> -

            <%=intl._t("Max log file size")%>:" >
            <%=intl._t("Default log level")%>:

            <%=intl._t("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%> -

            <%=intl._t("Log level overrides")%>:
            <%=intl._t("New override")%>:
            +
            		<%=intl._t("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%>
            <%=intl._t("Max log file size")%>:" >
            <%=intl._t("Default log level")%>:<%=intl._t("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%>
            <%=intl._t("Log level overrides")%>:
            <%=intl._t("New override")%>:
            " > " > -
            +
            diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp index 4551668637..e46b4e8120 100644 --- a/apps/routerconsole/jsp/confignet.jsp +++ b/apps/routerconsole/jsp/confignet.jsp @@ -14,66 +14,107 @@ " />

            <%=intl._t("I2P Network Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> -
            -

            <%=intl._t("IP and Transport Configuration")%>

            - - <%=intl._t("The default settings will work for most people.")%> - <%=intl._t("There is help below.")%> -

            <%=intl._t("UPnP Configuration")%>:
            - > - <%=intl._t("Enable UPnP to open firewall ports")%> - <%=intl._t("UPnP status")%> -

            <%=intl._t("IP Configuration")%>:
            - <%=intl._t("Externally reachable hostname or IP address")%>:
            - > - <%=intl._t("Use all auto-detect methods")%>
            - > - <%=intl._t("Disable UPnP IP address detection")%>
            - > - <%=intl._t("Ignore local interface IP address")%>
            - > - <%=intl._t("Use SSU IP address detection only")%>
            - > - <%=intl._t("Hidden mode - do not publish IP")%> <%=intl._t("(prevents participating traffic)")%>
            - > - <%=intl._t("Specify hostname or IP")%>:
            +

            <%=intl._t("IP and Transport Configuration")%> " href="/help#configurationhelp">[<%=intl._t("Configuration Help")%>]

            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% /******** *********/ %> -

            - <%=intl._t("TCP Configuration")%>:
            - <%=intl._t("Externally reachable hostname or IP address")%>:
            - > +

            + + + + + + + + + + + + + + +
            + <%=intl._t("The default settings will work for most people.")%> + <%=intl._t("Changing these settings will restart your router.")%> +
            <%=intl._t("UPnP Configuration")%> [<%=intl._t("UPnP Status")%>]
            + +
            <%=intl._t("IP Configuration")%>
            + <%=intl._t("Externally reachable hostname or IP address")%>:
            +
            +
            +
            +
            +
            + <%=nethelper.getAddressSelector() %> -

            - <%=intl._t("Action when IP changes")%>:
            - > +

            <%=intl._t("Action when IP changes")%>
            +
            <%=intl._t("IPv4 Configuration")%>
            + +
            <%=intl._t("IPv6 Configuration")%>
            +
            +
            +
            +
            +
            +
            <%=intl._t("UDP Configuration")%>
            + <%=intl._t("Do not reveal your port numbers to anyone as they can be used to discover your ip address.")%> +
            + <%=intl._t("UDP port:")%> " >
            - > - <%=intl._t("Completely disable")%> <%=intl._t("(select only if behind a firewall that blocks outbound UDP)")%>
            + +
            <%=intl._t("TCP Configuration")%>
            + <%=intl._t("Externally reachable hostname or IP address")%>:
            +
            +
            + " >
            - > - <%=intl._t("Disable inbound (Firewalled)")%>
            - > - <%=intl._t("Completely disable")%> <%=intl._t("(select only if behind a firewall that throttles or blocks outbound TCP)")%>
            -

            - <%=intl._t("Externally reachable TCP port")%>:
            - > +
            + +

            <%=intl._t("Externally reachable TCP port")%>
            +
            " > " > -

            <%=intl._t("Configuration Help")%>:

            - <%=intl._t("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%> -

            - <%=intl._t("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%> - <%=intl._t("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%> - <%=intl._t("Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm.")%> - <%=intl._t("Certain firewalls such as symmetric NATs may not work well with I2P.")%> -

            +
            + <% /******** *********/ %> -

            - <%=intl._t("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%> - <%=intl._t("UPnP support is beta, and may not work for any number of reasons")%>: -

            -
              -
            • <%=intl._t("No UPnP-compatible device present")%> -
            • <%=intl._t("UPnP disabled on the device")%> -
            • <%=intl._t("Software firewall interference with UPnP")%> -
            • <%=intl._t("Bugs in the device's UPnP implementation")%> -
            • <%=intl._t("Multiple firewall/routers in the internet connection path")%> -
            • <%=intl._t("UPnP device change, reset, or address change")%> -
            -

            <%=intl._t("Review the UPnP status here.")%> -<%=intl._t("UPnP may be enabled or disabled above, but a change requires a router restart to take effect.")%>

            -

            <%=intl._t("Hostnames entered above will be published in the network database.")%> - <%=intl._t("They are not private.")%> - <%=intl._t("Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1.")%> - <%=intl._t("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%> - <%=intl._t("When in doubt, leave the settings at the defaults.")%> -

            -

            <%=intl._t("Reachability Help")%>:

            - <%=intl._t("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%> - <%=intl._t("If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers.")%> - <%=intl._t("If there is an error, the logs may also help diagnose the problem.")%> -

            -
              -
            • <%=intl._t("OK")%> - - <%=intl._t("Your UDP port does not appear to be firewalled.")%> -
            • <%=intl._t("Firewalled")%> - - <%=intl._t("Your UDP port appears to be firewalled.")%> - <%=intl._t("As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error.")%> - <%=intl._t("However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port.")%> - <%=intl._t("I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections.")%> - <%=intl._t("However, you will get more participating traffic and help the network more if you can open your firewall(s).")%> - <%=intl._t("If you think you have already done so, remember that you may have both a hardware and a software firewall, or be behind an additional, institutional firewall you cannot control.")%> - <%=intl._t("Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other limitations or bugs that prevent them from passing traffic through to I2P.")%> -
            • <%=intl._t("Testing")%> - - <%=intl._t("The router is currently testing whether your UDP port is firewalled.")%> -
            • <%=intl._t("Hidden")%> - - <%=intl._t("The router is not configured to publish its address, therefore it does not expect incoming connections.")%> - <%=intl._t("Hidden mode is automatically enabled for added protection in certain countries.")%> -
            • <%=intl._t("WARN - Firewalled and Fast")%> - - <%=intl._t("You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled.")%> - <%=intl._t("While I2P will work fine in this configuration, if you really have over 128KBps of bandwidth to share, it will be much more helpful to the network if you open your firewall.")%> -
            • <%=intl._t("WARN - Firewalled and Floodfill")%> - - <%=intl._t("You have configured I2P to be a floodfill router, but you are firewalled.")%> - <%=intl._t("For best participation as a floodfill router, you should open your firewall.")%> -
            • <%=intl._t("WARN - Firewalled with Inbound TCP Enabled")%> - - <%=intl._t("You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well.")%> - <%=intl._t("If your TCP port is firewalled with inbound TCP enabled, routers will not be able to contact you via TCP, which will hurt the network.")%> - <%=intl._t("Please open your firewall or disable inbound TCP above.")%> -
            • <%=intl._t("WARN - Firewalled with UDP Disabled")%> - - <%=intl._t("You have configured inbound TCP, however you have disabled UDP.")%> - <%=intl._t("You appear to be firewalled on TCP, therefore your router cannot accept inbound connections.")%> - <%=intl._t("Please open your firewall or enable UDP.")%> -
            • <%=intl._t("ERR - Clock Skew")%> - - <%=intl._t("Your system's clock is skewed, which will make it difficult to participate in the network.")%> - <%=intl._t("Correct your clock setting if this error persists.")%> -
            • <%=intl._t("ERR - Private TCP Address")%> - - <%=intl._t("You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address.")%> - <%=intl._t("Correct the address or disable inbound TCP above.")%> -
            • <%=intl._t("ERR - SymmetricNAT")%> - - <%=intl._t("I2P detected that you are firewalled by a Symmetric NAT.")%> - <%=intl._t("I2P does not work well behind this type of firewall. You will probably not be able to accept inbound connections, which will limit your participation in the network.")%> -
            • <%=intl._t("ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart")%> - - <%=intl._t("I2P was unable to bind to the configured port noted on the advanced network configuration page .")%> - <%=intl._t("Check to see if another program is using the configured port. If so, stop that program or configure I2P to use a different port.")%> - <%=intl._t("This may be a transient error, if the other program is no longer using the port.")%> - <%=intl._t("However, a restart is always required after this error.")%> -
            • <%=intl._t("ERR - UDP Disabled and Inbound TCP host/port not set")%> - - <%=intl._t("You have not configured inbound TCP with a hostname and port above, however you have disabled UDP.")%> - <%=intl._t("Therefore your router cannot accept inbound connections.")%> - <%=intl._t("Please configure a TCP host and port above or enable UDP.")%> -
            • <%=intl._t("ERR - Client Manager I2CP Error - check logs")%> - - <%=intl._t("This is usually due to a port 7654 conflict. Check the logs to verify.")%> - <%=intl._t("Do you have another I2P instance running? Stop the conflicting program and restart I2P.")%> -
            <% /******** *********/ %> -
            + diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index ca8a8022a5..0a114e04b5 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -9,7 +9,7 @@ <%@include file="summary.jsi" %>

            <%=intl._t("I2P Peer Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> @@ -19,42 +19,53 @@ if (request.getParameter("peer") != null) peer = net.i2p.data.DataHelper.stripHTML(request.getParameter("peer")); // XSS %> -
            -

            <%=intl._t("Manual Peer Controls")%>

            -

            <%=intl._t("Router Hash")%>: -

            -

            <%=intl._t("Manually Ban / Unban a Peer")%>

            -

            <%=intl._t("Banning will prevent the participation of this peer in tunnels you create.")%>

            -
            +

            <%=intl._t("Manual Peer Controls")%>

            + + + + + + + + + + + + <% long speed = 0; long capacity = 0; if (! "".equals(peer)) { // get existing bonus values? } %> -

            <%=intl._t("Speed")%>: +

            + + +
            <%=intl._t("Router Hash")%>:
            <%=intl._t("Manually Ban / Unban a Peer")%>
            <%=intl._t("Banning will prevent the participation of this peer in tunnels you create.")%>
            " /> " /> <% if (! "".equals(peer)) { %> <% } %> - -

            <%=intl._t("Adjust Profile Bonuses")%>

            -

            <%=intl._t("Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. Current bonuses are displayed on the")%> <%=intl._t("profiles page")%>.

            +
            <%=intl._t("Adjust Profile Bonuses")%>
            + <%=intl._t("Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. Current bonuses are displayed on the")%> <%=intl._t("profiles page")%>. +
            <%=intl._t("Speed")%>: - <%=intl._t("Capacity")%>: + <%=intl._t("Capacity")%>: - " />

            +             		+ " /> +
            -

            <%=intl._t("Banned Peers")%>

            +

            <%=intl._t("Banned Peers")%>

            " /> <% profilesHelper.storeWriter(out); %> -

            <%=intl._t("Banned IPs")%>

            +

            <%=intl._t("Banned IPs")%>

            -
            +
            diff --git a/apps/routerconsole/jsp/configplugins.jsp b/apps/routerconsole/jsp/configplugins.jsp index 9eb7ec3d2d..73a590c16e 100644 --- a/apps/routerconsole/jsp/configplugins.jsp +++ b/apps/routerconsole/jsp/configplugins.jsp @@ -21,7 +21,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } " /> " />

            <%=intl._t("Plugin Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> @@ -31,13 +31,13 @@ input.default { width: 1px; height: 1px; visibility: hidden; } if (clientshelper.showPlugins()) { if (clientshelper.isPluginUpdateEnabled()) { %> -

            <%=intl._t("Plugin Configuration")%>

            +

            <%=intl._t("Plugin Configuration")%>

            <%=intl._t("The plugins listed below are started by the webConsole client.")%>

            -
            +
            " /> " />
            @@ -45,38 +45,50 @@ input.default { width: 1px; height: 1px; visibility: hidden; } } // pluginUpdateEnabled if (clientshelper.isPluginInstallEnabled()) { %> -

            <%=intl._t("Plugin Installation from URL")%>

            - <%=intl._t("Look for available plugins on {0}.", "i2pwiki.i2p")%> - <%=intl._t("To install a plugin, enter the download URL:")%> -

            -
            +

            <%=intl._t("Plugin Installation")%>

            + + + + - -

            - -

            - " /> +
            + + + + + + + + + +
            + <%=intl._t("Look for available plugins on {0}.", "i2pwiki.i2p")%> +
            + <%=intl._t("Installation from URL")%> +
            + + URL: + " > + + " /> " /> " /> - - - -
            -

            <%=intl._t("Plugin Installation from File")%>

            +
            +<%=intl._t("Installation from File")%> +
            -

            <%=intl._t("Install plugin from file.")%> -
            <%=intl._t("Select xpi2p or su3 file")%> : - -

            +<%=intl._t("Select xpi2p or su3 file")%>: + +
            		 " /> - +
            <% } // pluginInstallEnabled if (clientshelper.isPluginUpdateEnabled()) { %> -

            <%=intl._t("Update All Plugins")%>

            -
            +

            <%=intl._t("Update All Plugins")%>

            +
            " /> diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp index 25b6704f9f..38ca7f0e3d 100644 --- a/apps/routerconsole/jsp/configreseed.jsp +++ b/apps/routerconsole/jsp/configreseed.jsp @@ -14,106 +14,132 @@ " />

            <%=intl._t("I2P Reseeding Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> -

            <%=intl._t("Reseeding is the bootstrapping process used to find other routers when you first install I2P, or when your router has too few router references remaining.")%> +

            +<%=intl._t("Reseeding is the bootstrapping process used to find other routers when you first install I2P, or when your router has too few router references remaining.")%> <%=intl._t("If reseeding has failed, you should first check your network connection.")%> <%=intl._t("See {0} for instructions on reseeding manually.", "" + intl._t("the FAQ") + "")%>

            - -
            - -

            <%=intl._t("Manual Reseed from URL")%>

            -

            <%=intl._t("Enter zip or su3 URL")%> : - -
            <%=intl._t("The su3 format is preferred, as it will be verified as signed by a trusted source.")%> +

            <%=intl._t("Manual Reseed")%>

            + + + + + + + -

            <%=intl._t("Reseeding Configuration")%>

            -

            <%=intl._t("The default settings will work for most people.")%> +

            + + + + + + + + + + + + + + + + + + + + + + +
            +<%=intl._t("The su3 format is preferred, as it will be verified as signed by a trusted source.")%>  <%=intl._t("The zip format is unsigned; use a zip file only from a source that you trust.")%> -

            -
            -" /> -
            - -
            -
            - -

            <%=intl._t("Manual Reseed from File")%>

            -

            <%=intl._t("Select zip or su3 file")%> : - -
            <%=intl._t("The su3 format is preferred, as it will be verified as signed by a trusted source.")%> -<%=intl._t("The zip format is unsigned; use a zip file only from a source that you trust.")%> -

            -
            -" /> -
            - -
            -
            -

            <%=intl._t("Create Reseed File")%>

            -

            <%=intl._t("Create a new reseed zip file you may share for others to reseed manually.")%> -<%=intl._t("This file will never contain your own router's identity or IP.")%> -

            -
            -" /> -
            - -
            +
            <%=intl._t("Reseed from URL")%>
            +<%=intl._t("Enter zip or su3 URL")%>: + + +" /> +
            <%=intl._t("Reseed from File")%>
            +<%=intl._t("Select zip or su3 file")%>: + + +" /> +
            +<%=intl._t("Create Reseed File")%> +
            +<%=intl._t("Create a new reseed zip file you may share for others to reseed manually.")%>  +<%=intl._t("This file will never contain your own router's identity or IP.")%> +
            +
            +" /> +
            +
            + +
            + +

            <%=intl._t("Reseeding Configuration")%>

            + + + + + +
            +<%=intl._t("The default settings will work for most people.")%>  <%=intl._t("Change these only if HTTPS is blocked by a restrictive firewall and reseed has failed.")%> -

            -
            - - - - + + + + + - - - + + + - + - - - + + + - + -
            <%=intl._t("Reseed URL Selection")%>: > -<%=intl._t("Try SSL first then non-SSL")%>
            - > -<%=intl._t("Use SSL only")%>
            - > -<%=intl._t("Use non-SSL only")%>
            <%=intl._t("Reseed URLs")%>:
            <%=intl._t("Reseed URL Selection")%>:
            +
            +
            <%=intl._t("Reseed URLs")%>: -
            " />
            +
            " />
            <%=intl._t("Enable HTTP Proxy?")%> >
            <%=intl._t("HTTP Proxy Host")%>:
            >
            <%=intl._t("HTTP Proxy Host")%>: " >
            <%=intl._t("HTTP Proxy Port")%>:
            <%=intl._t("HTTP Proxy Port")%>: " >
            <%=intl._t("Use HTTP Proxy Authorization?")%> >
            <%=intl._t("HTTP Proxy Username")%>:
            >
            <%=intl._t("HTTP Proxy Username")%>: " >
            <%=intl._t("HTTP Proxy Password")%>:
            <%=intl._t("HTTP Proxy Password")%>: " >
            -
            +
            " /> " /> " /> - +
            +
            diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 331543d238..a56ab20865 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -11,18 +11,18 @@ <%@include file="summary.jsi" %>

            <%=intl._t("I2P Service Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> -
            -

            <%=intl._t("Shutdown the router")%>

            -

            <%=intl._t("Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes.")%> +

            <%=intl._t("Shutdown the router")%>

            +

            + <%=intl._t("Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes.")%> <%=intl._t("If you need to kill the router immediately, that option is available as well.")%>

            -
            +
            " > " > <% if (formhandler.shouldShowCancelGraceful()) { %> @@ -30,19 +30,21 @@ <% } %>
            <% if (System.getProperty("wrapper.version") != null) { %> -

            <%=intl._t("If you want the router to restart itself after shutting down, you can choose one of the following.")%> +

            <%=intl._t("Restart the router")%>

            +

            + <%=intl._t("If you want the router to restart itself after shutting down, you can choose one of the following.")%> <%=intl._t("This is useful in some situations - for example, if you changed some settings that client applications only read at startup, such as the routerconsole password or the interface it listens on.")%> <%=intl._t("A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately.")%> <%=intl._t("After tearing down the router, it will wait 1 minute before starting back up again.")%>

            -
            +
            " > " > <% } %>
            <% if (formhandler.shouldShowSystray()) { %> -

            <%=intl._t("Systray integration")%>

            -

            <%=intl._t("Control the system tray icon")%> -

            +

            <%=intl._t("Systray integration")%>

            +

            <%=intl._t("Control the system tray icon")%>

            +
            <% if (!formhandler.isSystrayEnabled()) { %> " > <% } else {%> @@ -53,34 +55,37 @@ } if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %> -

            <%=intl._t("Run on startup")%>

            -

            <%=intl._t("You can control whether I2P is run on startup or not by selecting one of the following options - I2P will install (or remove) a service accordingly.")%> +

            <%=intl._t("Run on startup")%>

            +

            + <%=intl._t("You can control whether I2P is run on startup or not by selecting one of the following options - I2P will install (or remove) a service accordingly.")%> <%=intl._t("If you prefer the command line, you can also run the ")%> install_i2p_service_winnt.bat (<%=intl._t("or")%> uninstall_i2p_service_winnt.bat).

            -
            +
            " > -" >
            -

            <%=intl._t("Note")%>: <%=intl._t("If you are running I2P as service right now, removing it will shut down your router immediately.")%> + " >

            +

            + <%=intl._t("Note")%>: <%=intl._t("If you are running I2P as service right now, removing it will shut down your router immediately.")%> <%=intl._t("You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat.")%>

            -<% } %> + <% } %> -

            <%=intl._t("Debugging")%>

            -

            <%=intl._t("View the job queue")%> +

            <%=intl._t("Debugging")%> [<%=intl._t("View the job queue")%>]

            <% if (System.getProperty("wrapper.version") != null) { %> -

            <%=intl._t("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.")%>

            -
            +

            + <%=intl._t("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.")%>

            +
            <% } %> -
            +
            " > <% if (System.getProperty("wrapper.version") != null) { %> " > <% } %>
            -

            <%=intl._t("Launch browser on router startup?")%>

            -

            <%=intl._t("I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at")%> +

            <%=intl._t("Launch browser on router startup?")%>

            +

            + <%=intl._t("I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at")%> http://127.0.0.1:7657/ .

            -
            +
            " > " > -
            +
            diff --git a/apps/routerconsole/jsp/configsidebar.jsp b/apps/routerconsole/jsp/configsidebar.jsp index 63c3ed18ce..9ac5966679 100644 --- a/apps/routerconsole/jsp/configsidebar.jsp +++ b/apps/routerconsole/jsp/configsidebar.jsp @@ -18,7 +18,7 @@ input.default { <%@include file="summary.jsi" %>

            <%=intl._t("I2P Summary Bar Configuration")%>

            -
            +
            <%@include file="confignav.jsi" %> @@ -29,21 +29,29 @@ input.default { " /> -

            <%=intl._t("Refresh Interval")%>

            +

            <%=intl._t("Refresh Interval")%>

            + + + + + +
            " > <%=intl._t("seconds")%> + " > +
            -

            <%=intl._t("Customize Summary Bar")%>

            +

            <%=intl._t("Customize Summary Bar")%>

            -
            +
            " > " >
            diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 802d615e5c..9fbe48dbc8 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -6,6 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("config stats")%> + <%@include file="summaryajax.jsi" %>