From cd6376e368b9559e12c57ed7fcad051cad1be212 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Mon, 6 May 2013 13:14:44 +0000 Subject: [PATCH] remove DOS line endings in jsps --- apps/routerconsole/jsp/configadvanced.jsp | 72 ++--- apps/routerconsole/jsp/configlogging.jsp | 106 ++++---- apps/routerconsole/jsp/configstats.jsp | 304 +++++++++++----------- apps/routerconsole/jsp/graphs.jsp | 66 ++--- 4 files changed, 274 insertions(+), 274 deletions(-) diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index d8a19e3505..76a79c6928 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -1,36 +1,36 @@ -<%@page contentType="text/html"%> -<%@page trimDirectiveWhitespaces="true"%> -<%@page pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> - -<html><head> -<%@include file="css.jsi" %> -<%=intl.title("config advanced")%> -<script src="/js/ajax.js" type="text/javascript"></script> -<%@include file="summaryajax.jsi" %> -</head><body onload="initAjax()"> - -<%@include file="summary.jsi" %> - -<jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" /> -<jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> - -<h1><%=intl._("I2P Advanced Configuration")%></h1> -<div class="main" id="main"> - - <%@include file="confignav.jsi" %> - - <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" /> -<%@include file="formhandler.jsi" %> - <div class="configure"> - <div class="wideload"> - <form action="" method="POST"> - <input type="hidden" name="nonce" value="<%=pageNonce%>" > - <input type="hidden" name="action" value="blah" > - <h3><%=intl._("Advanced I2P Configuration")%></h3> - <textarea rows="32" cols="60" name="config" wrap="off" spellcheck="false"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br><hr> - <div class="formaction"> - <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" > - <input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" > - <br><b><%=intl._("NOTE")%>:</b> <%=intl._("Some changes may require a restart to take effect.")%> - </div></form></div></div></div></body></html> +<%@page contentType="text/html"%> +<%@page trimDirectiveWhitespaces="true"%> +<%@page pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<html><head> +<%@include file="css.jsi" %> +<%=intl.title("config advanced")%> +<script src="/js/ajax.js" type="text/javascript"></script> +<%@include file="summaryajax.jsi" %> +</head><body onload="initAjax()"> + +<%@include file="summary.jsi" %> + +<jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" /> +<jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> + +<h1><%=intl._("I2P Advanced Configuration")%></h1> +<div class="main" id="main"> + + <%@include file="confignav.jsi" %> + + <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" /> +<%@include file="formhandler.jsi" %> + <div class="configure"> + <div class="wideload"> + <form action="" method="POST"> + <input type="hidden" name="nonce" value="<%=pageNonce%>" > + <input type="hidden" name="action" value="blah" > + <h3><%=intl._("Advanced I2P Configuration")%></h3> + <textarea rows="32" cols="60" name="config" wrap="off" spellcheck="false"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br><hr> + <div class="formaction"> + <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" > + <input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" > + <br><b><%=intl._("NOTE")%>:</b> <%=intl._("Some changes may require a restart to take effect.")%> + </div></form></div></div></div></body></html> diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index 837ed81b8a..21cfb1750c 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -1,53 +1,53 @@ -<%@page contentType="text/html"%> -<%@page trimDirectiveWhitespaces="true"%> -<%@page pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> - -<html><head> -<%@include file="css.jsi" %> -<%=intl.title("config logging")%> -<script src="/js/ajax.js" type="text/javascript"></script> -<%@include file="summaryajax.jsi" %> -</head><body onload="initAjax()"> -<jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" /> -<jsp:setProperty name="logginghelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> - -<%@include file="summary.jsi" %> -<h1><%=intl._("I2P Logging Configuration")%></h1> -<div class="main" id="main"> - <%@include file="confignav.jsi" %> - - <jsp:useBean class="net.i2p.router.web.ConfigLoggingHandler" id="formhandler" scope="request" /> -<%@include file="formhandler.jsi" %> -<div class="configure"> - <form action="" method="POST"> - <input type="hidden" name="nonce" value="<%=pageNonce%>" > - <input type="hidden" name="action" value="blah" > - <h3><%=intl._("Configure I2P Logging Options")%></h3> - <div class="wideload"> - <table border="0" cellspacing="5"> - <tr><td class="mediumtags" align="right"><b><%=intl._("Log file")%>:</b></td> - <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" > - <br> <i><%=intl._("(the symbol '@' will be replaced during log rotation)")%></i></td> - </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log record format")%>:</b></td> - <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" > - <br> <i><%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%> - </i></td> - </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log date format")%>:</b></td> - <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" > - <br> <i><%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%> - </i></td> - </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Max log file size")%>:</b></td> - <td><input type="text" name="logfilesize" size="10" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" ><br></td> - </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Default log level")%>:</b></td> - <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /><br><i><%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%> - </i></td> - </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log level overrides")%>:</b></td> - <td><jsp:getProperty name="logginghelper" property="logLevelTable" /></td> - </tr><tr><td class="mediumtags" align="right"><b><%=intl._("New override")%>:</b></td> - <td><jsp:getProperty name="logginghelper" property="newClassBox" /></td> - </tr><tr><td colspan="2"><hr></td> - </tr><tr class="tablefooter"><td colspan="2"> <div class="formaction"> - <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" > - <input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" > -</div></td></tr></table></div></form></div></div></body></html> +<%@page contentType="text/html"%> +<%@page trimDirectiveWhitespaces="true"%> +<%@page pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<html><head> +<%@include file="css.jsi" %> +<%=intl.title("config logging")%> +<script src="/js/ajax.js" type="text/javascript"></script> +<%@include file="summaryajax.jsi" %> +</head><body onload="initAjax()"> +<jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" /> +<jsp:setProperty name="logginghelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> + +<%@include file="summary.jsi" %> +<h1><%=intl._("I2P Logging Configuration")%></h1> +<div class="main" id="main"> + <%@include file="confignav.jsi" %> + + <jsp:useBean class="net.i2p.router.web.ConfigLoggingHandler" id="formhandler" scope="request" /> +<%@include file="formhandler.jsi" %> +<div class="configure"> + <form action="" method="POST"> + <input type="hidden" name="nonce" value="<%=pageNonce%>" > + <input type="hidden" name="action" value="blah" > + <h3><%=intl._("Configure I2P Logging Options")%></h3> + <div class="wideload"> + <table border="0" cellspacing="5"> + <tr><td class="mediumtags" align="right"><b><%=intl._("Log file")%>:</b></td> + <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" > + <br> <i><%=intl._("(the symbol '@' will be replaced during log rotation)")%></i></td> + </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log record format")%>:</b></td> + <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" > + <br> <i><%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%> + </i></td> + </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log date format")%>:</b></td> + <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" > + <br> <i><%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%> + </i></td> + </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Max log file size")%>:</b></td> + <td><input type="text" name="logfilesize" size="10" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" ><br></td> + </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Default log level")%>:</b></td> + <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /><br><i><%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%> + </i></td> + </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log level overrides")%>:</b></td> + <td><jsp:getProperty name="logginghelper" property="logLevelTable" /></td> + </tr><tr><td class="mediumtags" align="right"><b><%=intl._("New override")%>:</b></td> + <td><jsp:getProperty name="logginghelper" property="newClassBox" /></td> + </tr><tr><td colspan="2"><hr></td> + </tr><tr class="tablefooter"><td colspan="2"> <div class="formaction"> + <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" > + <input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" > +</div></td></tr></table></div></form></div></div></body></html> diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index c57479b46e..4100a4b1e2 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -1,152 +1,152 @@ -<%@page contentType="text/html"%> -<%@page trimDirectiveWhitespaces="true"%> -<%@page pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> - -<html><head> -<%@include file="css.jsi" %> -<%=intl.title("config stats")%> -<script src="/js/ajax.js" type="text/javascript"></script> -<%@include file="summaryajax.jsi" %> -<script type="text/javascript"> -function init() -{ - checkAll = false; - initAjax(); -} -function toggleAll(category) -{ - var inputs = document.getElementsByTagName("input"); - for(index = 0; index < inputs.length; index++) - { - var classes = inputs[index].className.split(' '); - for (var idx = 0; idx < classes.length; idx++) - { - if(classes[idx] == category) - { - if(inputs[index].checked == 0) - { - inputs[index].checked = 1; - } - else if(inputs[index].checked == 1) - { - inputs[index].checked = 0; - } - } - } - if(category == '*') - { - if (checkAll == false) - { - inputs[index].checked = 1; - } - else if (checkAll == true) - { - inputs[index].checked = 0; - } - } - } - if(category == '*') - { - if (checkAll == false) - { - checkAll = true; - } - else if (checkAll == true) - { - checkAll = false; - } - } -} -</script> -</head><body onLoad="init();"> -<%@include file="summary.jsi" %> -<h1><%=intl._("I2P Stats Configuration")%></h1> -<div class="main" id="main"> - <%@include file="confignav.jsi" %> - - <jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" /> -<%@include file="formhandler.jsi" %> - <jsp:useBean class="net.i2p.router.web.ConfigStatsHelper" id="statshelper" scope="request" /> - <jsp:setProperty name="statshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> - <div class="configure"> - <form id="statsForm" name="statsForm" action="" method="POST"> - <input type="hidden" name="action" value="foo" > - <input type="hidden" name="nonce" value="<%=pageNonce%>" > - <h3><%=intl._("Configure I2P Stat Collection")%></h3> - <p><%=intl._("Enable full stats?")%> - <input type="checkbox" class="optbox" name="isFull" value="true" <% - if (statshelper.getIsFull()) { %>checked="checked" <% } %> > - (<%=intl._("change requires restart to take effect")%>)<br> -<% - - // stats.log for devs only and grows without bounds, not recommended - boolean shouldShowLog = statshelper.shouldShowLog(); - if (shouldShowLog) { - -%><%=intl._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" ><br> -Warning - Log with care, stat file grows without limit.<br> -<% - - } // shouldShowLog - -%><%=intl._("Filter")%>: (<a href="javascript:void(null);" onclick="toggleAll('*')"><%=intl._("toggle all")%></a>)<br></p> - <div class="wideload"> - <table> - <% while (statshelper.hasMoreStats()) { - while (statshelper.groupRequired()) { %> - <tr class="tablefooter"> - <td align="left" colspan="3" id=<%=statshelper.getCurrentGroupName()%>> - <b><%=intl._(statshelper.getCurrentGroupName())%></b> - (<a href="javascript:void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')"><%=intl._("toggle all")%></a>) - </td></tr> - <tr class="tablefooter"> -<% - - if (shouldShowLog) { - -%> <td align="center"><b><%=intl._("Log")%></b></td> -<% - - } // shouldShowLog - -%> <td align="center"><b><%=intl._("Graph")%></b></td> - <td></td></tr> - <% - } // end iterating over required groups for the current stat %> - <tr> -<% - - if (shouldShowLog) { - -%> <td align="center"> - <a name="<%=statshelper.getCurrentStatName()%>"></a> - <input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="statList" value="<%=statshelper.getCurrentStatName()%>" <% - if (statshelper.getCurrentIsLogged()) { %>checked="checked" <% } %> ></td> -<% - - } // shouldShowLog - -%> <td align="center"> - <% if (statshelper.getCurrentCanBeGraphed()) { %> - <input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <% - if (statshelper.getCurrentIsGraphed()) { %>checked="checked" <% } %> ><% } %></td> - <td align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br> - <%=statshelper.getCurrentStatDescription()%></td></tr><% - } // end iterating over all stats - - if (shouldShowLog) { - -%> <tr><td colspan="3"></td></tr> - <tr><td align="center"><input type="checkbox" class="optbox" name="explicitFilter" ></td> - <td colspan="2"><%=intl._("Advanced filter")%>: - <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" ></td></tr> -<% - - } // shouldShowLog - -%> <tr class="tablefooter"><td colspan="3" align="right"> -<input type="reset" class="cancel" value="<%=intl._("Cancel")%>" > -<input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" > -</td></tr> -</table></div></form></div></div></body></html> +<%@page contentType="text/html"%> +<%@page trimDirectiveWhitespaces="true"%> +<%@page pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<html><head> +<%@include file="css.jsi" %> +<%=intl.title("config stats")%> +<script src="/js/ajax.js" type="text/javascript"></script> +<%@include file="summaryajax.jsi" %> +<script type="text/javascript"> +function init() +{ + checkAll = false; + initAjax(); +} +function toggleAll(category) +{ + var inputs = document.getElementsByTagName("input"); + for(index = 0; index < inputs.length; index++) + { + var classes = inputs[index].className.split(' '); + for (var idx = 0; idx < classes.length; idx++) + { + if(classes[idx] == category) + { + if(inputs[index].checked == 0) + { + inputs[index].checked = 1; + } + else if(inputs[index].checked == 1) + { + inputs[index].checked = 0; + } + } + } + if(category == '*') + { + if (checkAll == false) + { + inputs[index].checked = 1; + } + else if (checkAll == true) + { + inputs[index].checked = 0; + } + } + } + if(category == '*') + { + if (checkAll == false) + { + checkAll = true; + } + else if (checkAll == true) + { + checkAll = false; + } + } +} +</script> +</head><body onLoad="init();"> +<%@include file="summary.jsi" %> +<h1><%=intl._("I2P Stats Configuration")%></h1> +<div class="main" id="main"> + <%@include file="confignav.jsi" %> + + <jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" /> +<%@include file="formhandler.jsi" %> + <jsp:useBean class="net.i2p.router.web.ConfigStatsHelper" id="statshelper" scope="request" /> + <jsp:setProperty name="statshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> + <div class="configure"> + <form id="statsForm" name="statsForm" action="" method="POST"> + <input type="hidden" name="action" value="foo" > + <input type="hidden" name="nonce" value="<%=pageNonce%>" > + <h3><%=intl._("Configure I2P Stat Collection")%></h3> + <p><%=intl._("Enable full stats?")%> + <input type="checkbox" class="optbox" name="isFull" value="true" <% + if (statshelper.getIsFull()) { %>checked="checked" <% } %> > + (<%=intl._("change requires restart to take effect")%>)<br> +<% + + // stats.log for devs only and grows without bounds, not recommended + boolean shouldShowLog = statshelper.shouldShowLog(); + if (shouldShowLog) { + +%><%=intl._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" ><br> +Warning - Log with care, stat file grows without limit.<br> +<% + + } // shouldShowLog + +%><%=intl._("Filter")%>: (<a href="javascript:void(null);" onclick="toggleAll('*')"><%=intl._("toggle all")%></a>)<br></p> + <div class="wideload"> + <table> + <% while (statshelper.hasMoreStats()) { + while (statshelper.groupRequired()) { %> + <tr class="tablefooter"> + <td align="left" colspan="3" id=<%=statshelper.getCurrentGroupName()%>> + <b><%=intl._(statshelper.getCurrentGroupName())%></b> + (<a href="javascript:void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')"><%=intl._("toggle all")%></a>) + </td></tr> + <tr class="tablefooter"> +<% + + if (shouldShowLog) { + +%> <td align="center"><b><%=intl._("Log")%></b></td> +<% + + } // shouldShowLog + +%> <td align="center"><b><%=intl._("Graph")%></b></td> + <td></td></tr> + <% + } // end iterating over required groups for the current stat %> + <tr> +<% + + if (shouldShowLog) { + +%> <td align="center"> + <a name="<%=statshelper.getCurrentStatName()%>"></a> + <input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="statList" value="<%=statshelper.getCurrentStatName()%>" <% + if (statshelper.getCurrentIsLogged()) { %>checked="checked" <% } %> ></td> +<% + + } // shouldShowLog + +%> <td align="center"> + <% if (statshelper.getCurrentCanBeGraphed()) { %> + <input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <% + if (statshelper.getCurrentIsGraphed()) { %>checked="checked" <% } %> ><% } %></td> + <td align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br> + <%=statshelper.getCurrentStatDescription()%></td></tr><% + } // end iterating over all stats + + if (shouldShowLog) { + +%> <tr><td colspan="3"></td></tr> + <tr><td align="center"><input type="checkbox" class="optbox" name="explicitFilter" ></td> + <td colspan="2"><%=intl._("Advanced filter")%>: + <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" ></td></tr> +<% + + } // shouldShowLog + +%> <tr class="tablefooter"><td colspan="3" align="right"> +<input type="reset" class="cancel" value="<%=intl._("Cancel")%>" > +<input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" > +</td></tr> +</table></div></form></div></div></body></html> diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp index 77ca232788..8d4aff7526 100644 --- a/apps/routerconsole/jsp/graphs.jsp +++ b/apps/routerconsole/jsp/graphs.jsp @@ -1,33 +1,33 @@ -<%@page contentType="text/html"%> -<%@page trimDirectiveWhitespaces="true"%> -<%@page pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> - -<html><head> -<%@include file="css.jsi" %> -<%=intl.title("graphs")%> - <jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" /> - <jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> -<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %> - <jsp:setProperty name="graphHelper" property="*" /> -<% - graphHelper.storeWriter(out); - graphHelper.storeMethod(request.getMethod()); - // meta must be inside the head - boolean allowRefresh = intl.allowIFrame(request.getHeader("User-Agent")); - if (allowRefresh) { - out.print(graphHelper.getRefreshMeta()); - } -%> -<script src="/js/ajax.js" type="text/javascript"></script> -<%@include file="summaryajax.jsi" %> -</head><body onload="initAjax()"> -<%@include file="summary.jsi" %> -<h1><%=intl._("I2P Performance Graphs")%></h1> -<div class="main" id="main"> - <div class="graphspanel"> - <div class="widepanel"> - <jsp:getProperty name="graphHelper" property="allMessages" /> - <jsp:getProperty name="graphHelper" property="images" /> - <jsp:getProperty name="graphHelper" property="form" /> -</div></div></div></body></html> +<%@page contentType="text/html"%> +<%@page trimDirectiveWhitespaces="true"%> +<%@page pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<html><head> +<%@include file="css.jsi" %> +<%=intl.title("graphs")%> + <jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" /> + <jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> +<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %> + <jsp:setProperty name="graphHelper" property="*" /> +<% + graphHelper.storeWriter(out); + graphHelper.storeMethod(request.getMethod()); + // meta must be inside the head + boolean allowRefresh = intl.allowIFrame(request.getHeader("User-Agent")); + if (allowRefresh) { + out.print(graphHelper.getRefreshMeta()); + } +%> +<script src="/js/ajax.js" type="text/javascript"></script> +<%@include file="summaryajax.jsi" %> +</head><body onload="initAjax()"> +<%@include file="summary.jsi" %> +<h1><%=intl._("I2P Performance Graphs")%></h1> +<div class="main" id="main"> + <div class="graphspanel"> + <div class="widepanel"> + <jsp:getProperty name="graphHelper" property="allMessages" /> + <jsp:getProperty name="graphHelper" property="images" /> + <jsp:getProperty name="graphHelper" property="form" /> +</div></div></div></body></html> -- GitLab