X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateReplyPage.java;h=0bd5217c6eaf70ae5a457e2c60ceda0c684a39f3;hb=fe8a83bdb1d644d4d1bf4342feab4c58115409b3;hp=8fb4480199c2416543b2968316af256e2f542206;hpb=d9e840e34436f648179a318512b92836187f31e0;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
index 8fb4480..0bd5217 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - CreateReplyPage.java - Copyright © 2010 David Roden
+ * Sone - CreateReplyPage.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,10 +17,15 @@
 
 package net.pterodactylus.sone.web;
 
+import com.google.common.base.Optional;
+
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.sone.text.TextFilter;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
 
 /**
  * This page lets the user post a reply to a post.
@@ -38,7 +43,7 @@ public class CreateReplyPage extends SoneTemplatePage {
 	 *            The Sone web interface
 	 */
 	public CreateReplyPage(Template template, WebInterface webInterface) {
-		super("createReply.html", template, "Page.CreateReply.Title", webInterface);
+		super("createReply.html", template, "Page.CreateReply.Title", webInterface, true);
 	}
 
 	//
@@ -49,33 +54,30 @@ public class CreateReplyPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) throws RedirectException {
-		super.processTemplate(request, template);
+	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		String postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
 		String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
+		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		if (request.getMethod() == Method.POST) {
-			Post post = webInterface.core().getPost(postId);
+			Optional<Post> post = webInterface.getCore().getPost(postId);
+			if (!post.isPresent()) {
+				throw new RedirectException("noPermission.html");
+			}
 			if (text.length() > 0) {
-				Sone currentSone = getCurrentSone(request.getToadletContext());
-				webInterface.core().createReply(currentSone, post, text);
-				throw new RedirectException("viewPost.html?post=" + post.getId());
+				String senderId = request.getHttpRequest().getPartAsStringFailsafe("sender", 43);
+				Sone sender = webInterface.getCore().getLocalSone(senderId);
+				if (sender == null) {
+					sender = getCurrentSone(request.getToadletContext());
+				}
+				text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+				webInterface.getCore().createReply(sender, post.get(), text);
+				throw new RedirectException(returnPage);
 			}
-			template.set("errorTextEmpty", true);
+			templateContext.set("errorTextEmpty", true);
 		}
-		template.set("postId", postId);
-		template.set("text", text);
-	}
-
-	//
-	// SONETEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean requiresLogin() {
-		return true;
+		templateContext.set("postId", postId);
+		templateContext.set("text", text);
+		templateContext.set("returnPage", returnPage);
 	}
 
 }