projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also show posts and replies that have the current Sone as post recipient.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
DeleteReplyAjaxPage.java
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
..
f34d202
100644
(file)
--- 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 - Delete
Post
AjaxPage.java - Copyright © 2010 David Roden
+ * Sone - Delete
Replys
AjaxPage.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
*
* 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;
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;
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) {
* 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");
@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) {
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-requir
ed");
+ if (
!webInterface.getCore().isLocalSone(reply.getSone())
) {
+ return
createErrorJsonObject("not-authoriz
ed");
}
}
- 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();
}
}
}
}