propagate from branch 'i2p.i2p.zzz.test3' (head e19da9b978ed2ec03adb0e326fff6870746cc4fc)
to branch 'i2p.i2p' (head 179b9a7974d64853c0c91924a5ad86e8b04ee7ba)
This commit is contained in:
@ -2,8 +2,14 @@
|
||||
/*
|
||||
* This should be included inside <head>...</head>,
|
||||
* as it sets the stylesheet.
|
||||
*
|
||||
* This is included almost 30 times, so keep whitespace etc. to a minimum.
|
||||
*/
|
||||
|
||||
// http://www.crazysquirrel.com/computing/general/form-encoding.jspx
|
||||
if (request.getCharacterEncoding() == null)
|
||||
request.setCharacterEncoding("UTF-8");
|
||||
|
||||
response.setHeader("Pragma", "no-cache");
|
||||
response.setHeader("Cache-Control","no-cache");
|
||||
response.setDateHeader("Expires", 0);
|
||||
@ -15,7 +21,9 @@
|
||||
session.setAttribute("i2p.contextId", request.getParameter("i2p.contextId"));
|
||||
}
|
||||
%>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link rel="shortcut icon" href="favicon.ico">
|
||||
<jsp:useBean class="net.i2p.router.web.CSSHelper" id="cssHelper" scope="request" />
|
||||
<jsp:setProperty name="cssHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
|
||||
<link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css">
|
||||
<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
|
||||
<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
|
||||
|
@ -13,7 +13,6 @@
|
||||
// If it can't find the iframe or viewtheme.jsp I wonder if the whole thing blows up...
|
||||
%>
|
||||
<html><head><title>I2P Router Console - Page Not Found</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<%@include file="css.jsp" %>
|
||||
<link rel="shortcut icon" href="favicon.ico" /></head><body>
|
||||
<%
|
||||
|
@ -25,6 +25,12 @@ if (c != null && c.length() > 0) {
|
||||
if (rendered)
|
||||
cout.close();
|
||||
}
|
||||
/*
|
||||
* Send a 403 instead of a 404, because the server sends error.jsp
|
||||
* for 404 errors, complete with the summary bar, which would be
|
||||
* a huge load for a page full of flags if the user didn't have the
|
||||
* flags directory for some reason.
|
||||
*/
|
||||
if (!rendered)
|
||||
response.sendError(404, "Not found");
|
||||
response.sendError(403, "Flag not found");
|
||||
%>
|
@ -5,8 +5,6 @@
|
||||
<html><head>
|
||||
<%@include file="css.jsp" %>
|
||||
<title>I2P Router Console - home</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<link rel="shortcut icon" href="/themes/console/images/favicon.ico" />
|
||||
</head><body>
|
||||
<%
|
||||
if (System.getProperty("router.consoleNonce") == null) {
|
||||
|
@ -10,7 +10,6 @@
|
||||
<html><head>
|
||||
<%@include file="css.jsp" %>
|
||||
<title>Summary Bar</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<%
|
||||
// try hard to avoid an error page in the iframe after shutdown
|
||||
String action = request.getParameter("action");
|
||||
|
@ -63,7 +63,12 @@ if ( !rendered && ((rs != null) || fakeBw) ) {
|
||||
}
|
||||
} catch (NumberFormatException nfe) {}
|
||||
}
|
||||
/*
|
||||
* Send a 403 instead of a 404, because the server sends error.jsp
|
||||
* for 404 errors, complete with the summary bar, which would be
|
||||
* a huge load for a page full of graphs if there's a problem
|
||||
*/
|
||||
if (!rendered) {
|
||||
response.sendError(404, "That stat is not available");
|
||||
response.sendError(403, "That stat is not available");
|
||||
}
|
||||
%>
|
Reference in New Issue
Block a user