Changeset 9a18955


Ignore:
Timestamp:
Aug 15, 2009 4:22:38 PM (11 years ago)
Author:
sponge <sponge@…>
Branches:
master
Children:
064ff8a
Parents:
335d45f (diff), 35da3f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '522de7791fdad000d42bb5a01f139d913e74d7ef'

and 'ef33b50138594ef55a1dbcd6c77a3d3afeb22ff6'

Location:
apps/routerconsole
Files:
67 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java

    r335d45f r9a18955  
    1818    private String _config;
    1919   
     20    @Override
    2021    protected void processForm() {
    2122        if (_shouldSave) {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java

    r335d45f r9a18955  
    55import java.util.TreeSet;
    66
    7 import net.i2p.router.RouterContext;
    87
    98public class ConfigAdvancedHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java

    r335d45f r9a18955  
    2121 */
    2222public class ConfigClientsHandler extends FormHandler {
    23     private Log _log;
     23    private Log configClient_log;
    2424    private Map _settings;
    2525   
    2626    public ConfigClientsHandler() {
    27         _log = ContextHelper.getContext(null).logManager().getLog(ConfigClientsHandler.class);
     27        configClient_log = ContextHelper.getContext(null).logManager().getLog(ConfigClientsHandler.class);
    2828    }
    2929
     30    @Override
    3031    protected void processForm() {
    3132        if (_action.startsWith("Save Client")) {
     
    8182        }
    8283        ClientAppConfig ca = (ClientAppConfig) clients.get(i);
    83         LoadClientAppsJob.runClient(ca.className, ca.clientName, LoadClientAppsJob.parseArgs(ca.args), _log);
     84        LoadClientAppsJob.runClient(ca.className, ca.clientName, LoadClientAppsJob.parseArgs(ca.args), configClient_log);
    8485        addFormNotice("Client " + ca.clientName + " started.");
    8586    }
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java

    r335d45f r9a18955  
    77import java.util.TreeSet;
    88
    9 import net.i2p.router.RouterContext;
    109import net.i2p.router.startup.ClientAppConfig;
    1110
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java

    r335d45f r9a18955  
    11package net.i2p.router.web;
    22
    3 import net.i2p.I2PAppContext;
    43import net.i2p.data.DataFormatException;
    54import net.i2p.data.Hash;
     
    1413    private String _key;
    1514   
     15    @Override
    1616    protected void processForm() {
    1717        if ("Add key".equals(_action)) {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java

    r335d45f r9a18955  
    55import java.io.OutputStreamWriter;
    66
    7 import net.i2p.router.RouterContext;
    87
    98public class ConfigKeyringHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java

    r335d45f r9a18955  
    1919    private String _fileSize;
    2020   
     21    @Override
    2122    protected void processForm() {
    2223        if (_shouldSave) {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java

    r335d45f r9a18955  
    55import java.util.TreeSet;
    66
    7 import net.i2p.router.RouterContext;
    87
    98public class ConfigLoggingHelper extends HelperBase {
     
    4443            buf.append(prefix).append('=').append(level).append('\n');
    4544        }
    46         buf.append("</textarea><br />\n");
     45        buf.append("</textarea><br>\n");
    4746        buf.append("<i>Add additional logging statements above. Example: net.i2p.router.tunnel=WARN</i><br>");
    4847        buf.append("<i>Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN</i><br>");
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java

    r335d45f r9a18955  
    11package net.i2p.router.web;
    22
    3 import net.i2p.data.RouterInfo;
    43import net.i2p.router.Router;
    54import net.i2p.router.transport.FIFOBandwidthRefiller;
     
    76import net.i2p.router.transport.udp.UDPTransport;
    87import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerAndRekeyTask;
    9 import net.i2p.time.Timestamper;
    108
    119/**
     
    4543    private static final String PROP_HIDDEN = Router.PROP_HIDDEN_HIDDEN; // see Router for other choice
    4644   
     45    @Override
    4746    protected void processForm() {
    4847        if (_saveRequested || ( (_action != null) && ("Save changes".equals(_action)) )) {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java

    r335d45f r9a18955  
    55import net.i2p.router.CommSystemFacade;
    66import net.i2p.router.Router;
    7 import net.i2p.router.RouterContext;
    87import net.i2p.router.transport.Addresses;
    98import net.i2p.router.transport.TransportManager;
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java

    r335d45f r9a18955  
    11package net.i2p.router.web;
    22
    3 import net.i2p.I2PAppContext;
    4 import net.i2p.data.DataHelper;
    53import net.i2p.data.Hash;
    64import net.i2p.data.Base64;
    7 import net.i2p.router.Router;
    85import net.i2p.router.peermanager.PeerProfile;
    9 import net.i2p.util.Log;
    106
    117/**
     
    1713    private String _capacity;
    1814   
     15    @Override
    1916    protected void processForm() {
    2017        if ("Save Configuration".equals(_action)) {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java

    r335d45f r9a18955  
    55import java.io.OutputStreamWriter;
    66
    7 import net.i2p.router.RouterContext;
    87
    98public class ConfigPeerHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java

    r335d45f r9a18955  
    5252                return "<center><b>Shutdown imminent</b></center>";
    5353            } else {
    54                 return "<center><b>Shutdown in " + DataHelper.formatDuration(timeRemaining) + "</b></center><br />"
     54                return "<center><b>Shutdown in " + DataHelper.formatDuration(timeRemaining) + "</b></center><br>"
    5555                     + buttons(urlBase, systemNonce, "shutdownImmediate,Shutdown immediately,cancelShutdown,Cancel shutdown");
    5656            }
     
    5959                return "<center><b>Restart imminent</b></center>";
    6060            } else {
    61                 return "<center><b>Restart in " + DataHelper.formatDuration(timeRemaining) + "</b></center><br />"
     61                return "<center><b>Restart in " + DataHelper.formatDuration(timeRemaining) + "</b></center><br>"
    6262                     + buttons(urlBase, systemNonce, "restartImmediate,Restart immediately,cancelShutdown,Cancel restart");
    6363            }
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java

    r335d45f r9a18955  
    11package net.i2p.router.web;
    22
    3 import java.io.File;
    4 import java.io.FileWriter;
    53import java.io.IOException;
    64import java.util.List;
     
    86import net.i2p.apps.systray.SysTray;
    97import net.i2p.apps.systray.UrlLauncher;
    10 import net.i2p.data.DataHelper;
    118import net.i2p.router.Router;
    129import net.i2p.router.startup.ClientAppConfig;
     
    5047    }
    5148   
     49    @Override
    5250    protected void processForm() {
    5351        if (_action == null) return;
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java

    r335d45f r9a18955  
    2929    }
    3030   
     31    @Override
    3132    protected void processForm() {
    3233        saveChanges();
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java

    r335d45f r9a18955  
    99import java.util.StringTokenizer;
    1010
    11 import net.i2p.router.RouterContext;
    1211import net.i2p.stat.FrequencyStat;
    1312import net.i2p.stat.Rate;
     
    3938     *                  the first one we come across.
    4039     */
     40    @Override
    4141    public void setContextId(String contextId) {
    4242        try {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java

    r335d45f r9a18955  
    1515 */
    1616public class ConfigTunnelsHandler extends FormHandler {
    17     private Log _log;
     17    private Log configTunnel_log;
    1818    private Map _settings;
    1919    private boolean _shouldSave;
     
    2323    }
    2424   
     25    @Override
    2526    protected void processForm() {
    2627        if (_shouldSave) {
     
    4445     */
    4546    private void saveChanges() {
    46         _log = _context.logManager().getLog(ConfigTunnelsHandler.class);
     47        configTunnel_log = _context.logManager().getLog(ConfigTunnelsHandler.class);
    4748        boolean saveRequired = false;
    4849       
    49         if (_log.shouldLog(Log.DEBUG))
    50             _log.debug("Saving changes, with props = " + _settings + ".");
     50        if (configTunnel_log.shouldLog(Log.DEBUG))
     51            configTunnel_log.debug("Saving changes, with props = " + _settings + ".");
    5152       
    5253        int updated = 0;
     
    111112           
    112113            if ("exploratory".equals(poolName)) {
    113                 if (_log.shouldLog(Log.DEBUG)) {
    114                     _log.debug("Inbound exploratory settings: " + in);
    115                     _log.debug("Outbound exploratory settings: " + out);
     114                if (configTunnel_log.shouldLog(Log.DEBUG)) {
     115                    configTunnel_log.debug("Inbound exploratory settings: " + in);
     116                    configTunnel_log.debug("Outbound exploratory settings: " + out);
    116117                }
    117118                _context.tunnelManager().setInboundSettings(in);
    118119                _context.tunnelManager().setOutboundSettings(out);
    119120            } else {
    120                 if (_log.shouldLog(Log.DEBUG)) {
    121                     _log.debug("Inbound settings for " + client.toBase64() + ": " + in);
    122                     _log.debug("Outbound settings for " + client.toBase64() + ": " + out);
     121                if (configTunnel_log.shouldLog(Log.DEBUG)) {
     122                    configTunnel_log.debug("Inbound settings for " + client.toBase64() + ": " + in);
     123                    configTunnel_log.debug("Outbound settings for " + client.toBase64() + ": " + out);
    123124                }
    124125                _context.tunnelManager().setInboundSettings(client, in);
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java

    r335d45f r9a18955  
    66
    77import net.i2p.data.Destination;
    8 import net.i2p.router.RouterContext;
    98import net.i2p.router.TunnelPoolSettings;
    109
     
    178177        }
    179178        buf.append("\"/></td></tr>\n");
    180 //        buf.append("<tr><td colspan=\"3\"><hr /></td></tr>\n");
     179//        buf.append("<tr><td colspan=\"3\"><br></td></tr>\n");
    181180    }
    182181
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java

    r335d45f r9a18955  
    66    private String _config;
    77   
     8    @Override
    89    protected void processForm() {
    910        if (_shouldSave)
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

    r335d45f r9a18955  
    1313            if (theme.equals(current))
    1414                buf.append("checked=\"true\" ");
    15             buf.append("value=\"").append(theme).append("\"/>").append(theme).append("<br />\n");
     15            buf.append("value=\"").append(theme).append("\"/>").append(theme).append("<br>\n");
    1616        }
    1717        return buf.toString();
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java

    r335d45f r9a18955  
    5050   
    5151   
     52    @Override
    5253    protected void processForm() {
    5354        if ("Check for update now".equals(_action)) {
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java

    r335d45f r9a18955  
    44import net.i2p.crypto.TrustedUpdate;
    55import net.i2p.data.DataHelper;
    6 import net.i2p.router.RouterContext;
    76
    87public class ConfigUpdateHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java

    r335d45f r9a18955  
    22
    33import java.io.IOException;
    4 import java.io.Writer;
    54import java.util.Comparator;
    65import java.util.Iterator;
     
    98
    109import net.i2p.data.DataHelper;
    11 import net.i2p.router.RouterContext;
    1210import net.i2p.stat.Rate;
    1311
     
    106104    public String getForm() {
    107105        try {
    108             _out.write("<hr /><h3>Configure Graph Display</h3>");
     106            _out.write("<br><h3>Configure Graph Display</h3>");
    109107            _out.write("<p />[<a href=\"configstats.jsp\">Select Stats to Graph</a>]<p />");
    110108            _out.write("<form action=\"graphs.jsp\" method=\"GET\">");
    111             _out.write("Periods: <input size=\"3\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\" /><br />\n");
     109            _out.write("Periods: <input size=\"3\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\" /><br>\n");
    112110            _out.write("Plot averages: <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : "checked=\"true\" ") + " /> ");
    113             _out.write("or plot events: <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? "checked=\"true\" " : "") + " /><br />\n");
     111            _out.write("or plot events: <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? "checked=\"true\" " : "") + " /><br>\n");
    114112            _out.write("Image sizes: width: <input size=\"4\" type=\"text\" name=\"width\" value=\"" + _width
    115113                       + "\" /> pixels, height: <input size=\"4\" type=\"text\" name=\"height\" value=\"" + _height 
    116                        + "\" /><br />\n");
    117             _out.write("Refresh delay: <select name=\"refreshDelay\"><option value=\"60\">1 minute</option><option value=\"120\">2 minutes</option><option value=\"300\">5 minutes</option><option value=\"600\">10 minutes</option><option value=\"1800\">30 minutes</option><option value=\"3600\">1 hour</option><option value=\"-1\">Never</option></select><br />\n");
    118             _out.write("<hr /><div class=\"formaction\"><input type=\"submit\" value=\"Redraw\" /></div></div>");
     114                       + "\" /><br>\n");
     115            _out.write("Refresh delay: <select name=\"refreshDelay\"><option value=\"60\">1 minute</option><option value=\"120\">2 minutes</option><option value=\"300\">5 minutes</option><option value=\"600\">10 minutes</option><option value=\"1800\">30 minutes</option><option value=\"3600\">1 hour</option><option value=\"-1\">Never</option></select><br>\n");
     116            _out.write("<br><div class=\"formaction\"><input type=\"submit\" value=\"Redraw\" /></div></div>");
    119117        } catch (IOException ioe) {
    120118            ioe.printStackTrace();
  • apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java

    r335d45f r9a18955  
    44import java.io.IOException;
    55import java.io.OutputStreamWriter;
    6 import java.io.Writer;
    76
    8 import net.i2p.router.RouterContext;
    97
    108public class JobQueueHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java

    r335d45f r9a18955  
    1111    public String getLogs() {
    1212        String str = formatMessages(_context.logManager().getBuffer().getMostRecentMessages());
    13         return "Location: <code>" + _context.logManager().currentFile() + "</code><br /><br />" + str;
     13        return "Location: <code>" + _context.logManager().currentFile() + "</code><br><br>" + str;
    1414    }
    1515   
  • apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java

    r335d45f r9a18955  
    55import java.util.Map;
    66
    7 import net.i2p.router.RouterContext;
    87
    98public class NavHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java

    r335d45f r9a18955  
    44import java.io.IOException;
    55import java.io.OutputStreamWriter;
    6 import java.io.Writer;
    76
    8 import net.i2p.router.RouterContext;
    97
    108public class NetDbHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java

    r335d45f r9a18955  
    44import java.io.IOException;
    55import java.io.OutputStreamWriter;
    6 import java.io.Writer;
    76
    8 import net.i2p.router.RouterContext;
    97
    108public class OldConsoleHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java

    r335d45f r9a18955  
    22
    33import java.io.IOException;
    4 import java.io.Writer;
    54
    6 import net.i2p.router.RouterContext;
    75
    86public class PeerHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java

    r335d45f r9a18955  
    55import java.io.OutputStreamWriter;
    66
    7 import net.i2p.router.RouterContext;
    87
    98public class ProfilesHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java

    r335d45f r9a18955  
    11package net.i2p.router.web;
    22
    3 import java.io.Writer;
    43import java.util.Iterator;
    54import java.util.Set;
  • apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java

    r335d45f r9a18955  
    8181                buf.append("\">");
    8282                buf.append(stat);
    83                 buf.append("</a></b><br />");
     83                buf.append("</a></b><br>");
    8484                if (_context.statManager().isFrequency(stat))
    8585                    renderFrequency(stat, buf);
     
    8989                buf.setLength(0);
    9090            }
    91             out.write("</ul><hr />");
     91            out.write("</ul><br>");
    9292        }
    9393        out.flush();
     
    9898        buf.append("<i>");
    9999        buf.append(freq.getDescription());
    100         buf.append("</i><br />");
     100        buf.append("</i><br>");
    101101        long uptime = _context.router().getUptime();
    102102        long periods[] = freq.getPeriods();
     
    125125            buf.append(curFreq.getEventCount());
    126126            buf.append(" events)");
    127             buf.append("<br />");
    128         }
    129         buf.append("<br />");
     127            buf.append("<br>");
     128        }
     129        buf.append("<br>");
    130130    }
    131131   
     
    136136            buf.append("<i>");
    137137            buf.append(d);
    138             buf.append("</i><br />");
     138            buf.append("</i><br>");
    139139        }
    140140        if (rate.getLifetimeEventCount() <= 0) {
    141             buf.append("No lifetime events<br />&nbsp;<br />");
     141            buf.append("No lifetime events<br>&nbsp;<br>");
    142142            return;
    143143        }
     
    218218        buf.append(" over ");
    219219        buf.append(rate.getLifetimeEventCount());
    220         buf.append(" events<br /></li>");
     220        buf.append(" events<br></li>");
    221221        buf.append("</ul>");
    222         buf.append("<br />");
     222        buf.append("<br>");
    223223    }
    224224   
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

    r335d45f r9a18955  
    22
    33import java.text.Collator;
    4 import java.text.DateFormat;
    54import java.text.DecimalFormat;
    65import java.util.ArrayList;
    76import java.util.Collections;
    87import java.util.Comparator;
    9 import java.util.Date;
    108import java.util.Iterator;
    119import java.util.List;
    12 import java.util.Locale;
    1310
    1411import net.i2p.data.DataHelper;
     
    1916import net.i2p.router.CommSystemFacade;
    2017import net.i2p.router.Router;
    21 import net.i2p.router.RouterContext;
    2218import net.i2p.router.RouterVersion;
    2319import net.i2p.router.TunnelPoolSettings;
     
    350346            Hash h = client.calculateHash();
    351347           
    352             buf.append("<tr><td align=\"right\"><b><img src=\"/themes/console/images/");
     348            buf.append("<tr><td align=\"right\"><img src=\"/themes/console/images/");
    353349            if (_context.clientManager().shouldPublishLeaseSet(h))
    354350                buf.append("server.png\" alt=\"Server\" title=\"Server\" />");
    355351            else
    356352                buf.append("client.png\" alt=\"Client\" title=\"Client\" />");
    357             buf.append("</td><td align=\"left\"><a href=\"tunnels.jsp#").append(h.toBase64().substring(0,4));
     353            buf.append("</td><td align=\"left\"><b><a href=\"tunnels.jsp#").append(h.toBase64().substring(0,4));
    358354            buf.append("\" target=\"_top\" title=\"Show tunnels\">");
    359355            if (name.length() < 16)
     
    361357            else
    362358                buf.append(name.substring(0,15)).append("&hellip;");
    363             buf.append("</a></td>\n");
     359            buf.append("</a></b></td>\n");
    364360            LeaseSet ls = _context.netDb().lookupLeaseSetLocally(h);
    365361            if (ls != null) {
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java

    r335d45f r9a18955  
    133133    long now() { return _context.clock().now(); }
    134134   
     135    @Override
    135136    public boolean equals(Object obj) {
    136137        return ((obj instanceof SummaryListener) && ((SummaryListener)obj)._rate.equals(_rate));
    137138    }
     139    @Override
    138140    public int hashCode() { return _rate.hashCode(); }
    139141}
  • apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java

    r335d45f r9a18955  
    44import java.io.IOException;
    55import java.io.OutputStreamWriter;
    6 import java.io.Writer;
    76
    8 import net.i2p.router.RouterContext;
    97
    108public class TunnelHelper extends HelperBase {
  • apps/routerconsole/java/src/net/i2p/router/web/UnsignedUpdateHandler.java

    r335d45f r9a18955  
    33import java.io.File;
    44
    5 import net.i2p.I2PAppContext;
    65import net.i2p.router.Router;
    76import net.i2p.router.RouterContext;
     
    10099                if ("install".equals(policy)) {
    101100                    _log.log(Log.CRIT, "Update was downloaded, restarting to install it");
    102                     _status = "<b>Update downloaded</b><br />Restarting";
     101                    _status = "<b>Update downloaded</b><br>Restarting";
    103102                    restart();
    104103                } else {
    105104                    _log.log(Log.CRIT, "Update was downloaded, will be installed at next restart");
    106                     _status = "<b>Update downloaded</b><br />";
     105                    _status = "<b>Update downloaded</b><br>";
    107106                    if (System.getProperty("wrapper.version") != null)
    108107                        _status += "Click Restart to install";
  • apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java

    r335d45f r9a18955  
    168168                buf.append(_pct.format(pct));
    169169            }
    170             buf.append(":<br />\n" + (currentWrite + alreadyTransferred));
     170            buf.append(":<br>\n" + (currentWrite + alreadyTransferred));
    171171            buf.append(" transferred");
    172172            _status = buf.toString();
     
    193193                if ("install".equals(policy)) {
    194194                    _log.log(Log.CRIT, "Update was VERIFIED, restarting to install it");
    195                     _status = "<b>Update verified</b><br />Restarting";
     195                    _status = "<b>Update verified</b><br>Restarting";
    196196                    restart();
    197197                } else {
    198198                    _log.log(Log.CRIT, "Update was VERIFIED, will be installed at next restart");
    199                     _status = "<b>Update downloaded</b><br />";
     199                    _status = "<b>Update downloaded</b><br>";
    200200                    if (System.getProperty("wrapper.version") != null)
    201201                        _status += "Click Restart to install";
  • apps/routerconsole/jsp/config.jsp

    r335d45f r9a18955  
    1414<div class="main" id="main">
    1515 <%@include file="confignav.jsp" %>
    16  
     16
    1717 <jsp:useBean class="net.i2p.router.web.ConfigNetHandler" id="formhandler" scope="request" />
    1818 <jsp:setProperty name="formhandler" property="*" />
     
    2626 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce")%>" />
    2727 <input type="hidden" name="action" value="blah" />
    28  <h3>Bandwidth limiter</h3>
    29  <p>
     28 <h3>Bandwidth limiter</h3><p>
    3029 <b>I2P will work best if you configure your rates to match the speed of your internet connection.</b>
    31  </p>
    32 <p>
    33    <div class="wideload">
    34     <table>
    35     <tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBps
    36     In <td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)<br />
    37 <!-- let's keep this simple...
    38  bursting up to
     30 </p><p>
     31   <div class="wideload"><table><tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBps In
     32        </td><td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)</td>
     33<!-- let's keep this simple...
     34 bursting up to
    3935    <input name="inboundburstrate" type="text" size="5" value="<jsp:getProperty name="nethelper" property="inboundBurstRate" />" /> KBps for
    40     <jsp:getProperty name="nethelper" property="inboundBurstFactorBox" /><br />
    41 -->
    42     <tr><td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundRate" />" /> KBps
    43     Out <td>(<jsp:getProperty name="nethelper" property="outboundRateBits" />)<br />
    44 <!-- let's keep this simple...
    45  bursting up to
     36    <jsp:getProperty name="nethelper" property="inboundBurstFactorBox" /><br>
     37-->
     38    </tr><tr>
     39        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundRate" />" /> KBps Out
     40        </td><td>(<jsp:getProperty name="nethelper" property="outboundRateBits" />)</td>
     41<!-- let's keep this simple...
     42 bursting up to
    4643    <input name="outboundburstrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="outboundBurstRate" />" /> KBps for
    47   <jsp:getProperty name="nethelper" property="outboundBurstFactorBox" /><br />
    48  <i>KBps = kilobytes per second = 1024 bytes per second = 8192 bits per second.<br />
    49     A negative rate sets the default.</i><br />
    50 -->
    51     <tr><td><jsp:getProperty name="nethelper" property="sharePercentageBox" />
    52     Share <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)<br />
    53   </table></div>
    54  </p><p>
     44  <jsp:getProperty name="nethelper" property="outboundBurstFactorBox" /><br>
     45 <i>KBps = kilobytes per second = 1024 bytes per second = 8192 bits per second.<br>
     46    A negative rate sets the default.</i><br>
     47-->
     48    </tr><tr>
     49        <td><jsp:getProperty name="nethelper" property="sharePercentageBox" /> Share</td>
     50        <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)
     51</td></tr></table></div></p><p>
    5552 <% int share = nethelper.getShareBandwidth();
    5653    if (share < 12) {
     
    5855        out.print("I2P requires at least 12KBps to enable sharing. ");
    5956        out.print("Please enable sharing (participating in tunnels) by configuring more bandwidth. ");
    60         out.print("It improves your anonymity by creating cover traffic, and helps the network.<br />");
     57        out.print("It improves your anonymity by creating cover traffic, and helps the network.<br>");
    6158    } else {
    6259        out.print("You have configured I2P to share<b> " + share + "KBps</b>. ");
    63         out.print("The higher the share bandwidth the more you improve your anonymity and help the network.<hr />");
     60        out.print("The higher the share bandwidth the more you improve your anonymity and help the network.<br>");
    6461    }
    6562 %>
    66  </p><div class="formaction">
     63</p><div class="formaction">
    6764<input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /></div>
    6865 <!--
     
    7269 to see what sort of throughput they can handle.  This improves your router's ability
    7370 to pick faster peers, but can cost substantial bandwidth.  Relevant data from the
    74  load testing is fed into the profiles as well as the 
     71 load testing is fed into the profiles as well as the
    7572 <a href="oldstats.jsp#test.rtt">test.rtt</a> and related stats.</p>
    76  <hr />
    77 -->
    78  <h3>IP and Transport Configuration</h3>
    79  <p>
     73 <br>
     74-->
     75 <h3>IP and Transport Configuration</h3><p>
    8076 <b>The default settings will work for most people. There is <a href="#chelp">help below</a>.</b>
    81  </p><p>
    82  <b>UPnP Configuration:</b><br />
     77 </p><p><b>UPnP Configuration:</b><br>
    8378    <input type="checkbox" class="optbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> />
    8479    Enable UPnP to open firewall ports - <a href="peers.jsp#upnp">UPnP status</a>
    85  </p><p>
    86  <b>IP Configuration:</b><br />
    87  Externally reachable hostname or IP address:<br />
     80 </p><p><b>IP Configuration:</b><br>
     81 Externally reachable hostname or IP address:<br>
    8882    <input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> />
    89     Use all auto-detect methods<br />
     83    Use all auto-detect methods<br>
    9084    <input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> />
    91     Disable UPnP IP address detection<br />
     85    Disable UPnP IP address detection<br>
    9286    <input type="radio" class="optbox" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> />
    93     Ignore local interface IP address<br />
     87    Ignore local interface IP address<br>
    9488    <input type="radio" class="optbox" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> />
    95     Use SSU IP address detection only<br />
     89    Use SSU IP address detection only<br>
    9690    <input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> />
    9791    Specify hostname or IP:
     
    110104       }
    111105    %>
    112     <br />
     106    <br>
    113107    <input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> />
    114     Hidden mode - do not publish IP <i>(prevents participating traffic)</i><br />
    115  </p><p>
    116  <b>UDP Configuration:</b><br />
     108    Hidden mode - do not publish IP <i>(prevents participating traffic)</i><br>
     109 </p><p><b>UDP Configuration:</b><br>
    117110 UDP port:
    118  <input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" /><br />
     111 <input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" /><br>
    119112<!-- let's keep this simple...
    120113<input type="checkbox" class="optbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> />
     
    122115 <i>(Enable if you cannot open your firewall)</i>
    123116 </p><p>
    124  Current External UDP address: <i><jsp:getProperty name="nethelper" property="udpAddress" /></i><br />
    125 -->
    126  </p><p>
    127  <b>TCP Configuration:</b><br />
    128  Externally reachable hostname or IP address:<br />
     117 Current External UDP address: <i><jsp:getProperty name="nethelper" property="udpAddress" /></i><br>
     118-->
     119 </p><p>
     120 <b>TCP Configuration:</b><br>
     121 Externally reachable hostname or IP address:<br>
    129122    <input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> />
    130123    Use auto-detected IP address
    131124    <i>(currently <jsp:getProperty name="nethelper" property="udpIP" />)</i>
    132     if we are not firewalled<br />
     125    if we are not firewalled<br>
    133126    <input type="radio" class="optbox" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> />
    134     Always use auto-detected IP address (Not firewalled)<br />
     127    Always use auto-detected IP address (Not firewalled)<br>
    135128    <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> />
    136129    Specify hostname or IP:
    137     <input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" /><br />
     130    <input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" /><br>
    138131    <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> />
    139     Disable inbound (Firewalled)<br />
     132    Disable inbound (Firewalled)<br>
    140133    <input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> />
    141     Completely disable <i>(select only if behind a firewall that throttles or blocks outbound TCP)</i><br />
    142  </p><p>
    143  Externally reachable TCP port:<br />
     134    Completely disable <i>(select only if behind a firewall that throttles or blocks outbound TCP)</i><br>
     135 </p><p>
     136 Externally reachable TCP port:<br>
    144137    <input type="radio" class="optbox" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> />
    145138    Use the same port configured for UDP
    146     <i>(currently <jsp:getProperty name="nethelper" property="udpPort" />)</i><br />
     139    <i>(currently <jsp:getProperty name="nethelper" property="udpPort" />)</i><br>
    147140    <input type="radio" class="optbox" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> />
    148141    Specify Port:
    149     <input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" /><br />
    150  </p><p><b>Note: Changing these settings will restart your router.</b>
    151  </p><hr><div class="formaction">
     142    <input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" /><br>
     143 </p><p><b>Note: Changing these settings will restart your router.</b></p>
     144<hr><div class="formaction">
    152145 <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" />
    153 </div>
    154 </div>
    155 <h3><a name="chelp">Configuration Help:</a></h3>
    156  <div align="justify">
    157  <p>
     146</div><h3><a name="chelp">Configuration Help:</a></h3><div align="justify"><p>
    158147 While I2P will work fine behind most firewalls, your speeds and network integration will generally improve
    159148 if the I2P port (generally 8887) is forwarded for both UDP and TCP.
     
    167156<!-- let's keep this simple...
    168157<input type="submit" name="recheckReachability" value="Check network reachability..." />
    169 -->
    170  </p><p>
     158</p>
     159-->
     160<p>
    171161 UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address
    172162 and forward ports.
    173163 UPnP support is beta, and may not work for any number of reasons:
    174  <ul>
     164<ul>
    175165<li class="tidylist">No UPnP-compatible device present
    176166<li class="tidylist">UPnP disabled on the device
     
    179169<li class="tidylist">Multiple firewall/routers in the internet connection path
    180170<li class="tidylist">UPnP device change, reset, or address change
    181  </ul><br>
     171</ul><br>
    182172 Reviewing the <a href="peers.jsp#upnp">UPnP status</a> may help.
    183173 UPnP may be enabled or disabled above, but a change requires a router restart to take effect.
    184  </p><p>Hostnames entered above will be published in the network database.
     174</p><p>Hostnames entered above will be published in the network database.
    185175    They are <b>not private</b>.
    186176    Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1.
    187177    If you specify the wrong IP address or
    188178    hostname, or do not properly configure your NAT or firewall, your network performance will degrade
    189     substantially.  When in doubt, leave the settings at the defaults.</p>
    190  </p>
    191 <h3><a name="help">Reachability Help:</a></h3>
    192  <p>
     179    substantially.  When in doubt, leave the settings at the defaults.
     180</p>
     181<h3><a name="help">Reachability Help:</a></h3><p>
    193182 While I2P will work fine behind most firewalls, your speeds and network integration will generally improve
    194183 if the I2P port (generally 8887) to both UDP and TCP.
     
    245234     This is usually due to a port 7654 conflict. Check the logs to verify. Do you have another I2P instance running?
    246235     Stop the conflicting program and restart I2P.
    247  </ul>
    248  </p>
    249  <hr />
     236 </ul></p><br>
    250237      <!--
    251238 <b>Dynamic Router Keys: </b>
    252  <input type="checkbox" class="optbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br />
     239 <input type="checkbox" class="optbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br>
    253240 <p>
    254241 This setting causes your router identity to be regenerated every time your IP address
     
    257244 very weak adversaries, help frustrate trivial
    258245 <a href="http://www.i2p.net/how_threatmodel#intersection">intersection
    259  attacks</a> against the NetDB.  Your different router identities would only be 
     246 attacks</a> against the NetDB.  Your different router identities would only be
    260247 'hidden' among other I2P users at your ISP, and further analysis would link
    261248 the router identities further.</p>
     
    265252 though such would likely already be the case anyway, since the IP address changed.
    266253 </p>
    267  <hr />
    268 -->
    269     </form>
    270 </div>
    271 </div>
    272 </body>
    273 </html>
     254 <br>
     255-->
     256</div></form></div></div></body></html>
  • apps/routerconsole/jsp/configadvanced.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config advanced</title>
     5<html><head><title>I2P Router Console - config advanced</title>
    76<%@include file="css.jsp" %>
    87</head><body>
     
    3130 <input type="hidden" name="action" value="blah" />
    3231 <h3>Advanced I2P Configuration</h3>
    33  <textarea rows="32" cols="60" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br /><hr>
    34       <div class="formaction"> 
     32 <textarea rows="32" cols="60" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br><hr>
     33      <div class="formaction">
    3534        <input type="submit" name="shouldsave" value="Apply" />
    36         <input type="reset" value="Cancel" /><br />
     35        <input type="reset" value="Cancel" /><br>
    3736 <b>NOTE:</b> Some changes may require a restart to take effect.
    38       </div>
    39  </form>
    40 </div>
    41 </div>
    42 </div>
    43 </body>
    44 </html>
     37 </div></form></div></div></div></body></html>
  • apps/routerconsole/jsp/configclients.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config clients</title>
     5<html><head><title>I2P Router Console - config clients</title>
    76<%@include file="css.jsp" %>
    87<style type='text/css'>
     
    109    display:none;
    1110}
    12 </style>
    13 </head><body>
     11</style></head><body>
    1412
    1513<%@include file="summary.jsp" %>
     
    2018<div class="main" id="main">
    2119 <%@include file="confignav.jsp" %>
    22  
     20
    2321 <jsp:useBean class="net.i2p.router.web.ConfigClientsHandler" id="formhandler" scope="request" />
    2422 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
     
    2725 <jsp:setProperty name="formhandler" property="settings" value="<%=request.getParameterMap()%>" />
    2826 <jsp:getProperty name="formhandler" property="allMessages" />
    29  <div class="configure">
    30  <form action="configclients.jsp" method="POST">
     27 <div class="configure"><form action="configclients.jsp" method="POST">
    3128 <% String prev = System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce");
    3229    if (prev != null) System.setProperty("net.i2p.router.web.ConfigClientsHandler.noncePrev", prev);
    3330    System.setProperty("net.i2p.router.web.ConfigClientsHandler.nonce", new java.util.Random().nextLong()+""); %>
    3431 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce")%>" />
    35  <h3>Client Configuration</h3>
    36  <p>
     32 <h3>Client Configuration</h3><p>
    3733 The Java clients listed below are started by the router and run in the same JVM.
    38  </p><p> <div class="wideload">
    39  <jsp:getProperty name="clientshelper" property="form1" />
    40  </p><p>
    41  <i>All changes require restart to take effect. To change other client options, edit the clients.config file.</i>
    42  </p> <hr /><div class="formaction">
     34 </p><div class="wideload">
     35 <p><jsp:getProperty name="clientshelper" property="form1" />
     36 </p><p><i>All changes require restart to take effect. To change other client options, edit the clients.config file.</i>
     37 </p><br><div class="formaction">
    4338 <input type="submit" name="action" value="Save Client Configuration" />
    44 </div></div>
    45  <h3>WebApp Configuration</h3>
    46  <p>
     39</div></div><h3>WebApp Configuration</h3><p>
    4740 The Java web applications listed below are started by the webConsole client and run in the same JVM as the router.
    4841 They are usually web applications accessible through the router console.
     
    5447 however the .war file and web app will reappear when you update your router to a newer version,
    5548 so disabling the web app here is the preferred method.
    56  </p><p><div class="wideload">
     49 </p>
     50 <div class="wideload"><p>
    5751 <jsp:getProperty name="clientshelper" property="form2" />
    58  </p>
    59  <p>
     52 </p><p>
    6053 <i>All changes require restart to take effect. To change other webapp options, edit the webapps.config file.</i>
    61  </p>
    62  <hr><div class="formaction">
     54 </p><hr><div class="formaction">
    6355 <input type="submit" name="action" value="Save WebApp Configuration" />
    64  </div>
    65  </form>
    66 </div>
    67 </div>
    68 </div>
    69 </body>
    70 </html>
     56 </div></div></form></div></div></body></html>
  • apps/routerconsole/jsp/configkeyring.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config keyring</title>
     5<html><head><title>I2P Router Console - config keyring</title>
    76<%@include file="css.jsp" %>
    87</head><body>
     
    1716 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    1817 <jsp:getProperty name="formhandler" property="allMessages" />
    19  
    20 
    21 
    2218 <jsp:useBean class="net.i2p.router.web.ConfigKeyringHelper" id="keyringhelper" scope="request" />
    2319 <jsp:setProperty name="keyringhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    24 <div class="configure">
    25  <p>
    26  <h3>Keyring</h3>
     20<div class="configure"><p><h3>Keyring</h3>
    2721 The router keyring is used to decrypt encrypted leaseSets.
    2822 The keyring may contain keys for local or remote encrypted destinations.
    29  <div class="wideload"><p> 
     23 <div class="wideload"><p>
    3024 <jsp:getProperty name="keyringhelper" property="summary" />
    3125</p></div>
    3226
    33  <hr />
     27 <br>
    3428
    3529 <form action="configkeyring.jsp" method="POST">
     
    4236 Keys for local destinations must be entered on the <a href="i2ptunnel/index.jsp">I2PTunnel page</a>.
    4337 <p>
    44   <div class="wideload">
    45       <table>
    46         <tr>
    47           <td class="mediumtags" align="right">Dest. name, hash, or full key:</td>
    48           <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea></td>
    49         <tr>
    50           <td class="mediumtags" align="right">Session Key:</td>
    51           <td><input type="text" size="55" name="key" /></td>
    52         <tr>
    53           <td>
    54           <td align="right">
    55             <input type="submit" name="action" value="Add key" /></td>
    56       </table>
    57  </form>
    58 
    59 </div>
    60 </div>
    61 </div>
    62 </body>
    63 </html>
     38  <div class="wideload">
     39      <table><tr>
     40          <td class="mediumtags" align="right">Dest. name, hash, or full key:</td>
     41          <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea></td>
     42        </tr><tr>
     43          <td class="mediumtags" align="right">Session Key:</td>
     44          <td><input type="text" size="55" name="key" /></td>
     45        </tr><tr>
     46          <td></td>
     47          <td align="right"><input type="submit" name="action" value="Add key" /></td>
     48</tr></table></div></form></div></div></body></html>
  • apps/routerconsole/jsp/configlogging.jsp

    r335d45f r9a18955  
    1919 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2020 <jsp:getProperty name="formhandler" property="allMessages" />
    21 <div class="configure"> 
     21<div class="configure">
    2222 <form action="configlogging.jsp" method="POST">
    2323 <% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce");
     
    2929 <div class="wideload">
    3030      <table border="0" cellspacing="5">
    31         <tr>
    32           <td class="mediumtags" align="right"><b>Logging filename:</b>
    33           <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" />
    34             <br /> <i>(the symbol '@' will be replaced during log rotation)</i>
    35         <tr>
    36           <td class="mediumtags" align="right"><b>Log record format:</b>
    37           <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" />
    38             <br /> <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority,
    39             'm' = message)</i>
    40         <tr>
    41           <td class="mediumtags" align="right"><b>Log date format:</b>
    42           <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
    43             <br /> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss'
    44             = second, 'SSS' = millisecond)</i>
    45         <tr>
    46           <td class="mediumtags" align="right"><b>Max log file size:</b>
    47           <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" />
    48             <br />
    49         <tr>
    50           <td class="mediumtags" align="right"><b>Default log level:</b>
    51           <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /> <br /> <i>(DEBUG and INFO are not recommended defaults,
    52             as they will drastically slow down your router)</i>
    53         <tr>
    54           <td class="mediumtags" align="right"><b>Log level overrides:</b>
    55           <td><jsp:getProperty name="logginghelper" property="logLevelTable" />
    56         <tr>
    57           <td colspan="2"><hr>
    58         <tr>
    59           <td>
    60           <td> <div align="right">
    61               <input type="submit" name="shouldsave" value="Save changes" />
    62               <input type="reset" value="Cancel" />
    63             </div>
    64       </table>
    65  </form>
    66 </div>
    67 </div>
    68 </div>
    69 </body>
    70 </html>
     31        <tr><td class="mediumtags" align="right"><b>Logging filename:</b></td>
     32          <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" />
     33          <br><i>(the symbol '@' will be replaced during log rotation)</i></td>
     34        </tr><tr><td class="mediumtags" align="right"><b>Log record format:</b></td>
     35          <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" />
     36            <br> <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority,
     37            'm' = message)</i></td>
     38        </tr><tr><td class="mediumtags" align="right"><b>Log date format:</b></td>
     39          <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
     40            <br> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss'
     41            = second, 'SSS' = millisecond)</i></td>
     42        </tr><tr><td class="mediumtags" align="right"><b>Max log file size:</b></td>
     43          <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" /><br></td>
     44        </tr><tr><td class="mediumtags" align="right"><b>Default log level:</b></td>
     45          <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /><br><i>(DEBUG and INFO are not recommended defaults,
     46            as they will drastically slow down your router)</i></td>
     47        </tr><tr><td class="mediumtags" align="right"><b>Log level overrides:</b></td>
     48          <td><jsp:getProperty name="logginghelper" property="logLevelTable" /></td>
     49        </tr><tr><td colspan="2"><hr></td>
     50        </tr><tr><td> <div align="right">
     51          <input type="submit" name="shouldsave" value="Save changes" />
     52          <input type="reset" value="Cancel" />
     53</div></td></tr></table></div></form></div></div></body></html>
  • apps/routerconsole/jsp/confignav.jsp

    r335d45f r9a18955  
    11<div class="confignav" id="confignav">
    22<center>
    3 <% if (request.getRequestURI().indexOf("config.jsp") != -1) { 
     3<% if (request.getRequestURI().indexOf("config.jsp") != -1) {
    44 %>Network | <% } else { %><a href="config.jsp">Network</a> | <% }
    55 String userAgent = request.getHeader("User-Agent");
     
    2626 if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) {
    2727 %>Advanced<% } else { %><a href="configadvanced.jsp">Advanced</a><% } %>
    28 </center>
    29 </div>
     28</center></div>
  • apps/routerconsole/jsp/configpeer.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config peers</title>
     5<html><head><title>I2P Router Console - config peers</title>
    76<%@include file="css.jsp" %>
    87</head><body>
     
    1211<div class="main" id="main">
    1312 <%@include file="confignav.jsp" %>
    14  
     13
    1514 <jsp:useBean class="net.i2p.router.web.ConfigPeerHandler" id="formhandler" scope="request" />
    1615 <jsp:setProperty name="formhandler" property="*" />
    1716 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    1817 <jsp:getProperty name="formhandler" property="allMessages" />
    19  
     18
    2019
    2120
     
    2423
    2524 <% String peer = "";
    26     if (request.getParameter("peer") != null)     
     25    if (request.getParameter("peer") != null)
    2726        peer = request.getParameter("peer");
    2827 %>
     
    4140 <input type="text" size="55" name="peer" value="<%=peer%>" /></div>
    4241 <h3>Manually Ban / Unban a Peer</h3>
    43  Shitlisting will prevent the participation of this peer in tunnels you create. 
    44       <hr />     
    45       <div class="formaction"> 
     42 Shitlisting will prevent the participation of this peer in tunnels you create.
     43      <hr>
     44      <div class="formaction">
    4645        <input type="submit" name="action" value="Ban peer until restart" />
    4746        <input type="submit" name="action" value="Unban peer" />
     
    5251
    5352 <h3>Adjust Profile Bonuses</h3>
    54  Bonuses may be positive or negative, and affect the peer's inclusion in Fast 
    55       and High Capacity tiers. Fast peers are used for client tunnels, and High 
    56       Capacity peers are used for some exploratory tunnels. Current bonuses are 
    57       displayed on the <a href="profiles.jsp">profiles page</a>. 
     53 Bonuses may be positive or negative, and affect the peer's inclusion in Fast
     54      and High Capacity tiers. Fast peers are used for client tunnels, and High
     55      Capacity peers are used for some exploratory tunnels. Current bonuses are
     56      displayed on the <a href="profiles.jsp">profiles page</a>.
    5857      <p>
    5958 <% long speed = 0; long capacity = 0;
     
    6160        // get existing bonus values?
    6261    }
    63  %> 
    64  <hr />
     62 %>
     63 <hr>
    6564 <div class="mediumtags">Speed:
    6665 <input type="text" size="8" name="speed" value="<%=speed%>" />
     
    7473 <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    7574 <jsp:getProperty name="profilesHelper" property="shitlistSummary" />
    76  <hr />
     75 <hr>
    7776 <div class="wideload">
    7877 <jsp:getProperty name="peerhelper" property="blocklistSummary" />
    7978
    80 </div>
    81 </div>
    82 </div>
    83 </body>
    84 </html>
     79</div></div></div></body></html>
  • apps/routerconsole/jsp/configservice.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config service</title>
     5<html><head><title>I2P Router Console - config service</title>
    76<%@include file="css.jsp" %>
    87</head><body>
     
    1211<div class="main" id="main">
    1312 <%@include file="confignav.jsp" %>
    14  
     13
    1514 <jsp:useBean class="net.i2p.router.web.ConfigServiceHandler" id="formhandler" scope="request" />
    1615 <jsp:setProperty name="formhandler" property="*" />
     
    2423 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigServiceHandler.nonce")%>" />
    2524 <h3>Shutdown the router</h3>
    26  <p>Graceful shutdown lets the router satisfy the agreements it has already made 
     25 <p>Graceful shutdown lets the router satisfy the agreements it has already made
    2726 before shutting down, but may take a few minutes.  If you need to kill the
    2827 router immediately, that option is available as well.</p>
     
    3332 </div>
    3433 <% if (System.getProperty("wrapper.version") != null) { %>
    35  <p>If you want the router to restart itself after shutting down, you can choose one of 
     34 <p>If you want the router to restart itself after shutting down, you can choose one of
    3635 the following.  This is useful in some situations - for example, if you changed
    3736 some settings that client applications only read at startup, such as the routerconsole password
     
    4645 <% if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %>
    4746 <h3>Systray integration</h3>
    48  <p>On the windows platform, there is a small application to sit in the system 
     47 <p>On the windows platform, there is a small application to sit in the system
    4948 tray, allowing you to view the router's status (later on, I2P client applications
    5049 will be able to integrate their own functionality into the system tray as well).
     
    5352 <input type="submit" name="action" value="Show systray icon" />
    5453 <input type="submit" name="action" value="Hide systray icon" />
    55 </div>
    56  <h3>Run on startup</h3>
    57  <p>You can control whether I2P is run on startup or not by selecting one of the
     54</div><h3>Run on startup</h3>
     55 <p>You can control whether I2P is run on startup or not by selecting one of the
    5856 following options - I2P will install (or remove) a service accordingly.  You can
    59  also run the <code>install_i2p_service_winnt.bat</code> (or 
     57 also run the <code>install_i2p_service_winnt.bat</code> (or
    6058 <code>uninstall_i2p_service_winnt.bat</code>) from the command line, if you prefer.</p>
    6159 <hr><div class="formaction">
    6260 <input type="submit" name="action" value="Run I2P on startup" />
    6361<input type="submit" name="action" value="Don't run I2P on startup" /></div>
    64  <p><b>Note:</b> If you are running I2P as service right now, removing it will shut 
     62 <p><b>Note:</b> If you are running I2P as service right now, removing it will shut
    6563 down your router immediately.  You may want to consider shutting down gracefully, as
    6664 above, then running uninstall_i2p_service_winnt.bat.</p>
     
    6967 <% if (System.getProperty("wrapper.version") != null) { %>
    7068 <h3>Debugging</h3>
    71  <p>At times, it may be helpful to debug I2P by getting a thread dump.  To do so, 
    72  please select the following option and review the thread dumped to 
     69 <p>At times, it may be helpful to debug I2P by getting a thread dump.  To do so,
     70 please select the following option and review the thread dumped to
    7371 <a href="logs.jsp#servicelogs">wrapper.log</a>.</p>
    7472  <hr><div class="formaction">
    7573 <input type="submit" name="action" value="Dump threads" />
    7674<% } %></div>
    77  
     75
    7876 <h3>Launch browser on router startup?</h3>
    7977 <p>I2P's main configuration interface is this web console, so for your convenience
    80  I2P can launch a web browser pointing at 
     78 I2P can launch a web browser pointing at
    8179 <a href="http://127.0.0.1:7657/index.jsp">http://127.0.0.1:7657/index.jsp</a> whenever
    8280 the router starts up.</p>
     
    8482 <input type="submit" name="action" value="View console on startup" />
    8583 <input type="submit" name="action" value="Do not view console on startup" />
    86 </form></div>
    87 </div>
    88 </div>
    89 </body>
    90 </html>
     84</div></form></div></div></body></html>
  • apps/routerconsole/jsp/configstats.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config stats</title>
     5<html><head><title>I2P Router Console - config stats</title>
    76<%@include file="css.jsp" %>
    87<script type="text/javascript">
     
    7473 <h3>Configure I2P Stat Collection</h3>
    7574 Enable full stats?
    76  <input type="checkbox" class="optbox" name="isFull" value="true" <% 
     75 <input type="checkbox" class="optbox" name="isFull" value="true" <%
    7776 if (statshelper.getIsFull()) { %>checked="true" <% } %>/>
    78  (change requires restart to take effect)<br />
    79  Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br />
    80  Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<hr />
     77 (change requires restart to take effect)<br>
     78 Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br>
     79 Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<br>
    8180 <div class="wideload">
    8281 <table>
    8382 <% while (statshelper.hasMoreStats()) {
    8483      while (statshelper.groupRequired()) { %>
    85  <tr class="tablefooter"><td align="left" colspan="3">
     84 <tr class="tablefooter">
     85     <td align="left" colspan="3">
    8686     <b><%=statshelper.getCurrentGroupName()%></b>
    8787     (<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')">toggle all</a>)
    88      </td></tr><tr class="tablefooter"><td align="center"><b>Log</b></td><td align="center"><b>Graph</b></td><td></td></tr><%
     88     </td></tr>
     89 <tr class="tablefooter">
     90    <td align="center"><b>Log</b></td>
     91    <td align="center"><b>Graph</b></td>
     92    <td></td></tr>
     93        <%
    8994     } // end iterating over required groups for the current stat %>
    9095 <tr><td align="center">
    9196     <a name="<%=statshelper.getCurrentStatName()%>"></a>
    92      <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" class="optbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <% 
     97     <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" class="optbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <%
    9398     if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %>/></td>
    9499     <td align="center">
    95100     <% if (statshelper.getCurrentCanBeGraphed()) { %>
    96        <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" class="optbox" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <% 
     101       <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" class="optbox" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <%
    97102       if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %>/><% } %></td>
    98      <td align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br />
     103     <td align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br>
    99104     <%=statshelper.getCurrentStatDescription()%></td></tr><%
    100105    } // end iterating over all stats %>
    101106 <tr><td colspan="3"></td></tr>
    102107 <tr><td align="center"><input type="checkbox" class="optbox" name="explicitFilter" /></td>
    103      <td colspan="2">Advanced filter: 
     108     <td colspan="2">Advanced filter:
    104109     <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr>
    105      <tr class="tablefooter"><td colspan="3" align="right"><input type="submit" name="shouldsave" value="Save changes" /><input type="reset" value="Cancel" /></td></tr></form>
    106  </table>
    107 </div>
    108 </div>
    109 </div>
    110 </body>
    111 </html>
     110     <tr class="tablefooter"><td colspan="3" align="right"><input type="submit" name="shouldsave" value="Save changes" /><input type="reset" value="Cancel" /></td></tr>
     111 </table></div></form></div></div></body></html>
  • apps/routerconsole/jsp/configtunnels.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config tunnels</title>
     5<html><head><title>I2P Router Console - config tunnels</title>
    76<%@include file="css.jsp" %>
    87</head><body>
     
    2221 <jsp:setProperty name="formhandler" property="settings" value="<%=request.getParameterMap()%>" />
    2322 <jsp:getProperty name="formhandler" property="allMessages" />
    24  <div class="configure">
    25  <p><i>
     23 <div class="configure"><p><i>
    2624 NOTE: The default settings work for most people.
    2725 There is a fundamental tradeoff between anonymity and performance.
     
    3028 High CPU and/or high outbound bandwidth usage may result.
    3129 Change these settings with care, and adjust them if you have problems.
    32  </i></p>
    33  <div class="wideload">
     30 </i></p><div class="wideload">
    3431 <form action="configtunnels.jsp" method="POST">
    3532 <% String prev = System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce");
     
    3936 <input type="hidden" name="action" value="blah" />
    4037 <jsp:getProperty name="tunnelshelper" property="form" />
    41  <i>Note - Exploratory tunnel setting changes are stored in the router.config file.</i></br>
     38 <i>Note - Exploratory tunnel setting changes are stored in the router.config file.</i><br>
    4239 <i>Client tunnel changes are temporary and are not saved.</i><br>
    4340 <i>To make permanent client tunnel changes see the </i><a href="i2ptunnel/index.jsp">i2ptunnel page</a>.<br>
    44  <hr /><div class="formaction"><input type="submit" name="shouldsave" value="Save changes" /> <input type="reset" value="Cancel" /></div>
    45  </form>
    46 </div>
    47 </div>
    48 </div>
    49 </body>
    50 </html>
     41 <br><div class="formaction"><input type="submit" name="shouldsave" value="Save changes" /> <input type="reset" value="Cancel" /></div>
     42 </form></div></div></div></body></html>
  • apps/routerconsole/jsp/configui.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config UI</title>
     5<html><head><title>I2P Router Console - config UI</title>
    76<%@include file="css.jsp" %>
    87</head><body>
     
    1716
    1817 <%@include file="confignav.jsp" %>
    19  
     18
    2019 <jsp:useBean class="net.i2p.router.web.ConfigUIHandler" id="formhandler" scope="request" />
    2120 <jsp:setProperty name="formhandler" property="*" />
    2221 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2322 <jsp:getProperty name="formhandler" property="allMessages" />
    24 <div class="configure">
    25 <h3>Router Console Theme</h3>
     23<div class="configure"><h3>Router Console Theme</h3>
    2624<%
    2725 // userAgent defined in confignav
     
    3533 <input type="hidden" name="action" value="blah" />
    3634 <jsp:getProperty name="uihelper" property="settings" />
    37 <hr><div class="formaction">   
     35<hr><div class="formaction">
    3836<input type="submit" name="shouldsave" value="Apply" /> <input type="reset" value="Cancel" />
    39 </form></div>
     37</div></form></div>
    4038<% } else { %>
    41 Theme selection disabled for Internet Explorer, sorry.<hr>If you're not using IE, it's likely that 
     39Theme selection disabled for Internet Explorer, sorry.<hr>If you're not using IE, it's likely that
    4240your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes.
    4341<% } %>
    44 </div>
    45 </div>
    46 </body>
    47 </html>
     42</div></body></html>
  • apps/routerconsole/jsp/configupdate.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - config update</title>
     5<html><head><title>I2P Router Console - config update</title>
    76<%@include file="css.jsp" %>
    87</head><body>
     
    1211<div class="main" id="main">
    1312 <%@include file="confignav.jsp" %>
    14  
     13
    1514 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHandler" id="formhandler" scope="request" />
    1615 <jsp:setProperty name="formhandler" property="*" />
    1716 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    1817 <jsp:getProperty name="formhandler" property="allMessages" />
    19  
    2018 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
    2119 <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2220<div class="messages">
    23 <i><jsp:getProperty name="updatehelper" property="newsStatus" /></i></div> 
     21<i><jsp:getProperty name="updatehelper" property="newsStatus" /></i></div>
    2422<div class="configure">
    2523 <form action="configupdate.jsp" method="POST">
     
    3028      <h3>Check for I2P and news updates</h3>
    3129      <div class="wideload"><table border="0" cellspacing="5">
    32         <tr>
    33           <td colspan="2"></tr>
    34         <tr>
    35           <td class= "mediumtags" align="right"><b>News:</b></td>
    36           <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i>Update In Progress</i><br /> <% } else { %> <input type="submit" name="action" value="Check for update now" />
    37             <% } %></tr>
    38         <tr>
    39           <td colspan="2"><hr /></td>
    40         </tr>
    41         <tr>
    42           <td class= "mediumtags" align="right"><b>News URL:</b></td>
     30        <tr><td colspan="2"></tr>
     31        <tr><td class= "mediumtags" align="right"><b>News:</b></td>
     32          <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i>Update In Progress</i><br> <% } else { %> <input type="submit" name="action" value="Check for update now" />
     33            <% } %></td></tr>
     34        <tr><td colspan="2"><br></td></tr>
     35        <tr><td class= "mediumtags" align="right"><b>News URL:</b></td>
    4336          <td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />"></td>
    44         </tr>
    45         <tr>
    46           <td class= "mediumtags" align="right"><b>Refresh frequency:</b>
    47           <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" />
    48         <tr>
    49           <td class= "mediumtags" align="right"><b>Update policy:</b>
    50           <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" />
    51         <tr>
    52           <td class= "mediumtags" align="right"><b>Update through the eepProxy?</b>
    53           <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" />
    54         <tr>
    55           <td class= "mediumtags" align="right"><b>eepProxy host:</b>
    56           <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" />
    57         <tr>
    58           <td class= "mediumtags" align="right"><b>eepProxy port:</b>
    59           <td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" />
    60         <tr>
    61           <td class= "mediumtags" align="right"><b>Update URLs:</b>
    62           <td><textarea name="updateURL" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea>
    63         <tr>
    64           <td class= "mediumtags" align="right"><b>Trusted keys:</b>
    65           <td><textarea name="trustedKeys" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea>
    66         <tr>
    67           <td class= "mediumtags" align="right"><b>Update with unsigned development builds?</b>
    68           <td><jsp:getProperty name="updatehelper" property="updateUnsigned" />
    69         <tr>
    70           <td class= "mediumtags" align="right"><b>Unsigned Build URL:</b></td>
     37        </tr><tr><td class= "mediumtags" align="right"><b>Refresh frequency:</b>
     38          <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" /></td><tr>
     39          <td class= "mediumtags" align="right"><b>Update policy:</b></td>
     40          <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" /></td>
     41        <tr><td class= "mediumtags" align="right"><b>Update through the eepProxy?</b></td>
     42          <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" /></td>
     43        </tr><tr><td class= "mediumtags" align="right"><b>eepProxy host:</b></td>
     44          <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" /></td>
     45        </tr><tr><td class= "mediumtags" align="right"><b>eepProxy port:</b></td>
     46          <td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" /></td>
     47        </tr><tr><td class= "mediumtags" align="right"><b>Update URLs:</b></td>
     48          <td><textarea name="updateURL" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea></td>
     49        </tr><tr><td class= "mediumtags" align="right"><b>Trusted keys:</b></td>
     50          <td><textarea name="trustedKeys" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea></td>
     51        </tr><tr><td class= "mediumtags" align="right"><b>Update with unsigned development builds?</b></td>
     52          <td><jsp:getProperty name="updatehelper" property="updateUnsigned" /></td>
     53        </tr><tr><td class= "mediumtags" align="right"><b>Unsigned Build URL:</b></td>
    7154          <td><input type="text" size="60" name="zipURL" value="<jsp:getProperty name="updatehelper" property="zipURL" />"></td>
    72         <tr>
    73           <td>
    74           <td><div class="formaction">
    75               <input type="submit" name="action" value="Save" />
    76               <input type="reset" value="Cancel" />
    77             </div>
    78       </table>
    79     </div>
    80  </form>
    81 </div>
    82 </div>
    83 </body>
    84 </html>
     55        </tr><tr><td>
     56        <div class="formaction">
     57            <input type="submit" name="action" value="Save" />
     58            <input type="reset" value="Cancel" />
     59        </div></td></tr></table></div></form></div></div></body></html>
  • apps/routerconsole/jsp/css.jsp

    r335d45f r9a18955  
    99   response.setDateHeader("Expires", 0);
    1010   // the above will b0rk if the servlet engine has already flushed
    11    // the response prior to including this file, so it should be 
     11   // the response prior to including this file, so it should be
    1212   // near the top
    13    
     13
    1414   if (request.getParameter("i2p.contextId") != null) {
    15        session.setAttribute("i2p.contextId", request.getParameter("i2p.contextId")); 
     15       session.setAttribute("i2p.contextId", request.getParameter("i2p.contextId"));
    1616   }
    1717%>
    1818<jsp:useBean class="net.i2p.router.web.CSSHelper" id="cssHelper" scope="request" />
    1919<jsp:setProperty name="cssHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    20 <link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css" /> 
    21 <!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]--> 
     20<link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css" />
     21<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
  • apps/routerconsole/jsp/dumpprofile.jsp

    r335d45f r9a18955  
    1 <%@page contentType="text/plain" 
    2 %><jsp:useBean id="helper" class="net.i2p.router.web.StatHelper" 
    3 /><jsp:setProperty name="helper" property="peer" value="<%=request.getParameter("peer")%>" 
    4 /><jsp:setProperty name="helper" property="writer" value="<%=out%>" 
     1<%@page contentType="text/plain"
     2%><jsp:useBean id="helper" class="net.i2p.router.web.StatHelper"
     3/><jsp:setProperty name="helper" property="peer" value="<%=request.getParameter("peer")%>"
     4/><jsp:setProperty name="helper" property="writer" value="<%=out%>"
    55/><jsp:getProperty name="helper" property="profile" />
  • apps/routerconsole/jsp/error.jsp

    r335d45f r9a18955  
    1313    // If it can't find the iframe or viewtheme.jsp I wonder if the whole thing blows up...
    1414%>
    15 <html><head>
    16 <title>I2P Router Console</title>
     15<html><head><title>I2P Router Console</title>
    1716<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    1817<%@include file="css.jsp" %>
    19 <link rel="shortcut icon" href="favicon.ico" />
    20 </head><body>
     18<link rel="shortcut icon" href="favicon.ico" /></head><body>
    2119<%
    2220if (System.getProperty("router.consoleNonce") == null) {
     
    2826<div class="warning" id="warning">
    2927The Router Console page <%=ERROR_URI%> was not found.
    30 </div>
    31 </body>
    32 </html>
     28</div></body></html>
  • apps/routerconsole/jsp/graphs.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - graphs</title>
     5<html><head><title>I2P Router Console - graphs</title>
    76<%@include file="css.jsp" %>
    87</head><body>
     
    1211<div class="main" id="main">
    1312 <div class="graphspanel">
    14  <div class="widepanel">       
     13 <div class="widepanel">
    1514 <jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
    1615 <jsp:setProperty name="graphHelper" property="*" />
     
    1918 <jsp:getProperty name="graphHelper" property="images" />
    2019 <jsp:getProperty name="graphHelper" property="form" />
    21 </div>
    22 </div>
    23 </body>
    24 </html>
     20</div></div></div></body></html>
  • apps/routerconsole/jsp/help.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - help</title>
     5<html><head><title>I2P Router Console - help</title>
    76<%@include file="css.jsp" %>
    87</head><body>
    9 
    108<%@include file="summary.jsp" %>
    119<h1>I2P Router Help & Support</h1>
    1210<div class="main" id="main"><div align="justify">
    13 If you'd like to help improve or translate the documentation, or 
     11If you'd like to help improve or translate the documentation, or
    1412help with other aspects of the project, please see the documentation for
    15 <a href="http://www.i2p2.i2p/getinvolved.html">volunteers.</a>
    16 <br><br>Further assistance is available here:
    17 <br></div>
     13<a href="http://www.i2p2.i2p/getinvolved.html">volunteers.</a>
     14<br><br>Further assistance is available here:<br></div>
    1815<ul class="links">
    1916<li class="tidylist"><a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
    20 <li class="tidylist"><a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.
    21 </ul>
    22 <br>
     17<li class="tidylist"><a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.</ul><br>
    2318You may also try the <a href="http://forum.i2p/">I2P forum</a>
    24 or IRC.<br />
     19or IRC.<br>
    2520
    2621<h2>Summary Bar Information</h2><div align="justify">
     
    2823<a href="configstats.jsp">configured</a> to be
    2924<a href="graphs.jsp">graphed</a> for further analysis.
    30 </div>
    31 <h3>General</h3>
    32 <ul>
     25</div><h3>General</h3><ul>
    3326<li class="tidylist"><b>Ident:</b>
    3427The first four characters (24 bits) of your 44-character (256-bit) Base64 router hash.
     
    4437The router's view of whether it can be contacted by other routers.
    4538Further information is on the <a href="config.jsp#help">configuration page</a>.
    46 </ul>
    47 
    48 <h3>Peers</h3>
    49 <ul>
     39</ul><h3>Peers</h3><ul>
    5040<li class="tidylist"><b>Active:</b>
    5141The first number is the number of peers you've sent or received a message from in the last few minutes.
     
    7666shared bandwidth, and locally-generated traffic.
    7767I2P does not require a router to know every other router.
    78 </ul>
    79 
    80 <h3>Bandwidth in/out</h3><div align="justify">
     68</ul><h3>Bandwidth in/out</h3><div align="justify">
    8169Should be self-explanatory. All values are in bytes per second, not bits per second.
    8270Change your bandwidth limits on the <a href="config.jsp#help">configuration page</a>.
    83 Bandwidth is <a href="graphs.jsp">graphed</a> by default.
    84 </div>
     71Bandwidth is <a href="graphs.jsp">graphed</a> by default.</div>
     72
    8573<h3>Local destinations</h3><div align="justify">
    8674The local applications connecting through your router.
    8775These may be clients started through <a href="i2ptunnel/index.jsp">I2PTunnel</a>
    8876or external programs connecting through SAM, BOB, or directly to I2CP.
    89 </div>
    90 <h3>Tunnels in/out</h3><div align="justify">
    91 The actual tunnels are shown on the <a href="tunnels.jsp">the tunnels page</a>.</div><br>
    92 <ul>
     77</div><h3>Tunnels in/out</h3><div align="justify">
     78The actual tunnels are shown on the <a href="tunnels.jsp">the tunnels page</a>.</div><br><ul>
    9379<li class="tidylist"><div align="justify"><b>Exploratory:</b>
    9480Tunnels built by your router and used for communication with the floodfill peers,
     
    10389to change your share percentage on the <a href="config.jsp#help">configuration page</a>.
    10490You may also limit the total number by setting <tt>router.maxParticipatingTunnels=nnn</tt> on
    105 the <a href="configadvanced.jsp">advanced configuration page</a>. <a href="configstats.jsp#tunnel.participatingTunnels">[Enable graphing]</a>.
    106 </ul>
     91the <a href="configadvanced.jsp">advanced configuration page</a>. <a href="configstats.jsp#tunnel.participatingTunnels">[Enable graphing]</a>.</ul>
    10792
    10893<h3>Congestion</h3><div align="justify">
    109 Some basic indications of router overload:</div><br>
    110 <ul>
     94Some basic indications of router overload:</div><br><ul>
    11195<li class="tidylist"><b>Job lag:</b>
    11296How long jobs are waiting before execution. The job queue is listed on the <a href="jobs.jsp">jobs page</a>.
     
    144128or reject all requests for a number of reasons, to control
    145129the bandwidth and CPU demands and maintain capacity for
    146 local clients.
    147 </ul>
     130local clients.</ul>
    148131
    149132<h2>Legal stuff</h2><div align="justify">
    150 The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with 
    151 a few notable exceptions:</div><br /><ul>
     133The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with
     134a few notable exceptions:</div><br><ul>
    152135<li class="tidylist">ElGamal and DSA code, under the BSD license, written by TheCrypto</li>
    153136<li class="tidylist">SHA256 and HMAC-SHA256, under the MIT license, written by the Legion of the Bouncycastle</li>
    154137<li class="tidylist">AES code, under the Cryptix (MIT) license, written by the Cryptix team</li>
    155138<li class="tidylist">SNTP code, under the BSD license, written by Adam Buckley</li>
    156 <li class="tidylist">The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo, 
     139<li class="tidylist">The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo,
    157140    ugha, duck, shendaras, and others.</li>
    158141</ul>
     
    161144licenses and dependencies.  This webpage is being served as part of the I2P routerconsole
    162145client application, which is built off a trimmed down <a href="http://jetty.mortbay.com/jetty/index.html">Jetty</a>
    163 instance (trimmed down, as in, we do not include the demo apps or other add-ons, and we simplify configuration), 
    164 allowing you to deploy standard JSP/Servlet web applications into your router.  Jetty in turn makes use of 
     146instance (trimmed down, as in, we do not include the demo apps or other add-ons, and we simplify configuration),
     147allowing you to deploy standard JSP/Servlet web applications into your router.  Jetty in turn makes use of
    165148Apache's javax.servlet (javax.servlet.jar) implementation.
    166 This product includes software developed by the Apache Software Foundation 
     149This product includes software developed by the Apache Software Foundation
    167150(http://www.apache.org/). </p>
    168151
     
    171154lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy).  There is also a
    172155<a href="http://susi.i2p/">susimail</a> web based mail client <a href="susimail/susimail">available</a> on
    173 the console, which is a GPL'ed application written by susi23.  The addressbook application, written by 
     156the console, which is a GPL'ed application written by susi23.  The addressbook application, written by
    174157<a href="http://ragnarok.i2p/">Ragnarok</a> helps maintain your hosts.txt files (see ./addressbook/ for
    175158more information).</p>
    176159
    177160<p>The router by default also includes human's public domain <a href="http://www.i2p2.i2p/sam">SAM</a> bridge,
    178 which other client applications (such the <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) can use. 
    179 There is also an optimized library for doing large number calculations - jbigi - which in turn uses the 
    180 LGPL licensed <a href="http://swox.com/gmp/">GMP</a> library, tuned for various PC architectures.  Launchers for windows users are built with <a href="http://launch4j.sourceforge.net/">Launch4J</a>, and the installer is built with <a href="http://www.izforge.com/izpack/">IzPack</a>.  For 
    181 details on other applications available, as well as their licenses, please see the 
     161which other client applications (such the <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) can use.
     162There is also an optimized library for doing large number calculations - jbigi - which in turn uses the
     163LGPL licensed <a href="http://swox.com/gmp/">GMP</a> library, tuned for various PC architectures.  Launchers for windows users are built with <a href="http://launch4j.sourceforge.net/">Launch4J</a>, and the installer is built with <a href="http://www.izforge.com/izpack/">IzPack</a>.  For
     164details on other applications available, as well as their licenses, please see the
    182165<a href="http://www.i2p2.i2p/licenses">license policy</a>.  Source for the I2P code and most bundled
    183166client applications can be found on our <a href="http://www.i2p2.i2p/download">download page</a>.
     
    191174 <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
    192175 <jsp:getProperty name="contenthelper" property="textContent" />
    193  
    194  <p>A more complete list of changes can be found 
     176
     177 <p>A more complete list of changes can be found
    195178 in the history.txt file in your i2p directory.
    196  </p><hr />
    197 </div>
    198 </body>
    199 </html>
     179 </p><br></div></body></html>
  • apps/routerconsole/jsp/index.jsp

    r335d45f r9a18955  
    1515%>
    1616
    17 <%@include file="summary.jsp" %>
    18 
    19 <h1>I2P Router Console</h1>
     17<%@include file="summary.jsp" %><h1>I2P Router Console</h1>
    2018<div class="news" id="news">
    2119 <jsp:useBean class="net.i2p.router.web.ContentHelper" id="newshelper" scope="request" />
     
    2725 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
    2826 <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    29  <hr /><i><jsp:getProperty name="updatehelper" property="newsStatus" /></i><br />
    30 </div>
    31 
    32 <div class="main" id="main">
     27 <br><i><jsp:getProperty name="updatehelper" property="newsStatus" /></i><br>
     28</div><div class="main" id="main">
    3329 <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
    3430 <% fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/readme.html"); %>
     
    3733 <jsp:setProperty name="contenthelper" property="lang" value="<%=request.getParameter("lang")%>" />
    3834 <jsp:getProperty name="contenthelper" property="content" />
    39 </div>
    40 
    41 </body>
    42 </html>
     35</div></body></html>
  • apps/routerconsole/jsp/jobs.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - job queue</title>
     5<html><head><title>I2P Router Console - job queue</title>
    76<%@include file="css.jsp" %>
    87</head><body>
    9 
    10 <%@include file="summary.jsp" %>
    11  <h1>I2P Router Job Queue</h1>
     8<%@include file="summary.jsp" %><h1>I2P Router Job Queue</h1>
    129<div class="main" id="main">
    1310 <jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" />
     
    1512 <jsp:setProperty name="jobQueueHelper" property="writer" value="<%=out%>" />
    1613 <jsp:getProperty name="jobQueueHelper" property="jobQueueSummary" />
    17 </div>
    18 
    19 </body>
    20 </html>
     14</div></body></html>
  • apps/routerconsole/jsp/logs.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - logs</title>
     5<html><head><title>I2P Router Console - logs</title>
    76<%@include file="css.jsp" %>
    87</head><body>
    9 
    108<%@include file="summary.jsp" %>
    11  <h1>I2P Router Logs</h1>
     9<h1>I2P Router Logs</h1>
    1210<div class="main" id="main">
    13  <div class="joblog">
    14  <h3>Version:</h3><a name="version"> </a>
     11 <div class="joblog"><h3>Version:</h3><a name="version"> </a>
    1512 Please include this information in bug reports.
    16  <p>
    17 I2P <jsp:getProperty name="helper" property="version" /><br />
    18 <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%><br />
    19 <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br />
    20 CPU <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br />
    21 jbigi <%=net.i2p.util.NativeBigInteger.loadStatus()%><br />
    22  </p>
    23  <hr />
     13 <p>I2P <jsp:getProperty name="helper" property="version" /><br>
     14<%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%><br>
     15<%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br>
     16CPU <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br>
     17jbigi <%=net.i2p.util.NativeBigInteger.loadStatus()%><br></p><br>
    2418 <jsp:useBean class="net.i2p.router.web.LogsHelper" id="logsHelper" scope="request" />
    2519 <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2620 <h3>Critical logs:</h3><a name="criticallogs"> </a>
    27  <jsp:getProperty name="logsHelper" property="criticalLogs" />
    28  <hr />
     21 <jsp:getProperty name="logsHelper" property="criticalLogs" /><br>
    2922 <h3>Router logs (<a href="configlogging.jsp">configure</a>):</h3>
    30  <jsp:getProperty name="logsHelper" property="logs" />
    31  <hr />
     23 <jsp:getProperty name="logsHelper" property="logs" /><br>
    3224 <h3>Service (Wrapper) logs:</h3><a name="servicelogs"> </a>
    3325 <jsp:getProperty name="logsHelper" property="serviceLogs" />
    34 </div>
    35 </div>
    36 </body>
    37 </html>
     26</div></div></body></html>
  • apps/routerconsole/jsp/netdb.jsp

    r335d45f r9a18955  
    77<%@include file="css.jsp" %>
    88</head><body>
    9 
    109<%@include file="summary.jsp" %>
    1110 <h1>I2P Network Database Summary</h1>
     
    1918 <jsp:setProperty name="netdbHelper" property="lease" value="<%=request.getParameter("l")%>" />
    2019 <jsp:getProperty name="netdbHelper" property="netDbSummary" />
    21 </div>
    22 </div>
    23 </body>
    24 </html>
     20</div></div></body></html>
  • apps/routerconsole/jsp/oldconsole.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - internals</title>
     5<html><head><title>I2P Router Console - internals</title>
    76<%@include file="css.jsp" %>
    87</head><body>
    9 
    108<%@include file="summary.jsp" %>
    11 
    129<jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="conhelper" scope="request" />
    1310<jsp:setProperty name="conhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
     
    1613<div class="main" id="main">
    1714 <jsp:getProperty name="conhelper" property="console" />
    18 </div>
    19 
    20 </body>
    21 </html>
     15</div></body></html>
  • apps/routerconsole/jsp/oldstats.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - statistics</title>
     5<html><head><title>I2P Router Console - statistics</title>
    76<%@include file="css.jsp" %>
    87</head><body>
    9 
    108<%@include file="summary.jsp" %>
    11 
    129<jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="oldhelper" scope="request" />
    1310<jsp:setProperty name="oldhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
     
    1613<div class="main" id="main">
    1714 <jsp:getProperty name="oldhelper" property="stats" />
    18 </div>
    19 </div>
    20 </body>
    21 </html>
     15</div></body></html>
  • apps/routerconsole/jsp/peers.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - peer connections</title>
     5<html><head><title>I2P Router Console - peer connections</title>
    76<%@include file="css.jsp" %>
    87</head><body>
    9 
    108<%@include file="summary.jsp" %>
    11  <h1>I2P Network Peers</h1>
     9<h1>I2P Network Peers</h1>
    1210<div class="main" id="main">
    1311 <jsp:useBean class="net.i2p.router.web.PeerHelper" id="peerHelper" scope="request" />
     
    1715 <jsp:setProperty name="peerHelper" property="sort" value="<%=request.getParameter("sort") != null ? request.getParameter("sort") : ""%>" />
    1816 <jsp:getProperty name="peerHelper" property="peerSummary" />
    19 </div>
    20 
    21 </body>
    22 </html>
     17</div></body></html>
  • apps/routerconsole/jsp/profiles.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - peer profiles</title>
     5<html><head><title>I2P Router Console - peer profiles</title>
    76<%@include file="css.jsp" %>
    8 </head><body>
    9 
    10 <%@include file="summary.jsp" %>
    11  <h1>I2P Network Peer Profiles</h1>
     7</head><body><%@include file="summary.jsp" %>
     8<h1>I2P Network Peer Profiles</h1>
    129<div class="main" id="main"><div class="wideload">
    1310 <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
    1411 <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    1512 <jsp:getProperty name="profilesHelper" property="profileSummary" />
    16  <hr />
     13 <br>
    1714 <a name="shitlist"> </a>
    1815 <jsp:getProperty name="profilesHelper" property="shitlistSummary" />
    19 </div>
    20 </div>
    21 </body>
    22 </html>
     16</div></div></body></html>
  • apps/routerconsole/jsp/summary.jsp

    r335d45f r9a18955  
    2323        // since we don't have an iframe this will reload the base page, and
    2424        // the new delay will be passed to the iframe above
    25         out.print("<hr /><p><center><form action=\"" + request.getRequestURI() + "\" method=\"GET\">\n");
     25        out.print("<br><p><center><form action=\"" + request.getRequestURI() + "\" method=\"GET\">\n");
    2626        out.print("<b>Refresh (s):</b> <input size=\"3\" type=\"text\" name=\"refresh\" value=\"60\" />\n");
    2727        out.print("<button type=\"submit\">Enable</button>\n");
     
    2929    }
    3030%>
    31 </div>
     31</div></div>
  • apps/routerconsole/jsp/summaryframe.jsp

    r335d45f r9a18955  
    5050    }
    5151%>
    52 </head>
    53 
    54 <body style="margin: 0;">
    55 
    56 <div class="routersummary">
     52</head><body style="margin: 0;"><div class="routersummary">
    5753<%@include file="summarynoframe.jsp" %>
    5854<%
    5955    // d and shutdownSoon defined above
    6056    if (!shutdownSoon) {
    61         out.print("<hr /><p><form action=\"summaryframe.jsp\" method=\"GET\">\n");
     57        out.print("<br><p><form action=\"summaryframe.jsp\" method=\"GET\">\n");
    6258        if ("0".equals(d)) {
    6359            out.print("<b>Refresh (s):<b> <input size=\"3\" type=\"text\" name=\"refresh\" value=\"60\" align=\"right\" />\n");
     
    6864            out.print("<button type=\"submit\">Disable " + d + "s Refresh</button>\n");
    6965        }
    70         out.print("</form></p><hr />\n");
     66        out.print("</form></p><br>\n");
    7167    }
    7268%>
    73 </div>
    74 
    75 </body>
    76 </html>
     69</div></body></html>
  • apps/routerconsole/jsp/summarynoframe.jsp

    r335d45f r9a18955  
    1313<jsp:setProperty name="update" property="*" />
    1414<jsp:setProperty name="update" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    15 <a href="index.jsp" target="_top"><img src="/themes/console/images/i2plogo.png" alt="I2P Router Console" title="I2P Router Console"/></a><hr />
     15<a href="index.jsp" target="_top"><img src="/themes/console/images/i2plogo.png" alt="I2P Router Console" title="I2P Router Console"/></a><hr>
    1616<% java.io.File lpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/toolbar.html");
    1717    // you better have target="_top" for the links in there...
     
    2222<jsp:getProperty name="linkhelper" property="content" />
    2323<% } else { %>
    24 <h3><a href="/configclients.jsp" target="_top" title="Configure startup of clients and webapps (services); manually start dormant services.">I2P Services</a></h3><hr>
    25 <table>
    26 <tr>
    27 <td><a href="susidns/index.jsp" target="_blank" title="Manage your I2P hosts file here (I2P domain name resolution).">Addressbook</a>
     24<h3><a href="/configclients.jsp" target="_top" title="Configure startup of clients and webapps (services); manually start dormant services.">I2P Services</a></h3>
     25<hr><table>
     26<tr><td><a href="susidns/index.jsp" target="_blank" title="Manage your I2P hosts file here (I2P domain name resolution).">Addressbook</a>
    2827<a href="i2psnark/" target="_blank" title="Built-in anonymous BitTorrent Client">Torrents</a>
    29 <a href="susimail/susimail" target="blank" title="Anonymous webmail client.">Webmail</a> 
    30 <a href="http://127.0.0.1:7658/" target="_blank" title="Anonymous resident webserver.">Webserver</a></td>
    31 </tr></table><hr>
    32 <h3><a href="config.jsp" target="_top" title="Configure I2P Router.">I2P Internals</a></h3><hr>
    33 <table><tr>
    34 <td>
    35 <a href="tunnels.jsp" target="_top" title="View existing tunnels and tunnel build status.">Tunnels</a>
    36 <a href="peers.jsp" target="_top" title="Show all current peer connections.">Peers</a>
    37 <a href="profiles.jsp" target="_top" title="Show recent peer performance profiles.">Profiles</a>
    38 <a href="netdb.jsp" target="_top" title="Show list of all known I2P routers.">NetDB</a>
    39 <a href="logs.jsp" target="_top" title="Health Report.">Logs</a>
     28<a href="susimail/susimail" target="blank" title="Anonymous webmail client.">Webmail</a>
     29<a href="http://127.0.0.1:7658/" target="_blank" title="Anonymous resident webserver.">Webserver</a></td></tr></table>
     30<hr><h3><a href="config.jsp" target="_top" title="Configure I2P Router.">I2P Internals</a></h3><hr>
     31<table><tr><td>
     32<a href="tunnels.jsp" target="_top" title="View existing tunnels and tunnel build status.">Tunnels</a>
     33<a href="peers.jsp" target="_top" title="Show all current peer connections.">Peers</a>
     34<a href="profiles.jsp" target="_top" title="Show recent peer performance profiles.">Profiles</a>
     35<a href="netdb.jsp" target="_top" title="Show list of all known I2P routers.">NetDB</a>
     36<a href="logs.jsp" target="_top" title="Health Report.">Logs</a>
    4037<a href="jobs.jsp" target="_top" title="Show the router's workload, and how it's performing.">Jobs</a>
    41 <a href="graphs.jsp" target="_top" title="Graph router performance.">Graphs</a>
    42 <a href="oldstats.jsp" target="_top" title="Textual router performance statistics.">Stats</a>
    43 </td></tr></table>
     38<a href="graphs.jsp" target="_top" title="Graph router performance.">Graphs</a>
     39<a href="oldstats.jsp" target="_top" title="Textual router performance statistics.">Stats</a></td></tr></table>
    4440<% } %>
    45 
    46 <hr>
    47 <h3><a href="help.jsp" target="_top" title="I2P Router Help.">General</a></h3><hr>
    48 <h4>
    49 <a title="Your unique I2P router identity is <jsp:getProperty name="helper" property="ident" />, never reveal it to anyone" href="netdb.jsp?r=." target="_top">Local Identity</a></h4>
    50 <hr>
    51 <table><tr>
    52 <td align="left">
     41<hr><h3><a href="help.jsp" target="_top" title="I2P Router Help.">General</a></h3><hr>
     42<h4><a title="Your unique I2P router identity is <jsp:getProperty name="helper" property="ident" />, never reveal it to anyone" href="netdb.jsp?r=." target="_top">Local Identity</a></h4><hr>
     43<table><tr><td align="left">
    5344<b>Version:</b></td>
    5445<td align="right"><jsp:getProperty name="helper" property="version" /></td></tr>
    5546<tr title="How long we've been running for this session.">
    56 <td align="left">
    57 <b>Uptime:</b></td>
    58 <td align="right"><jsp:getProperty name="helper" property="uptime" /></td></tr></table>
    59 <hr><h4><a href="config.jsp#help" target="_top" title="Help with configuring your firewall and router for optimal I2P performance."><jsp:getProperty name="helper" property="reachability" /></a></h4>
    60 <hr>
     47<td align="left"><b>Uptime:</b></td>
     48<td align="right"><jsp:getProperty name="helper" property="uptime" />
     49</td></tr></table>
     50<hr><h4><a href="config.jsp#help" target="_top" title="Help with configuring your firewall and router for optimal I2P performance."><jsp:getProperty name="helper" property="reachability" /></a></h4><hr>
    6151<%
    6252    if (helper.updateAvailable() || helper.unsignedUpdateAvailable()) {
    6353        // display all the time so we display the final failure message
    64         out.print("<br />" + update.getStatus());
     54        out.print("<br>" + update.getStatus());
    6555        if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress"))) {
    6656        } else if((!update.isDone()) &&
     
    7868                out.print("<button type=\"submit\" name=\"updateAction\" value=\"signed\" >Download " + helper.getUpdateVersion() + " Update</button>\n");
    7969            if (helper.unsignedUpdateAvailable())
    80                 out.print("<button type=\"submit\" name=\"updateAction\" value=\"Unsigned\" >Download Unsigned<br />" + helper.getUnsignedUpdateVersion() + " Update</button>\n");
     70                out.print("<button type=\"submit\" name=\"updateAction\" value=\"Unsigned\" >Download Unsigned<br>" + helper.getUnsignedUpdateVersion() + " Update</button>\n");
    8171            out.print("</form></p>\n");
    8272        }
     
    8575<p>
    8676<%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%>
    87 </p>
    88 <hr />
    89 <h3><a href="peers.jsp" target="_top" title="Show all current peer connections.">Peers</a></h3><hr><table>
     77</p><hr><h3><a href="peers.jsp" target="_top" title="Show all current peer connections.">Peers</a></h3><hr>
     78<table>
    9079<tr><td align="left"><b>Active:</b></td><td align="right"><jsp:getProperty name="helper" property="activePeers" />/<jsp:getProperty name="helper" property="activeProfiles" /></td></tr>
    9180<tr><td align="left"><b>Fast:</b></td><td align="right"><jsp:getProperty name="helper" property="fastPeers" /></td></tr>
    9281<tr><td align="left"><b>High capacity:</b></td><td align="right"><jsp:getProperty name="helper" property="highCapacityPeers" /></td></tr>
    9382<tr><td align="left"><b>Integrated:</b></td><td align="right"><jsp:getProperty name="helper" property="wellIntegratedPeers" /></td></tr>
    94 <tr><td align="left"><b>Known:</b></td><td align="right"><jsp:getProperty name="helper" property="allPeers" /></td></tr></table><hr><%
     83<tr><td align="left"><b>Known:</b></td><td align="right"><jsp:getProperty name="helper" property="allPeers" /></td></tr>
     84</table><hr>
     85<%
    9586    if (helper.getActivePeers() <= 0) {
    9687        %><h4><a href="config.jsp" target="_top" title="Help with firewall configuration.">Check NAT/firewall</a></h4><%
     
    10091        if ("true".equals(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "false"))) {
    10192            // While reseed occurring, show status message instead
    102             out.print("<i>" + System.getProperty("net.i2p.router.web.ReseedHandler.statusMessage","") + "</i><br />");
     93            out.print("<i>" + System.getProperty("net.i2p.router.web.ReseedHandler.statusMessage","") + "</i><br>");
    10394        } else {
    10495            // While no reseed occurring, show reseed link
     
    117108        String reseedErrorMessage = System.getProperty("net.i2p.router.web.ReseedHandler.errorMessage","");
    118109        if (reseedErrorMessage.length() > 0) {
    119             out.print("<i>" + reseedErrorMessage + "</i><br />");
     110            out.print("<i>" + reseedErrorMessage + "</i><br>");
    120111        }
    121112    }
    122  %><hr />
    123 <h3><a href="config.jsp" title="Configure router bandwidth allocation." target="_top">Bandwidth in/out</a></h3><hr>
     113 %>
     114<hr><h3><a href="config.jsp" title="Configure router bandwidth allocation." target="_top">Bandwidth in/out</a></h3><hr>
    124115<table>
    125116<tr><td align="left"><b>1s:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundSecondKBps" />/<jsp:getProperty name="helper" property="outboundSecondKBps" />K/s</td></tr>
     
    127118<tr><td align="left"><b>Total:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundLifetimeKBps" />/<jsp:getProperty name="helper" property="outboundLifetimeKBps" />K/s</td></tr>
    128119<tr><td align="left"><b>Used:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundTransferred" />/<jsp:getProperty name="helper" property="outboundTransferred" /></td></tr></table>
    129 <hr>
    130 <h3><a href="tunnels.jsp" target="_top" title="View existing tunnels and tunnel build status.">Tunnels in/out</a></h3><hr>
    131 <table><tr>
    132 <td align="left"><b>Exploratory:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundTunnels" />/<jsp:getProperty name="helper" property="outboundTunnels" /></td></tr>
     120<hr><h3><a href="tunnels.jsp" target="_top" title="View existing tunnels and tunnel build status.">Tunnels in/out</a></h3><hr>
     121<table>
     122<tr><td align="left"><b>Exploratory:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundTunnels" />/<jsp:getProperty name="helper" property="outboundTunnels" /></td></tr>
    133123<tr><td align="left"><b>Client:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundClientTunnels" />/<jsp:getProperty name="helper" property="outboundClientTunnels" /></td></tr>
    134 <tr><td align="left"><b>Participating:</b></td><td align="right"><jsp:getProperty name="helper" property="participatingTunnels" /></td></tr></table>
    135 <hr>
    136 <h3><a href="/oldstats.jsp#JobQueue" target="_top" title="What's in the router's job queue?">Congestion</a></h3><hr>
    137 <table><tr>
    138 <td align="left"><b>Job lag:</b></td><td align="right"><jsp:getProperty name="helper" property="jobLag" /></td></tr>
     124<tr><td align="left"><b>Participating:</b></td><td align="right"><jsp:getProperty name="helper" property="participatingTunnels" /></td></tr>
     125</table><hr><h3><a href="/oldstats.jsp#JobQueue" target="_top" title="What's in the router's job queue?">Congestion</a></h3><hr>
     126<table>
     127<tr><td align="left"><b>Job lag:</b></td><td align="right"><jsp:getProperty name="helper" property="jobLag" /></td></tr>
    139128<tr><td align="left"><b>Message delay:</b></td><td align="right"><jsp:getProperty name="helper" property="messageDelay" /></td></tr>
    140129<tr><td align="left"><b>Tunnel lag:</b></td><td align="right"><jsp:getProperty name="helper" property="tunnelLag" /></td></tr>
    141 <tr><td align="left"><b>Backlog:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundBacklog" /></td></tr><table  align="center" title="Router tunnel build status.">
    142 <hr><h4><jsp:getProperty name="helper" property="tunnelStatus" /></h4>
    143 <hr>
    144 <jsp:getProperty name="helper" property="destinations" />
     130<tr><td align="left"><b>Backlog:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundBacklog" /></td></tr>
     131</table><hr><table title="Router tunnel build status.">
     132<tr><td align="center"><h4><jsp:getProperty name="helper" property="tunnelStatus" /></h4></td></tr>
     133</table><hr><jsp:getProperty name="helper" property="destinations" />
  • apps/routerconsole/jsp/tunnels.jsp

    r335d45f r9a18955  
    33<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    44
    5 <html><head>
    6 <title>I2P Router Console - tunnel summary</title>
     5<html><head><title>I2P Router Console - tunnel summary</title>
    76<%@include file="css.jsp" %>
    87</head><body>
    9 
    10 <%@include file="summary.jsp" %>
    11  <h1>I2P Tunnel Summary</h1>
     8<%@include file="summary.jsp" %><h1>I2P Tunnel Summary</h1>
    129<div class="main" id="main">
    1310 <jsp:useBean class="net.i2p.router.web.TunnelHelper" id="tunnelHelper" scope="request" />
     
    1512 <jsp:setProperty name="tunnelHelper" property="writer" value="<%=out%>" />
    1613 <jsp:getProperty name="tunnelHelper" property="tunnelSummary" />
    17 </div>
    18 
    19 </body>
    20 </html>
     14</div></body></html>
  • apps/routerconsole/jsp/viewstat.jsp

    r335d45f r9a18955  
    1111  java.io.OutputStream cout = response.getOutputStream();
    1212  response.setContentType("image/png");
    13   rendered = net.i2p.router.web.StatSummarizer.instance().renderPng(cout, templateFile); 
     13  rendered = net.i2p.router.web.StatSummarizer.instance().renderPng(cout, templateFile);
    1414}
    1515net.i2p.stat.Rate rate = null;
     
    2020if ( !rendered && ((rs != null) || fakeBw) ) {
    2121  long per = -1;
    22   try { 
     22  try {
    2323    if (fakeBw)
    2424      per = 60*1000;
    2525    else
    26       per = Long.parseLong(period); 
     26      per = Long.parseLong(period);
    2727    if (!fakeBw)
    2828      rate = rs.getRate(per);
     
    6464  } catch (NumberFormatException nfe) {}
    6565}
    66 if (!rendered) { 
     66if (!rendered) {
    6767  response.sendError(404, "That stat is not available");
    6868}
Note: See TracChangeset for help on using the changeset viewer.