diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java index ce547cd029..24bbb9119a 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java @@ -145,7 +145,7 @@ public class IndexBean { if ( (_action == null) || (_action.trim().length() <= 0) || ("Cancel".equals(_action))) return ""; if ( (_prevNonce != _curNonce) && (!validPassphrase(_passphrase)) ) - return "Invalid nonce, are you being spoofed?"; + return "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."; if ("Stop all".equals(_action)) return stopAll(); else if ("Start all".equals(_action)) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java index 69a39c28cc..e8f5e4d423 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java @@ -12,7 +12,7 @@ import net.i2p.util.Log; * * * The form is "processed" after the properties are set and the first output - * property is retrieved - either getNotices() or getErrors(). + * property is retrieved - either getAll(), getNotices() or getErrors(). * */ public class FormHandler { @@ -21,8 +21,8 @@ public class FormHandler { private String _nonce; protected String _action; protected String _passphrase; - private List _errors; - private List _notices; + private List _errors; + private List _notices; private boolean _processed; private boolean _valid; @@ -78,6 +78,31 @@ public class FormHandler { _notices.add(msg); } + /** + * Display everything, wrap it in a div for consistent presentation + * + */ + public String getAllMessages() { + validate(); + process(); + if (_errors.size() <= 0 && _notices.size() <= 0) + return ""; + StringBuffer buf = new StringBuffer(512); + buf.append("

"); + if (_errors.size() > 0) { + buf.append(""); + buf.append(render(_errors)); + buf.append(""); + } + if (_notices.size() > 0) { + buf.append(""); + buf.append(render(_notices)); + buf.append(""); + } + buf.append("

"); + return buf.toString(); + } + /** * Display any error messages (processing the form if it hasn't * been yet) @@ -85,6 +110,7 @@ public class FormHandler { */ public String getErrors() { validate(); + process(); return render(_errors); } @@ -95,6 +121,7 @@ public class FormHandler { */ public String getNotices() { validate(); + process(); return render(_notices); } @@ -133,28 +160,29 @@ public class FormHandler { if ( (expected != null) && (expected.trim().length() > 0) && (expected.equals(_passphrase)) ) { // ok } else { - addFormError("Invalid nonce, are you being spoofed?"); + addFormError("Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."); _valid = false; } } } - private String render(List source) { + private void process() { if (!_processed) { if (_valid) processForm(); _processed = true; } + } + + private String render(List source) { if (source.size() <= 0) { return ""; - } else if (source.size() == 1) { - return (String)source.get(0); } else { StringBuffer buf = new StringBuffer(512); buf.append("
    \n"); for (int i = 0; i < source.size(); i++) { buf.append("
  • "); - buf.append((String)source.get(i)); + buf.append(source.get(i)); buf.append("
    • \n"); } buf.append("
\n"); diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 16593f5d0b..3e5d5893fb 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -18,8 +18,7 @@ " /> - - +
<% String prev = System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce"); @@ -116,7 +115,7 @@ %>
/> - Hidden mode - do not publish IP(prevents participating traffic; change restarts router)
+ Hidden mode - do not publish IP (prevents participating traffic; change restarts router)

UDP Configuration:
UDP port: diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index bdb64be38e..dbf75ccf15 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -19,8 +19,7 @@ " /> - - + <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce"); diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 8e66cb54ee..96916fff12 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -26,8 +26,7 @@ button span.hide{ " /> " /> - - + <% String prev = System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce"); diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index 7dd8bf1784..b26f094db8 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -16,8 +16,7 @@ " /> - - + diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index 11db8e8b7f..65a661551d 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -18,8 +18,7 @@ " /> - - + <% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce"); diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 5690e470e1..590e39dab7 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -16,8 +16,7 @@ " /> - - + diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 4a720afeeb..5d9de218ab 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -16,8 +16,7 @@ " /> - - + <% String prev = System.getProperty("net.i2p.router.web.ConfigServiceHandler.nonce"); diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index c7ec3090ca..12e5f1b91f 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -61,8 +61,7 @@ function toggleAll(category) " /> - - + " /> diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp index e4559b86c2..b2ba61475b 100644 --- a/apps/routerconsole/jsp/configtunnels.jsp +++ b/apps/routerconsole/jsp/configtunnels.jsp @@ -22,8 +22,7 @@ " /> " /> - - +

NOTE: The default settings work for most people. diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index ae6f9bc0cc..59e6219631 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -16,8 +16,7 @@ " /> - - + " /> diff --git a/apps/routerconsole/jsp/default.css b/apps/routerconsole/jsp/default.css index a996b59627..99077d1e01 100644 --- a/apps/routerconsole/jsp/default.css +++ b/apps/routerconsole/jsp/default.css @@ -89,9 +89,24 @@ div.news { } div.confignav { + padding: 1em; background-color: #efefff; } div.configure { + padding: 1em; background-color: #ffffc0; } + +div.messages { + padding: 1em; + background-color: #fafaff; +} + +div.messages span.error { + color: #d00000; +} + +div.messages span.notice { + font-style: italic; +} diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java index de4cff527d..27971d47da 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java @@ -270,7 +270,7 @@ public class AddressbookBean } } else { - message += "Invalid nonce. Are you being spoofed?"; + message = "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."; } } diff --git a/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java b/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java index 85a4ffe6d1..15a2204f8e 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java @@ -142,7 +142,7 @@ public class ConfigBean implements Serializable { } } else { - message = "Invalid nonce. Are you being spoofed?"; + message = "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."; } } if( message.length() > 0 ) diff --git a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java index 5bcfa6d121..9d16701f90 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java @@ -136,7 +136,7 @@ public class SubscriptionsBean } } else { - message = "Invalid nonce. Are you being spoofed?"; + message = "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."; } } if( message.length() > 0 ) diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index 8820015af7..63157ec843 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -523,8 +523,25 @@ public class TunnelPoolManager implements TunnelManagerFacade { long processedIn = (in != null ? in.getLifetimeProcessed() : 0); long processedOut = (outPool != null ? outPool.getLifetimeProcessed() : 0); - out.write("\n"); int live = 0; + int maxLength = 1; + for (int i = 0; i < tunnels.size(); i++) { + TunnelInfo info = (TunnelInfo)tunnels.get(i); + if (info.getLength() > maxLength) + maxLength = info.getLength(); + } + out.write("
DirectionExpirationUsageHops (gateway first)
"); + if (maxLength > 3) { + out.write(""); + } + else if (maxLength == 3) { + out.write(""); + } + if (maxLength > 1) { + out.write(""); + } + out.write("\n"); for (int i = 0; i < tunnels.size(); i++) { TunnelInfo info = (TunnelInfo)tunnels.get(i); long timeLeft = info.getExpiration()-_context.clock().now(); @@ -546,6 +563,10 @@ public class TunnelPoolManager implements TunnelManagerFacade { String cap = getCapacity(peer); out.write(""); } + if (info.getLength() < maxLength && (info.getLength() == 1 || j == info.getLength() - 2)) { + for (int k = info.getLength(); k < maxLength; k++) + out.write(""); + } } out.write("\n");
DirectionExpirationUsageGatewayParticipantsParticipantEndpoint
" + netDbLink(peer) + (id == null ? "" : " " + id) + cap + "