X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDeleteReplyAjaxPage.java;h=e12b2cf44272b1708ebbe482f05385cf481c309c;hb=f17403575ea2b0766a307ff322eca7ea4f84ce90;hp=75f4b5b0b295999881c11096eb759092c0f8a5d6;hpb=01e3bb4076653709656ec3f2e1faf6ba604f75f4;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 75f4b5b..e12b2cf 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 - DeletePostAjaxPage.java - Copyright © 2010 David Roden + * Sone - DeleteReplyAjaxPage.java - Copyright © 2010 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 @@ -18,7 +18,6 @@ package net.pterodactylus.sone.web.ajax; import net.pterodactylus.sone.data.Reply; -import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.util.json.JsonObject; @@ -36,7 +35,7 @@ public class DeleteReplyAjaxPage extends JsonPage { * The Sone web interface */ public DeleteReplyAjaxPage(WebInterface webInterface) { - super("ajax/deleteReply.ajax", webInterface); + super("deleteReply.ajax", webInterface); } // @@ -49,19 +48,15 @@ public class DeleteReplyAjaxPage extends JsonPage { @Override protected JsonObject createJsonObject(Request request) { String replyId = request.getHttpRequest().getParam("reply"); - Reply reply = webInterface.core().getReply(replyId); - Sone currentSone = getCurrentSone(request.getToadletContext()); + Reply reply = webInterface.getCore().getReply(replyId); if (reply == null) { - return new JsonObject().put("success", false).put("error", "invalid-reply-id"); + return createErrorJsonObject("invalid-reply-id"); } - if (currentSone == null) { - return new JsonObject().put("success", false).put("error", "auth-required"); + if (!webInterface.getCore().isLocalSone(reply.getSone())) { + return createErrorJsonObject("not-authorized"); } - if (!reply.getSone().equals(currentSone)) { - return new JsonObject().put("success", false).put("error", "not-authorized"); - } - webInterface.core().deleteReply(reply); - return new JsonObject().put("success", true); + webInterface.getCore().deleteReply(reply); + return createSuccessJsonObject(); } }