X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreatePostPage.java;h=46631ce5423a90b21badeafaeec4529bf3faadfa;hp=bed96a486472d334be1567b42c7c5e7d1e6cea14;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=e2cae8504eea6b4c833e9aa87ccd70d897e5f0f2 diff --git a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java index bed96a4..46631ce 100644 --- a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java +++ b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java @@ -1,5 +1,5 @@ /* - * Sone - CreatePostPage.java - Copyright © 2010 David Roden + * Sone - CreatePostPage.java - Copyright © 2010–2015 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,9 +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.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 create a new {@link Post}. @@ -37,7 +43,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); } // @@ -48,27 +54,27 @@ public class CreatePostPage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(Request request, Template template) throws RedirectException { - super.processTemplate(request, template); - String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim(); - if (text.length() != 0) { - Sone currentSone = getCurrentSone(request.getToadletContext()); - webInterface.core().createPost(currentSone, System.currentTimeMillis(), text); - throw new RedirectException("index.html"); + protected void processTemplate(FreenetRequest 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(); + if (text.length() != 0) { + String senderId = request.getHttpRequest().getPartAsStringFailsafe("sender", 43); + String recipientId = request.getHttpRequest().getPartAsStringFailsafe("recipient", 43); + Sone currentSone = getCurrentSone(request.getToadletContext()); + Sone sender = webInterface.getCore().getLocalSone(senderId); + if (sender == null) { + sender = currentSone; + } + Optional recipient = webInterface.getCore().getSone(recipientId); + text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text); + webInterface.getCore().createPost(sender, recipient, text); + throw new RedirectException(returnPage); + } + templateContext.set("errorTextEmpty", true); } - template.set("errorTextEmpty", true); - } - - // - // SONETEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected boolean requiresLogin() { - return true; + templateContext.set("returnPage", returnPage); } }