X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDeleteReplyAjaxPage.java;h=2505c393a2947de1d48bef3103ca7d0ad5bdb460;hb=a88e930a23b550dae75116d7759924d760941776;hp=7614de80f2b053a9c27e69a9057d6e019ac66201;hpb=8454806e48890675178c1b4b6cbe4bb9c42b68a3;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java index 7614de8..2505c39 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java @@ -1,5 +1,5 @@ /* - * Sone - DeleteReplysAjaxPage.java - Copyright © 2010 David Roden + * Sone - DeleteReplyAjaxPage.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 @@ -17,9 +17,9 @@ package net.pterodactylus.sone.web.ajax; -import net.pterodactylus.sone.data.Reply; -import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.web.WebInterface; +import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.json.JsonObject; /** @@ -47,17 +47,13 @@ public class DeleteReplyAjaxPage extends JsonPage { * {@inheritDoc} */ @Override - protected JsonObject createJsonObject(Request request) { + protected JsonObject createJsonObject(FreenetRequest request) { String replyId = request.getHttpRequest().getParam("reply"); - Reply reply = webInterface.getCore().getReply(replyId); - Sone currentSone = getCurrentSone(request.getToadletContext()); + PostReply reply = webInterface.getCore().getPostReply(replyId, false); if (reply == null) { return createErrorJsonObject("invalid-reply-id"); } - if (currentSone == null) { - return createErrorJsonObject("auth-required"); - } - if (!reply.getSone().equals(currentSone)) { + if (!reply.getSone().isLocal()) { return createErrorJsonObject("not-authorized"); } webInterface.getCore().deleteReply(reply);