From 5c2890b61074d8f0420b70c515583556d90f7d7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 17 Jan 2011 11:03:32 +0100 Subject: [PATCH] =?utf8?q?Use=20=E2=80=9CreturnPage=E2=80=9D=20instead=20o?= =?utf8?q?f=20=E2=80=9CreturnPath=E2=80=9D=20everywhere.=20Fixes=20#60.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/java/net/pterodactylus/sone/web/DistrustPage.java | 4 ++-- src/main/java/net/pterodactylus/sone/web/TrustPage.java | 4 ++-- src/main/java/net/pterodactylus/sone/web/UntrustPage.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/web/DistrustPage.java b/src/main/java/net/pterodactylus/sone/web/DistrustPage.java index 9cbbb55..4b14df0 100644 --- a/src/main/java/net/pterodactylus/sone/web/DistrustPage.java +++ b/src/main/java/net/pterodactylus/sone/web/DistrustPage.java @@ -55,14 +55,14 @@ public class DistrustPage extends SoneTemplatePage { protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException { super.processTemplate(request, dataProvider); if (request.getMethod() == Method.POST) { - String returnPath = request.getHttpRequest().getPartAsStringFailsafe("returnPath", 256); + String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44); Sone currentSone = getCurrentSone(request.getToadletContext()); Sone sone = webInterface.getCore().getSone(identity, false); if (sone != null) { webInterface.getCore().distrustSone(currentSone, sone); } - throw new RedirectException(returnPath); + throw new RedirectException(returnPage); } } diff --git a/src/main/java/net/pterodactylus/sone/web/TrustPage.java b/src/main/java/net/pterodactylus/sone/web/TrustPage.java index 85341ad..b74a2b6 100644 --- a/src/main/java/net/pterodactylus/sone/web/TrustPage.java +++ b/src/main/java/net/pterodactylus/sone/web/TrustPage.java @@ -55,14 +55,14 @@ public class TrustPage extends SoneTemplatePage { protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException { super.processTemplate(request, dataProvider); if (request.getMethod() == Method.POST) { - String returnPath = request.getHttpRequest().getPartAsStringFailsafe("returnPath", 256); + String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44); Sone currentSone = getCurrentSone(request.getToadletContext()); Sone sone = webInterface.getCore().getSone(identity, false); if (sone != null) { webInterface.getCore().trustSone(currentSone, sone); } - throw new RedirectException(returnPath); + throw new RedirectException(returnPage); } } diff --git a/src/main/java/net/pterodactylus/sone/web/UntrustPage.java b/src/main/java/net/pterodactylus/sone/web/UntrustPage.java index cc9e26d..9d071b8 100644 --- a/src/main/java/net/pterodactylus/sone/web/UntrustPage.java +++ b/src/main/java/net/pterodactylus/sone/web/UntrustPage.java @@ -55,14 +55,14 @@ public class UntrustPage extends SoneTemplatePage { protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException { super.processTemplate(request, dataProvider); if (request.getMethod() == Method.POST) { - String returnPath = request.getHttpRequest().getPartAsStringFailsafe("returnPath", 256); + String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44); Sone currentSone = getCurrentSone(request.getToadletContext()); Sone sone = webInterface.getCore().getSone(identity, false); if (sone != null) { webInterface.getCore().untrustSone(currentSone, sone); } - throw new RedirectException(returnPath); + throw new RedirectException(returnPage); } } -- 2.7.4