X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreatePostPage.java;h=147e4ae13f7af6cd3d0700664b5a92c395d77340;hb=47ed7eaf00c35889781831d33d04e9f91c9ad266;hp=05aceace69fcd07839370bed5519c43b851eb7be;hpb=b05da8b28547c757aa986306c9e88bc5521b174c;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
index 05aceac..147e4ae 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
@@ -19,8 +19,10 @@ package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * This page lets the user create a new {@link Post}.
@@ -38,7 +40,7 @@ public class CreatePostPage extends SoneTemplatePage {
 	 *            The Sone web interface
 	 */
 	public CreatePostPage(Template template, WebInterface webInterface) {
-		super("createPost.html", template, "Page.CreatePost.Title", webInterface);
+		super("createPost.html", template, "Page.CreatePost.Title", webInterface, true);
 	}
 
 	//
@@ -49,33 +51,27 @@ public class CreatePostPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) throws RedirectException {
-		super.processTemplate(request, template);
-		template.set("returnPage", request.getUri());
+	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+		super.processTemplate(request, templateContext);
+		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		if (request.getMethod() == Method.POST) {
 			String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
-			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
 			if (text.length() != 0) {
+				String senderId = request.getHttpRequest().getPartAsStringFailsafe("sender", 43);
+				String recipientId = request.getHttpRequest().getPartAsStringFailsafe("recipient", 43);
 				Sone currentSone = getCurrentSone(request.getToadletContext());
-				webInterface.core().createPost(currentSone, System.currentTimeMillis(), text);
+				Sone sender = webInterface.getCore().getLocalSone(senderId, false);
+				if (sender == null) {
+					sender = currentSone;
+				}
+				Sone recipient = webInterface.getCore().getSone(recipientId, false);
+				text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+				webInterface.getCore().createPost(sender, recipient, System.currentTimeMillis(), text);
 				throw new RedirectException(returnPage);
 			}
-			template.set("errorTextEmpty", true);
-			template.set("returnPage", returnPage);
+			templateContext.set("errorTextEmpty", true);
 		}
-
-	}
-
-	//
-	// SONETEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean requiresLogin() {
-		return true;
+		templateContext.set("returnPage", returnPage);
 	}
 
 }