From 3131e65b661a7e479d70e62e3d50dea1f24b4f32 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 20 Feb 2012 14:32:48 +0000
Subject: [PATCH] fix redirection; change header
---
apps/routerconsole/jsp/home.jsp | 2 +-
apps/routerconsole/jsp/index.jsp | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index 382a73aeed..65cfef40e4 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -138,7 +138,7 @@ function initAjax() { setInterval(requestAjax1, 15000); }
<jsp:useBean class="net.i2p.router.web.HomeHelper" id="homehelper" scope="request" />
<jsp:setProperty name="homehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<div class="ag2">
- <h4 class="app"><%=intl._("Recommended Eepsites")%></h4>
+ <h4 class="app"><%=intl._("Eepsites of Interest")%></h4>
<jsp:getProperty name="homehelper" property="favorites" /><br>
</div>
<div class="ag2">
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index b87cf0a1e1..683745703c 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -1,18 +1,27 @@
<%@page contentType="text/plain"%>
<%@page pageEncoding="UTF-8"%>
<%
+ //
+ // Redirect to either /home or /console, depending on configuration,
+ // while preserving any query parameters
+ //
response.setStatus(302, "Moved");
- String req = request.getRequestURI();
+ String req = request.getRequestURL().toString();
+ StringBuilder buf = new StringBuilder(128);
if (req.endsWith("index"))
req = req.substring(0, req.length() - 5);
else if (req.endsWith("index.jsp"))
req = req.substring(0, req.length() - 9);
+ buf.append(req);
if (!req.endsWith("/"))
- req += '/';
+ buf.append('/');
boolean oldHome = net.i2p.I2PAppContext.getGlobalContext().getBooleanProperty("routerconsole.oldHomePage");
if (oldHome)
- req += "console";
+ buf.append("console");
else
- req += "home";
- response.setHeader("Location", req);
+ buf.append("home");
+ String query = request.getQueryString();
+ if (query != null)
+ buf.append('?').append(query);
+ response.setHeader("Location", buf.toString());
%>
--
GitLab