From 4f6fb6993d735f474e19183ab910f0a74b15be56 Mon Sep 17 00:00:00 2001 From: str4d Date: Tue, 12 Jun 2012 00:12:51 +0000 Subject: [PATCH] Pass requestURI through to xhr1.jsp so forms work and correct summary bar is chosen --- apps/routerconsole/jsp/config.jsp | 2 +- apps/routerconsole/jsp/configadvanced.jsp | 2 +- apps/routerconsole/jsp/configclients.jsp | 2 +- apps/routerconsole/jsp/confighome.jsp | 2 +- apps/routerconsole/jsp/configkeyring.jsp | 2 +- apps/routerconsole/jsp/configlogging.jsp | 2 +- apps/routerconsole/jsp/confignet.jsp | 2 +- apps/routerconsole/jsp/configpeer.jsp | 2 +- apps/routerconsole/jsp/configreseed.jsp | 2 +- apps/routerconsole/jsp/configservice.jsp | 2 +- apps/routerconsole/jsp/configsidebar.jsp | 2 +- apps/routerconsole/jsp/configstats.jsp | 2 +- apps/routerconsole/jsp/configtunnels.jsp | 2 +- apps/routerconsole/jsp/configui.jsp | 2 +- apps/routerconsole/jsp/configupdate.jsp | 2 +- apps/routerconsole/jsp/console.jsp | 2 +- apps/routerconsole/jsp/debug.jsp | 2 +- apps/routerconsole/jsp/error.jsp | 2 +- apps/routerconsole/jsp/graph.jsp | 2 +- apps/routerconsole/jsp/graphs.jsp | 2 +- apps/routerconsole/jsp/help.jsp | 2 +- apps/routerconsole/jsp/help_ar.jsp | 2 +- apps/routerconsole/jsp/help_fr.jsp | 2 +- apps/routerconsole/jsp/help_nl.jsp | 2 +- apps/routerconsole/jsp/help_ru.jsp | 2 +- apps/routerconsole/jsp/home.jsp | 2 +- apps/routerconsole/jsp/i2ptunnelmgr.jsp | 2 +- apps/routerconsole/jsp/jars.jsp | 2 +- apps/routerconsole/jsp/jobs.jsp | 2 +- apps/routerconsole/jsp/logs.jsp | 2 +- apps/routerconsole/jsp/netdb.jsp | 2 +- apps/routerconsole/jsp/nowebapp.jsp | 2 +- apps/routerconsole/jsp/oldconsole.jsp | 2 +- apps/routerconsole/jsp/peers.jsp | 2 +- apps/routerconsole/jsp/profiles.jsp | 2 +- apps/routerconsole/jsp/stats.jsp | 2 +- apps/routerconsole/jsp/tunnels.jsp | 2 +- apps/routerconsole/jsp/viewprofile.jsp | 2 +- apps/routerconsole/jsp/xhr1.jsi | 4 ++-- 39 files changed, 40 insertions(+), 40 deletions(-) diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 9cc6f81a4..7307dc355 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index 27405c0c4..d684ddccc 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 0662afffe..397773e4b 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -14,7 +14,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp index 5ddf6f200..7a4379f47 100644 --- a/apps/routerconsole/jsp/confighome.jsp +++ b/apps/routerconsole/jsp/confighome.jsp @@ -15,7 +15,7 @@ input.default { diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index 2719fe333..612e6c590 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -8,7 +8,7 @@ diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index d00d34321..77da61dc8 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp index e85c9e6df..134460eb4 100644 --- a/apps/routerconsole/jsp/confignet.jsp +++ b/apps/routerconsole/jsp/confignet.jsp @@ -8,7 +8,7 @@ diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 0f9b98a21..3e98487b8 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -8,7 +8,7 @@ diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp index c0f3faaae..88c8f46a1 100644 --- a/apps/routerconsole/jsp/configreseed.jsp +++ b/apps/routerconsole/jsp/configreseed.jsp @@ -8,7 +8,7 @@ diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 21ae39a6b..7a5ea2e33 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -8,7 +8,7 @@ diff --git a/apps/routerconsole/jsp/configsidebar.jsp b/apps/routerconsole/jsp/configsidebar.jsp index dcbf1fe1e..5fece0558 100644 --- a/apps/routerconsole/jsp/configsidebar.jsp +++ b/apps/routerconsole/jsp/configsidebar.jsp @@ -15,7 +15,7 @@ input.default { diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 6d75d673c..9ba18c3d9 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index c5b8c4d81..886151087 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index dafac8d45..2cad3ec6a 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/console.jsp b/apps/routerconsole/jsp/console.jsp index b9688aa0e..8f2fa2e0b 100644 --- a/apps/routerconsole/jsp/console.jsp +++ b/apps/routerconsole/jsp/console.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/debug.jsp b/apps/routerconsole/jsp/debug.jsp index 191d73e18..609308fd5 100644 --- a/apps/routerconsole/jsp/debug.jsp +++ b/apps/routerconsole/jsp/debug.jsp @@ -12,7 +12,7 @@ diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp index 95218cc53..2c1913080 100644 --- a/apps/routerconsole/jsp/error.jsp +++ b/apps/routerconsole/jsp/error.jsp @@ -19,7 +19,7 @@ diff --git a/apps/routerconsole/jsp/graph.jsp b/apps/routerconsole/jsp/graph.jsp index 4be37b339..487f91fd6 100644 --- a/apps/routerconsole/jsp/graph.jsp +++ b/apps/routerconsole/jsp/graph.jsp @@ -15,7 +15,7 @@ diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp index e3287e98c..e78720012 100644 --- a/apps/routerconsole/jsp/graphs.jsp +++ b/apps/routerconsole/jsp/graphs.jsp @@ -22,7 +22,7 @@ diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index 8c68cb5e9..49d138c27 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -12,7 +12,7 @@ diff --git a/apps/routerconsole/jsp/help_ar.jsp b/apps/routerconsole/jsp/help_ar.jsp index 7e058678f..b63f509ca 100644 --- a/apps/routerconsole/jsp/help_ar.jsp +++ b/apps/routerconsole/jsp/help_ar.jsp @@ -12,7 +12,7 @@ diff --git a/apps/routerconsole/jsp/help_fr.jsp b/apps/routerconsole/jsp/help_fr.jsp index 01b000ac9..56167fe0e 100644 --- a/apps/routerconsole/jsp/help_fr.jsp +++ b/apps/routerconsole/jsp/help_fr.jsp @@ -12,7 +12,7 @@ diff --git a/apps/routerconsole/jsp/help_nl.jsp b/apps/routerconsole/jsp/help_nl.jsp index 20defacaa..9db466eb1 100644 --- a/apps/routerconsole/jsp/help_nl.jsp +++ b/apps/routerconsole/jsp/help_nl.jsp @@ -12,7 +12,7 @@ diff --git a/apps/routerconsole/jsp/help_ru.jsp b/apps/routerconsole/jsp/help_ru.jsp index 55ea530c7..7c49a5fb6 100644 --- a/apps/routerconsole/jsp/help_ru.jsp +++ b/apps/routerconsole/jsp/help_ru.jsp @@ -12,7 +12,7 @@ diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp index 3bd345151..8dbaf0bd8 100644 --- a/apps/routerconsole/jsp/home.jsp +++ b/apps/routerconsole/jsp/home.jsp @@ -7,7 +7,7 @@ diff --git a/apps/routerconsole/jsp/i2ptunnelmgr.jsp b/apps/routerconsole/jsp/i2ptunnelmgr.jsp index 6ea41239a..58c476116 100644 --- a/apps/routerconsole/jsp/i2ptunnelmgr.jsp +++ b/apps/routerconsole/jsp/i2ptunnelmgr.jsp @@ -19,7 +19,7 @@ diff --git a/apps/routerconsole/jsp/jobs.jsp b/apps/routerconsole/jsp/jobs.jsp index 247fa298e..c668951b9 100644 --- a/apps/routerconsole/jsp/jobs.jsp +++ b/apps/routerconsole/jsp/jobs.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index ed4b5c121..bd6d85722 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -8,7 +8,7 @@ diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp index af661c204..ba2185062 100644 --- a/apps/routerconsole/jsp/netdb.jsp +++ b/apps/routerconsole/jsp/netdb.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/nowebapp.jsp b/apps/routerconsole/jsp/nowebapp.jsp index c18b8e41a..b61808a9d 100644 --- a/apps/routerconsole/jsp/nowebapp.jsp +++ b/apps/routerconsole/jsp/nowebapp.jsp @@ -10,7 +10,7 @@ diff --git a/apps/routerconsole/jsp/oldconsole.jsp b/apps/routerconsole/jsp/oldconsole.jsp index cb0c18663..825388a7a 100644 --- a/apps/routerconsole/jsp/oldconsole.jsp +++ b/apps/routerconsole/jsp/oldconsole.jsp @@ -12,7 +12,7 @@ diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp index e23e4f73b..934de432b 100644 --- a/apps/routerconsole/jsp/peers.jsp +++ b/apps/routerconsole/jsp/peers.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp index 5f149ec24..f5be72a83 100644 --- a/apps/routerconsole/jsp/profiles.jsp +++ b/apps/routerconsole/jsp/profiles.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/stats.jsp b/apps/routerconsole/jsp/stats.jsp index 5750fae1c..b5255775b 100644 --- a/apps/routerconsole/jsp/stats.jsp +++ b/apps/routerconsole/jsp/stats.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp index 332381a95..5ccfd0778 100644 --- a/apps/routerconsole/jsp/tunnels.jsp +++ b/apps/routerconsole/jsp/tunnels.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/viewprofile.jsp b/apps/routerconsole/jsp/viewprofile.jsp index 635aafb34..96f2e1df4 100644 --- a/apps/routerconsole/jsp/viewprofile.jsp +++ b/apps/routerconsole/jsp/viewprofile.jsp @@ -9,7 +9,7 @@ diff --git a/apps/routerconsole/jsp/xhr1.jsi b/apps/routerconsole/jsp/xhr1.jsi index 1362cca1f..d6b9e62eb 100644 --- a/apps/routerconsole/jsp/xhr1.jsi +++ b/apps/routerconsole/jsp/xhr1.jsi @@ -12,8 +12,8 @@ " /> <% String reqURI = request.getRequestURI(); - if (reqURI != null) - reqURI = reqURI.replace("/xhr1.jsp", "/"); + if (reqURI.contains("/xhr1")) + reqURI = request.getParameter("requestURI"); helper.setRequestURI(reqURI); %> <% helper.storeWriter(out); %>