diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java index c90194860..3ab6354a6 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java @@ -6,22 +6,7 @@ import java.util.TreeSet; import net.i2p.router.RouterContext; -public class ConfigAdvancedHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ConfigAdvancedHelper extends HelperBase { public ConfigAdvancedHelper() {} public String getSettings() { 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 d6441736a..2bee43533 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -9,22 +9,7 @@ import java.util.TreeSet; import net.i2p.router.RouterContext; import net.i2p.router.startup.ClientAppConfig; -public class ConfigClientsHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ConfigClientsHelper extends HelperBase { public ConfigClientsHelper() {} public String getForm1() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java index 48bc15068..85c8ee423 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java @@ -6,22 +6,7 @@ import java.io.OutputStreamWriter; import net.i2p.router.RouterContext; -public class ConfigKeyringHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ConfigKeyringHelper extends HelperBase { public ConfigKeyringHelper() {} public String getSummary() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java index 07acb0849..635d2e544 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java @@ -6,22 +6,7 @@ import java.util.TreeSet; import net.i2p.router.RouterContext; -public class ConfigLoggingHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ConfigLoggingHelper extends HelperBase { public ConfigLoggingHelper() {} public String getLogFilePattern() { 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 d355e9d61..9beeb33cf 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -10,22 +10,7 @@ import net.i2p.router.transport.udp.UDPAddress; import net.i2p.router.transport.udp.UDPTransport; import net.i2p.time.Timestamper; -public class ConfigNetHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ConfigNetHelper extends HelperBase { public ConfigNetHelper() {} /** copied from various private components */ diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java index 63fc1f5e5..662a078b8 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java @@ -4,25 +4,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; -import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; -public class ConfigPeerHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ConfigPeerHelper extends HelperBase { public ConfigPeerHelper() {} public String getBlocklistSummary() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java index 925fce79a..3af4ffafb 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java @@ -15,8 +15,7 @@ import net.i2p.stat.RateStat; import net.i2p.stat.StatManager; import net.i2p.util.Log; -public class ConfigStatsHelper { - private RouterContext _context; +public class ConfigStatsHelper extends HelperBase { private Log _log; private String _filter; private Set _filters; 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 98141771b..e21f9d9ce 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -8,22 +8,7 @@ import net.i2p.data.Destination; import net.i2p.router.RouterContext; import net.i2p.router.TunnelPoolSettings; -public class ConfigTunnelsHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ConfigTunnelsHelper extends HelperBase { public ConfigTunnelsHelper() {} diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index 68e2ec5b9..818b748a7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -51,7 +51,7 @@ public class ConfigUpdateHandler extends FormHandler { if ( (_updatePolicy == null) || (!_updatePolicy.equals("notify")) ) addFormNotice("Update available, attempting to download now"); else - addFormNotice("Update available, click link on left to download"); + addFormNotice("Update available, click button on left to download"); } else addFormNotice("No update available"); } 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 0ecaca4f0..d0d243799 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -4,22 +4,7 @@ import net.i2p.crypto.TrustedUpdate; import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; -public class ConfigUpdateHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ConfigUpdateHelper extends HelperBase { public ConfigUpdateHelper() {} public boolean updateAvailable() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java index edacfaa41..ce29250b9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java @@ -6,25 +6,11 @@ import java.util.Locale; import net.i2p.router.RouterContext; import net.i2p.util.FileUtil; -public class ContentHelper { +public class ContentHelper extends HelperBase { private String _page; private int _maxLines; private boolean _startAtBeginning; private String _lang; - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } public ContentHelper() {} 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 658caa1a3..16ce7337d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -11,27 +11,12 @@ import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; import net.i2p.stat.Rate; -public class GraphHelper { - private RouterContext _context; - private Writer _out; +public class GraphHelper extends HelperBase { private int _periodCount; private boolean _showEvents; private int _width; private int _height; private int _refreshDelaySeconds; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } public GraphHelper() { _periodCount = 60; // SummaryListener.PERIODS; @@ -41,7 +26,6 @@ public class GraphHelper { _refreshDelaySeconds = 60; } - public void setOut(Writer out) { _out = out; } public void setPeriodCount(String str) { try { _periodCount = Integer.parseInt(str); } catch (NumberFormatException nfe) {} } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java new file mode 100644 index 000000000..db5aa9ba2 --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java @@ -0,0 +1,29 @@ +package net.i2p.router.web; + +import java.io.Writer; + +import net.i2p.router.RouterContext; + +/** + * Base helper + */ +public abstract class HelperBase { + protected RouterContext _context; + protected Writer _out; + + /** + * Configure this bean to query a particular router context + * + * @param contextId begging few characters of the routerHash, or null to pick + * the first one we come across. + */ + public void setContextId(String contextId) { + try { + _context = ContextHelper.getContext(contextId); + } catch (Throwable t) { + t.printStackTrace(); + } + } + + public void setWriter(Writer out) { _out = out; } +} 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 a56cce19a..cf8ed2352 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java @@ -7,27 +7,9 @@ import java.io.Writer; import net.i2p.router.RouterContext; -public class JobQueueHelper { - private RouterContext _context; - private Writer _out; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class JobQueueHelper extends HelperBase { public JobQueueHelper() {} - public void setWriter(Writer writer) { _out = writer; } - public String getJobQueueSummary() { try { if (_out != null) { 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 67d2fc38c..e1fce8f3e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java @@ -5,22 +5,7 @@ import java.util.List; import net.i2p.router.RouterContext; import net.i2p.util.FileUtil; -public class LogsHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class LogsHelper extends HelperBase { public LogsHelper() {} public String getLogs() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java index a4b2125e3..2d50379f3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java @@ -6,22 +6,8 @@ import java.util.Map; import net.i2p.router.RouterContext; -public class NavHelper { +public class NavHelper extends HelperBase { private static Map _apps = new HashMap(); - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } public NavHelper() {} 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 114579a27..a3280ac44 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java @@ -7,29 +7,12 @@ import java.io.Writer; import net.i2p.router.RouterContext; -public class NetDbHelper { - private RouterContext _context; - private Writer _out; +public class NetDbHelper extends HelperBase { private String _routerPrefix; private boolean _full = false; - - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } public NetDbHelper() {} - public void setWriter(Writer writer) { _out = writer; } public void setRouter(String r) { _routerPrefix = r; } public void setFull(String f) { _full = "1".equals(f); }; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NoticeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NoticeHelper.java index cd656e9e9..d5ce2b0d9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NoticeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NoticeHelper.java @@ -7,22 +7,7 @@ import net.i2p.router.RouterContext; * Simple helper to query the appropriate router for data necessary to render * any emergency notices */ -public class NoticeHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class NoticeHelper extends HelperBase { public String getSystemNotice() { if (true) return ""; // moved to the left hand nav if (_context.router().gracefulShutdownInProgress()) { @@ -35,4 +20,4 @@ public class NoticeHelper { return ""; } } -} \ No newline at end of file +} diff --git a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java index 556367e27..6237183ab 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java @@ -8,29 +8,9 @@ import java.io.Writer; import net.i2p.router.RouterContext; import net.i2p.router.admin.StatsGenerator; -public class OldConsoleHelper { - private RouterContext _context; - private Writer _out; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class OldConsoleHelper extends HelperBase { public OldConsoleHelper() {} - public void setWriter(Writer writer) { - _out = writer; - } - public String getConsole() { try { if (_out != null) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java index e5561fe1f..2504067ac 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java @@ -5,28 +5,12 @@ import java.io.Writer; import net.i2p.router.RouterContext; -public class PeerHelper { - private RouterContext _context; - private Writer _out; +public class PeerHelper extends HelperBase { private int _sortFlags; private String _urlBase; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } public PeerHelper() {} - public void setOut(Writer out) { _out = out; } public void setSort(String flags) { if (flags != null) { try { 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 4db1010a5..702a63e50 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java @@ -6,22 +6,7 @@ import java.io.OutputStreamWriter; import net.i2p.router.RouterContext; -public class ProfilesHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class ProfilesHelper extends HelperBase { public ProfilesHelper() {} public String getProfileSummary() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java index 8b67d2622..ce6fefd5d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java @@ -11,12 +11,10 @@ import net.i2p.router.RouterContext; * uuuugly. dump the peer profile data if given a peer. * */ -public class StatHelper { +public class StatHelper extends HelperBase { private String _peer; - private Writer _writer; public void setPeer(String peer) { _peer = peer; } - public void setWriter(Writer writer) { _writer = writer; } public String getProfile() { RouterContext ctx = (RouterContext)net.i2p.router.RouterContext.listContexts().get(0); @@ -25,10 +23,10 @@ public class StatHelper { Hash peer = (Hash)iter.next(); if (peer.toBase64().startsWith(_peer)) { try { - WriterOutputStream wos = new WriterOutputStream(_writer); + WriterOutputStream wos = new WriterOutputStream(_out); ctx.profileOrganizer().exportProfile(peer, wos); wos.flush(); - _writer.flush(); + _out.flush(); return ""; } catch (Exception e) { e.printStackTrace(); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index ad8e7135d..2e56e858b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -25,22 +25,7 @@ import net.i2p.stat.RateStat; * Simple helper to query the appropriate router for data necessary to render * the summary sections on the router console. */ -public class SummaryHelper { - private RouterContext _context; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class SummaryHelper extends HelperBase { /** * Retrieve the shortened 4 character ident for the router located within * the current JVM at the given context. diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java index 4d4eba76b..3cd8a96e3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java @@ -7,27 +7,9 @@ import java.io.Writer; import net.i2p.router.RouterContext; -public class TunnelHelper { - private RouterContext _context; - private Writer _out; - /** - * Configure this bean to query a particular router context - * - * @param contextId begging few characters of the routerHash, or null to pick - * the first one we come across. - */ - public void setContextId(String contextId) { - try { - _context = ContextHelper.getContext(contextId); - } catch (Throwable t) { - t.printStackTrace(); - } - } - +public class TunnelHelper extends HelperBase { public TunnelHelper() {} - public void setWriter(Writer writer) { _out = writer; } - public String getTunnelSummary() { try { if (_out != null) { diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp index 422bf19d6..06807f397 100644 --- a/apps/routerconsole/jsp/graphs.jsp +++ b/apps/routerconsole/jsp/graphs.jsp @@ -14,7 +14,7 @@ " /> - + diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp index a537af634..d3b941a34 100644 --- a/apps/routerconsole/jsp/peers.jsp +++ b/apps/routerconsole/jsp/peers.jsp @@ -13,7 +13,7 @@
" /> - + " /> diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsp index 6668683e6..48f3b4fef 100644 --- a/apps/routerconsole/jsp/summary.jsp +++ b/apps/routerconsole/jsp/summary.jsp @@ -12,6 +12,9 @@ " />
+
Configuration  Help
+
+ General
Ident: (, never reveal it to anyone" href="netdb.jsp?r=.">view)
Version:
@@ -60,11 +63,9 @@ if (prev != null) System.setProperty("net.i2p.router.web.ReseedHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ReseedHandler.nonce", nonce+""); String uri = request.getRequestURI(); - if (uri.indexOf('?') > 0) - uri = uri + "&reseedNonce=" + nonce; - else - uri = uri + "?reseedNonce=" + nonce; - out.print(" reseed
"); + out.print("

\n"); + out.print("\n"); + out.print("

\n"); } } // If a new reseed ain't running, and the last reseed had errors, show error message @@ -97,6 +98,5 @@ Tunnel lag:
Handle backlog:

-