Changeset b8437cd for apps


Ignore:
Timestamp:
Jul 28, 2018 7:03:01 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
9b9f96d
Parents:
63f0355
Message:

Console: Catch ISE in get/setAttribute() (ticket #1529)

Location:
apps/routerconsole/jsp
Files:
51 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/jsp/certs.jsp

    r63f0355 rb8437cd  
    1212<div class="main" id="certs">
    1313<jsp:useBean class="net.i2p.router.web.helpers.CertHelper" id="certhelper" scope="request" />
    14 <jsp:setProperty name="certhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     14<jsp:setProperty name="certhelper" property="contextId" value="<%=i2pcontextId%>" />
    1515<% certhelper.storeWriter(out); %>
    1616<jsp:getProperty name="certhelper" property="summary" />
  • apps/routerconsole/jsp/config.jsp

    r63f0355 rb8437cd  
    1414
    1515<jsp:useBean class="net.i2p.router.web.helpers.ConfigNetHelper" id="nethelper" scope="request" />
    16 <jsp:setProperty name="nethelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     16<jsp:setProperty name="nethelper" property="contextId" value="<%=i2pcontextId%>" />
    1717<h1><%=intl._t("I2P Bandwidth Configuration")%></h1>
    1818<div class="main" id="config_bandwidth">
  • apps/routerconsole/jsp/configadvanced.jsp

    r63f0355 rb8437cd  
    1414
    1515<jsp:useBean class="net.i2p.router.web.helpers.ConfigAdvancedHelper" id="advancedhelper" scope="request" />
    16 <jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     16<jsp:setProperty name="advancedhelper" property="contextId" value="<%=i2pcontextId%>" />
    1717
    1818<h1><%=intl._t("I2P Advanced Configuration")%></h1>
  • apps/routerconsole/jsp/configclients.jsp

    r63f0355 rb8437cd  
    1919
    2020<jsp:useBean class="net.i2p.router.web.helpers.ConfigClientsHelper" id="clientshelper" scope="request" />
    21 <jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     21<jsp:setProperty name="clientshelper" property="contextId" value="<%=i2pcontextId%>" />
    2222<jsp:setProperty name="clientshelper" property="edit" value="<%=request.getParameter(\"edit\")%>" />
    2323<h1><%=intl._t("I2P Client Configuration")%></h1>
  • apps/routerconsole/jsp/configfamily.jsp

    r63f0355 rb8437cd  
    1313
    1414<jsp:useBean class="net.i2p.router.web.helpers.ConfigFamilyHelper" id="familyHelper" scope="request" />
    15 <jsp:setProperty name="familyHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     15<jsp:setProperty name="familyHelper" property="contextId" value="<%=i2pcontextId%>" />
    1616<h1><%=intl._t("I2P Router Family Configuration")%></h1>
    1717<div class="main" id="config_family">
  • apps/routerconsole/jsp/confighome.jsp

    r63f0355 rb8437cd  
    2525<%@include file="formhandler.jsi" %>
    2626<jsp:useBean class="net.i2p.router.web.helpers.HomeHelper" id="homehelper" scope="request" />
    27 <jsp:setProperty name="homehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     27<jsp:setProperty name="homehelper" property="contextId" value="<%=i2pcontextId%>" />
    2828
    2929<h3 class="tabletitle"><%=intl._t("Default Home Page")%></h3>
  • apps/routerconsole/jsp/configi2cp.jsp

    r63f0355 rb8437cd  
    1919
    2020<jsp:useBean class="net.i2p.router.web.helpers.ConfigClientsHelper" id="clientshelper" scope="request" />
    21 <jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     21<jsp:setProperty name="clientshelper" property="contextId" value="<%=i2pcontextId%>" />
    2222<jsp:setProperty name="clientshelper" property="edit" value="<%=request.getParameter(\"edit\")%>" />
    2323<h1><%=intl._t("I2P Client Configuration")%></h1>
  • apps/routerconsole/jsp/configkeyring.jsp

    r63f0355 rb8437cd  
    1818<%@include file="formhandler.jsi" %>
    1919 <jsp:useBean class="net.i2p.router.web.helpers.ConfigKeyringHelper" id="keyringhelper" scope="request" />
    20  <jsp:setProperty name="keyringhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     20 <jsp:setProperty name="keyringhelper" property="contextId" value="<%=i2pcontextId%>" />
    2121<p id="keyringhelp" class="infohelp">
    2222 <%=intl._t("The router keyring is used to decrypt encrypted leaseSets.")%>
  • apps/routerconsole/jsp/configlogging.jsp

    r63f0355 rb8437cd  
    1111</head><body onload="initAjax()">
    1212<jsp:useBean class="net.i2p.router.web.helpers.ConfigLoggingHelper" id="logginghelper" scope="request" />
    13 <jsp:setProperty name="logginghelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     13<jsp:setProperty name="logginghelper" property="contextId" value="<%=i2pcontextId%>" />
    1414
    1515<%@include file="summary.jsi" %>
  • apps/routerconsole/jsp/confignav.jsi

    r63f0355 rb8437cd  
    55%>
    66<jsp:useBean class="net.i2p.router.web.helpers.ConfigNavHelper" id="navHelper" scope="request" />
    7 <jsp:setProperty name="navHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     7<jsp:setProperty name="navHelper" property="contextId" value="<%=i2pcontextId%>" />
    88<% navHelper.storeWriter(out); %>
    99<div class="confignav" id="confignav">
  • apps/routerconsole/jsp/confignet.jsp

    r63f0355 rb8437cd  
    1313
    1414<jsp:useBean class="net.i2p.router.web.helpers.ConfigNetHelper" id="nethelper" scope="request" />
    15 <jsp:setProperty name="nethelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     15<jsp:setProperty name="nethelper" property="contextId" value="<%=i2pcontextId%>" />
    1616<h1><%=intl._t("I2P Network Configuration")%></h1>
    1717<div class="main" id="config_network">
  • apps/routerconsole/jsp/configpeer.jsp

    r63f0355 rb8437cd  
    1515<%@include file="formhandler.jsi" %>
    1616 <jsp:useBean class="net.i2p.router.web.helpers.ConfigPeerHelper" id="peerhelper" scope="request" />
    17  <jsp:setProperty name="peerhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     17 <jsp:setProperty name="peerhelper" property="contextId" value="<%=i2pcontextId%>" />
    1818 <% String peer = "";
    1919    if (request.getParameter("peer") != null)
     
    6464 <a name="banlist"> </a><h3 id="bannedpeers"><%=intl._t("Banned Peers")%></h3>
    6565 <jsp:useBean class="net.i2p.router.web.helpers.ProfilesHelper" id="profilesHelper" scope="request" />
    66  <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     66 <jsp:setProperty name="profilesHelper" property="contextId" value="<%=i2pcontextId%>" />
    6767 <% profilesHelper.storeWriter(out); %>
    6868 <jsp:getProperty name="profilesHelper" property="banlistSummary" />
  • apps/routerconsole/jsp/configplugins.jsp

    r63f0355 rb8437cd  
    1919
    2020<jsp:useBean class="net.i2p.router.web.helpers.ConfigClientsHelper" id="clientshelper" scope="request" />
    21 <jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     21<jsp:setProperty name="clientshelper" property="contextId" value="<%=i2pcontextId%>" />
    2222<jsp:setProperty name="clientshelper" property="edit" value="<%=request.getParameter(\"edit\")%>" />
    2323<h1><%=intl._t("Plugin Configuration")%></h1>
  • apps/routerconsole/jsp/configreseed.jsp

    r63f0355 rb8437cd  
    1313
    1414<jsp:useBean class="net.i2p.router.web.helpers.ConfigReseedHelper" id="reseedHelper" scope="request" />
    15 <jsp:setProperty name="reseedHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     15<jsp:setProperty name="reseedHelper" property="contextId" value="<%=i2pcontextId%>" />
    1616<h1><%=intl._t("I2P Reseeding Configuration")%></h1>
    1717<div class="main" id="config_reseed">
  • apps/routerconsole/jsp/configsidebar.jsp

    r63f0355 rb8437cd  
    2828%>
    2929<jsp:useBean class="net.i2p.router.web.helpers.SummaryHelper" id="summaryhelper" scope="request" />
    30 <jsp:setProperty name="summaryhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     30<jsp:setProperty name="summaryhelper" property="contextId" value="<%=i2pcontextId%>" />
    3131
    3232<h3 class="tabletitle"><%=intl._t("Refresh Interval")%></h3>
  • apps/routerconsole/jsp/configstats.jsp

    r63f0355 rb8437cd  
    7070<%@include file="formhandler.jsi" %>
    7171 <jsp:useBean class="net.i2p.router.web.helpers.ConfigStatsHelper" id="statshelper" scope="request" />
    72  <jsp:setProperty name="statshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     72 <jsp:setProperty name="statshelper" property="contextId" value="<%=i2pcontextId%>" />
    7373 <div class="configure">
    7474 <form id="statsForm" name="statsForm" action="" method="POST">
  • apps/routerconsole/jsp/configtunnels.jsp

    r63f0355 rb8437cd  
    1313
    1414<jsp:useBean class="net.i2p.router.web.helpers.ConfigTunnelsHelper" id="tunnelshelper" scope="request" />
    15 <jsp:setProperty name="tunnelshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     15<jsp:setProperty name="tunnelshelper" property="contextId" value="<%=i2pcontextId%>" />
    1616<h1><%=intl._t("I2P Tunnel Configuration")%></h1>
    1717<div class="main" id="config_tunnels">
  • apps/routerconsole/jsp/configui.jsp

    r63f0355 rb8437cd  
    2121
    2222<jsp:useBean class="net.i2p.router.web.helpers.ConfigUIHelper" id="uihelper" scope="request" />
    23 <jsp:setProperty name="uihelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     23<jsp:setProperty name="uihelper" property="contextId" value="<%=i2pcontextId%>" />
    2424
    2525<h1><%=uihelper._t("I2P UI Configuration")%></h1>
  • apps/routerconsole/jsp/configupdate.jsp

    r63f0355 rb8437cd  
    1919<%@include file="formhandler.jsi" %>
    2020 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
    21  <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     21 <jsp:setProperty name="updatehelper" property="contextId" value="<%=i2pcontextId%>" />
    2222<div class="messages">
    2323 <jsp:getProperty name="updatehelper" property="newsStatus" /></div>
  • apps/routerconsole/jsp/configwebapps.jsp

    r63f0355 rb8437cd  
    1919
    2020<jsp:useBean class="net.i2p.router.web.helpers.ConfigClientsHelper" id="clientshelper" scope="request" />
    21 <jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     21<jsp:setProperty name="clientshelper" property="contextId" value="<%=i2pcontextId%>" />
    2222<jsp:setProperty name="clientshelper" property="edit" value="<%=request.getParameter(\"edit\")%>" />
    2323<h1><%=intl._t("WebApp Configuration")%></h1>
  • apps/routerconsole/jsp/console.jsp

    r63f0355 rb8437cd  
    2727%>
    2828 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
    29  <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     29 <jsp:setProperty name="updatehelper" property="contextId" value="<%=i2pcontextId%>" />
    3030 <jsp:getProperty name="updatehelper" property="newsStatus" /><br>
    3131</div><div class="main" id="console">
     
    7373 <jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
    7474 <jsp:setProperty name="contenthelper" property="maxLines" value="300" />
    75  <jsp:setProperty name="contenthelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     75 <jsp:setProperty name="contenthelper" property="contextId" value="<%=i2pcontextId%>" />
    7676 <jsp:getProperty name="contenthelper" property="content" />
    7777</div></body></html>
  • apps/routerconsole/jsp/createreseed.jsp

    r63f0355 rb8437cd  
    1 <jsp:useBean class="net.i2p.router.web.helpers.ReseedGenerator" id="gen" scope="request" /><jsp:setProperty name="gen" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /><%
     1<%
     2   String i2pcontextId = null;
     3   try {
     4       i2pcontextId = (String) session.getAttribute("i2p.contextId");
     5   } catch (IllegalStateException ise) {}
     6%><jsp:useBean class="net.i2p.router.web.helpers.ReseedGenerator" id="gen" scope="request" /><jsp:setProperty name="gen" property="contextId" value="<%=i2pcontextId%>" /><%
    27/*
    38 * USE CAUTION WHEN EDITING
  • apps/routerconsole/jsp/css.jsi

    r63f0355 rb8437cd  
    2121   // near the top
    2222
    23    if (request.getParameter("i2p.contextId") != null) {
    24        session.setAttribute("i2p.contextId", request.getParameter("i2p.contextId"));
    25    }
     23   String i2pcontextId = request.getParameter("i2p.contextId");
     24   try {
     25       if (i2pcontextId != null) {
     26           session.setAttribute("i2p.contextId", i2pcontextId);
     27       } else {
     28           i2pcontextId = (String) session.getAttribute("i2p.contextId");
     29       }
     30   } catch (IllegalStateException ise) {}
    2631%>
    2732<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    2833<jsp:useBean class="net.i2p.router.web.CSSHelper" id="intl" scope="request" />
    29 <jsp:setProperty name="intl" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     34<jsp:setProperty name="intl" property="contextId" value="<%=i2pcontextId%>" />
    3035<link rel="icon" href="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/favicon.ico">
    3136<%
  • apps/routerconsole/jsp/dns.jsp

    r63f0355 rb8437cd  
    33<%@page pageEncoding="UTF-8"%>
    44<jsp:useBean class="net.i2p.router.web.CSSHelper" id="tester" scope="request" />
    5 <jsp:setProperty name="tester" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     5<%
     6   String i2pcontextId1 = null;
     7   try {
     8       i2pcontextId1 = (String) session.getAttribute("i2p.contextId");
     9   } catch (IllegalStateException ise) {}
     10%>
     11<jsp:setProperty name="tester" property="contextId" value="<%=i2pcontextId1%>" />
    612<%
    713    // CSSHelper is also pulled in by css.jsi below...
  • apps/routerconsole/jsp/dumpprofile.jsp

    r63f0355 rb8437cd  
    11<%@page contentType="text/plain"
    22%><jsp:useBean id="helper" class="net.i2p.router.web.helpers.StatHelper"
    3 /><jsp:setProperty name="helper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>"
     3/><%
     4   String i2pcontextId = null;
     5   try {
     6       i2pcontextId = (String) session.getAttribute("i2pcontextId");
     7   } catch (IllegalStateException ise) {}
     8%><jsp:setProperty name="helper" property="contextId" value="<%=i2pcontextId%>"
    49/><jsp:setProperty name="helper" property="peer" value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter(\"peer\"))%>"
    510/><% helper.storeWriter(out);
  • apps/routerconsole/jsp/error500.jsp

    r63f0355 rb8437cd  
    6666<b>Java version:</b> <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)<br>
    6767 <jsp:useBean class="net.i2p.router.web.helpers.LogsHelper" id="logsHelper" scope="request" />
    68  <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     68 <jsp:setProperty name="logsHelper" property="contextId" value="<%=i2pcontextId%>" />
    6969<jsp:getProperty name="logsHelper" property="unavailableCrypto" />
    7070<b>Wrapper version:</b> <%=System.getProperty("wrapper.version", "none")%><br>
  • apps/routerconsole/jsp/events.jsp

    r63f0355 rb8437cd  
    88<%=intl.title("events")%>
    99 <jsp:useBean class="net.i2p.router.web.helpers.EventLogHelper" id="eventHelper" scope="request" />
    10  <jsp:setProperty name="eventHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     10 <jsp:setProperty name="eventHelper" property="contextId" value="<%=i2pcontextId%>" />
    1111<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %>
    1212 <jsp:setProperty name="eventHelper" property="*" />
  • apps/routerconsole/jsp/formhandler.jsi

    r63f0355 rb8437cd  
    1111
    1212    // This initializes the RouterContext - must be the first thing
    13     formhandler.setContextId((String)session.getAttribute("i2p.contextId"));
     13    // i2pcontextId set in css.jsi
     14    formhandler.setContextId(i2pcontextId);
    1415
    1516    // Prevents any saves via GET
  • apps/routerconsole/jsp/graph.jsp

    r63f0355 rb8437cd  
    77<%=intl.title("graphs")%>
    88 <jsp:useBean class="net.i2p.router.web.helpers.GraphHelper" id="graphHelper" scope="request" />
    9  <jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     9 <jsp:setProperty name="graphHelper" property="contextId" value="<%=i2pcontextId%>" />
    1010<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %>
    1111 <jsp:setProperty name="graphHelper" property="*" />
  • apps/routerconsole/jsp/graphs.jsp

    r63f0355 rb8437cd  
    88<%=intl.title("graphs")%>
    99 <jsp:useBean class="net.i2p.router.web.helpers.GraphHelper" id="graphHelper" scope="request" />
    10  <jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     10 <jsp:setProperty name="graphHelper" property="contextId" value="<%=i2pcontextId%>" />
    1111<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %>
    1212 <jsp:setProperty name="graphHelper" property="*" />
  • apps/routerconsole/jsp/home.jsp

    r63f0355 rb8437cd  
    1212%>
    1313<jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
    14 <jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     14<jsp:setProperty name="newshelper" property="contextId" value="<%=i2pcontextId%>" />
    1515<%
    1616    java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml");
     
    1919 <jsp:setProperty name="newshelper" property="maxLines" value="300" />
    2020 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
    21  <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     21 <jsp:setProperty name="updatehelper" property="contextId" value="<%=i2pcontextId%>" />
    2222
    2323<div class="routersummaryouter">
     
    5656<div class="main" id="home">
    5757<jsp:useBean class="net.i2p.router.web.helpers.HomeHelper" id="homehelper" scope="request" />
    58 <jsp:setProperty name="homehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     58<jsp:setProperty name="homehelper" property="contextId" value="<%=i2pcontextId%>" />
    5959<% if (homehelper.shouldShowWelcome()) { %>
    6060<div class="welcome" title="<%=intl._t("Click a flag to select a language. Click 'Configure UI' below to change it later.")%>">
     
    110110      </td><td align="left">
    111111        <jsp:useBean class="net.i2p.router.web.helpers.SearchHelper" id="searchhelper" scope="request" />
    112         <jsp:setProperty name="searchhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     112        <jsp:setProperty name="searchhelper" property="contextId" value="<%=i2pcontextId%>" />
    113113        <jsp:getProperty name="searchhelper" property="selector" />
    114114      </td></tr></table>
  • apps/routerconsole/jsp/i2ptunnelmgr.jsp

    r63f0355 rb8437cd  
    33<%@page pageEncoding="UTF-8"%>
    44<jsp:useBean class="net.i2p.router.web.CSSHelper" id="tester" scope="request" />
    5 <jsp:setProperty name="tester" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     5<%
     6   String i2pcontextId1 = null;
     7   try {
     8       i2pcontextId1 = (String) session.getAttribute("i2p.contextId");
     9   } catch (IllegalStateException ise) {}
     10%>
     11<jsp:setProperty name="tester" property="contextId" value="<%=i2pcontextId1%>" />
    612<%
    713    // CSSHelper is also pulled in by css.jsi below...
  • apps/routerconsole/jsp/jars.jsp

    r63f0355 rb8437cd  
    1212<div class="main" id="jardump">
    1313<jsp:useBean class="net.i2p.router.web.helpers.FileDumpHelper" id="dumpHelper" scope="request" />
    14 <jsp:setProperty name="dumpHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     14<jsp:setProperty name="dumpHelper" property="contextId" value="<%=i2pcontextId%>" />
    1515<jsp:getProperty name="dumpHelper" property="fileSummary" />
    1616</div></body></html>
  • apps/routerconsole/jsp/jobs.jsp

    r63f0355 rb8437cd  
    1313<div class="main" id="jobs">
    1414 <jsp:useBean class="net.i2p.router.web.helpers.JobQueueHelper" id="jobQueueHelper" scope="request" />
    15  <jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     15 <jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=i2pcontextId%>" />
    1616 <% jobQueueHelper.storeWriter(out); %>
    1717 <jsp:getProperty name="jobQueueHelper" property="jobQueueSummary" />
  • apps/routerconsole/jsp/logs.jsp

    r63f0355 rb8437cd  
    2929<tr><td><b>Java version:</b></td><td><%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)</td></tr>
    3030 <jsp:useBean class="net.i2p.router.web.helpers.LogsHelper" id="logsHelper" scope="request" />
    31  <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     31 <jsp:setProperty name="logsHelper" property="contextId" value="<%=i2pcontextId%>" />
    3232<jsp:getProperty name="logsHelper" property="unavailableCrypto" />
    3333<tr><td><b>Wrapper version:</b></td><td><%=System.getProperty("wrapper.version", "none")%></td></tr>
  • apps/routerconsole/jsp/netdb.jsp

    r63f0355 rb8437cd  
    1414<div class="main" id="netdb">
    1515 <jsp:useBean class="net.i2p.router.web.helpers.NetDbHelper" id="netdbHelper" scope="request" />
    16  <jsp:setProperty name="netdbHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     16 <jsp:setProperty name="netdbHelper" property="contextId" value="<%=i2pcontextId%>" />
    1717<%
    1818    netdbHelper.storeWriter(out);
  • apps/routerconsole/jsp/news.jsp

    r63f0355 rb8437cd  
    1313<div class="main" id="news">
    1414<jsp:useBean class="net.i2p.router.web.NewsFeedHelper" id="feedHelper" scope="request" />
    15 <jsp:setProperty name="feedHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     15<jsp:setProperty name="feedHelper" property="contextId" value="<%=i2pcontextId%>" />
    1616<% feedHelper.setLimit(0); %>
    1717<div id="newspage">
  • apps/routerconsole/jsp/oldconsole.jsp

    r63f0355 rb8437cd  
    1515<%@include file="summary.jsi" %>
    1616<jsp:useBean class="net.i2p.router.web.helpers.OldConsoleHelper" id="conhelper" scope="request" />
    17 <jsp:setProperty name="conhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     17<jsp:setProperty name="conhelper" property="contextId" value="<%=i2pcontextId%>" />
    1818<% conhelper.storeWriter(out); %>
    1919 <h1>I2P Router &raquo; Old Console</h1>
  • apps/routerconsole/jsp/peers.jsp

    r63f0355 rb8437cd  
    1414<div class="main" id="peers">
    1515 <jsp:useBean class="net.i2p.router.web.helpers.PeerHelper" id="peerHelper" scope="request" />
    16  <jsp:setProperty name="peerHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     16 <jsp:setProperty name="peerHelper" property="contextId" value="<%=i2pcontextId%>" />
    1717 <% peerHelper.storeWriter(out); %>
    1818 <jsp:setProperty name="peerHelper" property="urlBase" value="peers.jsp" />
  • apps/routerconsole/jsp/profiles.jsp

    r63f0355 rb8437cd  
    1414<div class="main" id="profiles"><div class="wideload">
    1515 <jsp:useBean class="net.i2p.router.web.helpers.ProfilesHelper" id="profilesHelper" scope="request" />
    16  <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     16 <jsp:setProperty name="profilesHelper" property="contextId" value="<%=i2pcontextId%>" />
    1717<%
    1818    profilesHelper.storeWriter(out);
  • apps/routerconsole/jsp/proof.jsp

    r63f0355 rb8437cd  
    1212<div class="main" id="proof"><p>
    1313<jsp:useBean class="net.i2p.router.web.helpers.ProofHelper" id="proofHelper" scope="request" />
    14 <jsp:setProperty name="proofHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     14<jsp:setProperty name="proofHelper" property="contextId" value="<%=i2pcontextId%>" />
    1515<textarea cols="70" rows="15" wrap="off" readonly="readonly" spellcheck="false"><jsp:getProperty name="proofHelper" property="proof" /></textarea>
    1616</p></div></body></html>
  • apps/routerconsole/jsp/search.jsp

    r63f0355 rb8437cd  
    55   if (request.getCharacterEncoding() == null)
    66       request.setCharacterEncoding("UTF-8");
     7   String i2pcontextId = null;
     8   try {
     9       i2pcontextId = (String) session.getAttribute("i2p.contextId");
     10   } catch (IllegalStateException ise) {}
    711%>
    812<jsp:useBean class="net.i2p.router.web.helpers.SearchHelper" id="searchhelper" scope="request" />
    9 <jsp:setProperty name="searchhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     13<jsp:setProperty name="searchhelper" property="contextId" value="<%=i2pcontextId%>" />
    1014<jsp:setProperty name="searchhelper" property="engine" value="<%=request.getParameter(\"engine\")%>" />
    1115<jsp:setProperty name="searchhelper" property="query" value="<%=request.getParameter(\"query\")%>" />
  • apps/routerconsole/jsp/stats.jsp

    r63f0355 rb8437cd  
    1212<%@include file="summary.jsi" %>
    1313<jsp:useBean class="net.i2p.router.web.helpers.OldConsoleHelper" id="oldhelper" scope="request" />
    14 <jsp:setProperty name="oldhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     14<jsp:setProperty name="oldhelper" property="contextId" value="<%=i2pcontextId%>" />
    1515<% oldhelper.storeWriter(out); %>
    1616<jsp:setProperty name="oldhelper" property="full" value="<%=request.getParameter(\"f\")%>" />
  • apps/routerconsole/jsp/summary.jsi

    r63f0355 rb8437cd  
    11<jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
    2 <jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     2<jsp:setProperty name="newshelper" property="contextId" value="<%=i2pcontextId%>" />
    33<%
    44    java.io.File newspath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml");
  • apps/routerconsole/jsp/summaryframe.jsp

    r63f0355 rb8437cd  
    5656</head><body style="margin: 0;"><div class="routersummary">
    5757<jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
    58 <jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     58<jsp:setProperty name="newshelper" property="contextId" value="<%=i2pcontextId%>" />
    5959<%
    6060    java.io.File newspath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml");
  • apps/routerconsole/jsp/torrents.jsp

    r63f0355 rb8437cd  
    33<%@page pageEncoding="UTF-8"%>
    44<jsp:useBean class="net.i2p.router.web.CSSHelper" id="tester" scope="request" />
    5 <jsp:setProperty name="tester" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     5<%
     6   String i2pcontextId1 = null;
     7   try {
     8       i2pcontextId1 = (String) session.getAttribute("i2p.contextId");
     9   } catch (IllegalStateException ise) {}
     10%>
     11<jsp:setProperty name="tester" property="contextId" value="<%=i2pcontextId1%>" />
    612<%
    713    // CSSHelper is also pulled in by css.jsi below...
  • apps/routerconsole/jsp/tunnels.jsp

    r63f0355 rb8437cd  
    1313<div class="main" id="tunnels">
    1414 <jsp:useBean class="net.i2p.router.web.helpers.TunnelHelper" id="tunnelHelper" scope="request" />
    15  <jsp:setProperty name="tunnelHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     15 <jsp:setProperty name="tunnelHelper" property="contextId" value="<%=i2pcontextId%>" />
    1616 <% tunnelHelper.storeWriter(out); %>
    1717 <jsp:getProperty name="tunnelHelper" property="tunnelSummary" />
  • apps/routerconsole/jsp/viewprofile.jsp

    r63f0355 rb8437cd  
    2222%>
    2323<jsp:useBean id="stathelper" class="net.i2p.router.web.helpers.StatHelper" />
    24 <jsp:setProperty name="stathelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     24<jsp:setProperty name="stathelper" property="contextId" value="<%=i2pcontextId%>" />
    2525<jsp:setProperty name="stathelper" property="peer" value="<%=peerB64%>" />
    2626<% stathelper.storeWriter(out); %>
  • apps/routerconsole/jsp/webmail.jsp

    r63f0355 rb8437cd  
    33<%@page pageEncoding="UTF-8"%>
    44<jsp:useBean class="net.i2p.router.web.CSSHelper" id="tester" scope="request" />
    5 <jsp:setProperty name="tester" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     5<%
     6   String i2pcontextId1 = null;
     7   try {
     8       i2pcontextId1 = (String) session.getAttribute("i2p.contextId");
     9   } catch (IllegalStateException ise) {}
     10%>
     11<jsp:setProperty name="tester" property="contextId" value="<%=i2pcontextId1%>" />
    612<%
    713    // CSSHelper is also pulled in by css.jsi below...
  • apps/routerconsole/jsp/xhr1.jsi

    r63f0355 rb8437cd  
    77%>
    88<jsp:useBean class="net.i2p.router.web.helpers.SummaryHelper" id="helper" scope="request" />
    9 <jsp:setProperty name="helper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     9<jsp:setProperty name="helper" property="contextId" value="<%=i2pcontextId%>" />
    1010<jsp:setProperty name="helper" property="action" value="<%=request.getParameter(\"action\")%>" />
    1111<jsp:setProperty name="helper" property="updateNonce" value="<%=request.getParameter(\"updateNonce\")%>" />
     
    3535<jsp:useBean class="net.i2p.router.web.UpdateHandler" id="update" scope="request" />
    3636<jsp:setProperty name="update" property="*" />
    37 <jsp:setProperty name="update" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     37<jsp:setProperty name="update" property="contextId" value="<%=i2pcontextId%>" />
    3838<%
    3939    // moved to java for ease of translation
  • apps/routerconsole/jsp/xhr1.jsp

    r63f0355 rb8437cd  
    66       request.setCharacterEncoding("UTF-8");
    77
    8    if (request.getParameter("i2p.contextId") != null) {
    9        session.setAttribute("i2p.contextId", request.getParameter("i2p.contextId"));
    10    }
     8   String i2pcontextId = request.getParameter("i2p.contextId");
     9   try {
     10       if (i2pcontextId != null) {
     11           session.setAttribute("i2p.contextId", i2pcontextId);
     12       } else {
     13           i2pcontextId = (String) session.getAttribute("i2p.contextId");
     14       }
     15   } catch (IllegalStateException ise) {}
    1116   response.setHeader("X-Content-Type-Options", "nosniff");
    1217%>
    1318<jsp:useBean class="net.i2p.router.web.CSSHelper" id="intl" scope="request" />
    14 <jsp:setProperty name="intl" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     19<jsp:setProperty name="intl" property="contextId" value="<%=i2pcontextId%>" />
    1520<jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
    16 <jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     21<jsp:setProperty name="newshelper" property="contextId" value="<%=i2pcontextId%>" />
    1722<%
    1823    java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml");
Note: See TracChangeset for help on using the changeset viewer.