X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateReplyPage.java;h=82e4c51e1e73cad593f7f4f9d20f73812715dbd9;hp=d4a97758f191ef4dee4cb15b83bbb9c41321dedd;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=fa63b855e28c5fbf270bfdca1bb23fd048affae5

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
index d4a9775..82e4c51 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–2012 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
@@ -19,9 +19,11 @@ package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
-import net.pterodactylus.util.template.DataProvider;
+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.
@@ -50,23 +52,28 @@ public class CreateReplyPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-		super.processTemplate(request, dataProvider);
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+		super.processTemplate(request, templateContext);
 		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.getCore().getPost(postId);
 			if (text.length() > 0) {
-				Sone currentSone = getCurrentSone(request.getToadletContext());
-				webInterface.getCore().createReply(currentSone, post, text);
+				String senderId = request.getHttpRequest().getPartAsStringFailsafe("sender", 43);
+				Sone sender = webInterface.getCore().getLocalSone(senderId, false);
+				if (sender == null) {
+					sender = getCurrentSone(request.getToadletContext());
+				}
+				text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+				webInterface.getCore().createReply(sender, post, text);
 				throw new RedirectException(returnPage);
 			}
-			dataProvider.set("errorTextEmpty", true);
+			templateContext.set("errorTextEmpty", true);
 		}
-		dataProvider.set("postId", postId);
-		dataProvider.set("text", text);
-		dataProvider.set("returnPage", returnPage);
+		templateContext.set("postId", postId);
+		templateContext.set("text", text);
+		templateContext.set("returnPage", returnPage);
 	}
 
 }