From 5276a350f8a43e23d1cd3e30f0b8a815068f9e21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 20 Oct 2010 14:51:16 +0200 Subject: [PATCH] More honoring of POST requests and return pages. --- .../java/net/pterodactylus/sone/web/UnblockSonePage.java | 9 ++++++--- .../net/pterodactylus/sone/web/UnfollowSonePage.java | 16 ++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/web/UnblockSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnblockSonePage.java index 6cce4d9..36f00bc 100644 --- a/src/main/java/net/pterodactylus/sone/web/UnblockSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/UnblockSonePage.java @@ -49,11 +49,14 @@ public class UnblockSonePage extends SoneTemplatePage { @Override protected void processTemplate(Request request, Template template) throws RedirectException { super.processTemplate(request, template); - String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36); if (request.getMethod() == Method.POST) { - getCurrentSone(request.getToadletContext()).removeBlockedSoneId(soneId); + String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36); + String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64); + if (request.getMethod() == Method.POST) { + getCurrentSone(request.getToadletContext()).removeBlockedSoneId(soneId); + } + throw new RedirectException(returnPage); } - throw new RedirectException("viewSone.html?sone=" + soneId); } // diff --git a/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java index 60f6355..6a9466d 100644 --- a/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java @@ -18,6 +18,7 @@ package net.pterodactylus.sone.web; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.web.page.Page.Request.Method; import net.pterodactylus.util.template.Template; /** @@ -47,13 +48,16 @@ public class UnfollowSonePage extends SoneTemplatePage { @Override protected void processTemplate(Request request, Template template) throws RedirectException { super.processTemplate(request, template); - String soneId = request.getHttpRequest().getParam("sone"); - Sone currentSone = getCurrentSone(request.getToadletContext()); - Sone sone = webInterface.core().getSone(soneId); - if (!sone.equals(currentSone)) { - currentSone.removeFriend(sone); + if (request.getMethod() == Method.POST) { + String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 36); + String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64); + Sone currentSone = getCurrentSone(request.getToadletContext()); + Sone sone = webInterface.core().getSone(soneId); + if (!sone.equals(currentSone)) { + currentSone.removeFriend(sone); + } + throw new RedirectException(returnPage); } - throw new RedirectException("viewSone.html?sone=" + soneId); } // -- 2.7.4