From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 20 Oct 2010 12:51:16 +0000 (+0200)
Subject: More honoring of POST requests and return pages.
X-Git-Tag: 0.1-RC1~158
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=5276a350f8a43e23d1cd3e30f0b8a815068f9e21;p=Sone.git

More honoring of POST requests and return pages.
---

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);
 	}
 
 	//