badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Vetoing a CommentPostedEvent should display veto reason as an error message

Browse source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@632 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-12-06 19:15:45 +00:00
parent e7d7aa500f
commit 6c20105aff
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ext/comment/main.php
View file

@ -68,7 +68,15 @@ class CommentList extends Extension {
if(is_a($event, 'PageRequestEvent') && ($event->page_name == "comment")) { if(is_a($event, 'PageRequestEvent') && ($event->page_name == "comment")) {
if($event->get_arg(0) == "add") { if($event->get_arg(0) == "add") {
send_event(new CommentPostingEvent($_POST['image_id'], $event->user, $_POST['comment'])); $cpe = new CommentPostingEvent($_POST['image_id'], $event->user, $_POST['comment']);
send_event($cpe);
if($cpe->vetoed) {
$this->theme->display_error($event->page, "Comment Blocked", $cpe->veto_reason);
}
else {
$event->page->set_mode("redirect");
$event->page->set_redirect(make_link("post/view/".int_escape($_POST['image_id'])));
}
} }
else if($event->get_arg(0) == "delete") { else if($event->get_arg(0) == "delete") {
if($event->user->is_admin()) { if($event->user->is_admin()) {
@ -109,7 +117,7 @@ class CommentList extends Extension {
} }
// TODO: split akismet into a separate class, which can veto the event // TODO: split akismet into a separate class, which can veto the event
if(is_a($event, 'CommentPostingEvent')) { if(is_a($event, 'CommentPostingEvent')) {
$this->add_comment_wrapper($event->image_id, $event->user, $event->comment); $this->add_comment_wrapper($event->image_id, $event->user, $event->comment, $event);
} }
if(is_a($event, 'CommentDeletionEvent')) { if(is_a($event, 'CommentDeletionEvent')) {
$this->delete_comment($event->comment_id); $this->delete_comment($event->comment_id);
@ -286,36 +294,30 @@ class CommentList extends Extension {
return ($database->db->GetRow("SELECT * FROM comments WHERE image_id=? AND comment=?", array($image_id, $comment))); return ($database->db->GetRow("SELECT * FROM comments WHERE image_id=? AND comment=?", array($image_id, $comment)));
} }
private function add_comment_wrapper($image_id, $user, $comment) { private function add_comment_wrapper($image_id, $user, $comment, $event) {
global $database; global $database;
global $config; global $config;
global $page;
if(!$config->get_bool('comment_anon') && $user->is_anonymous()) { if(!$config->get_bool('comment_anon') && $user->is_anonymous()) {
$this->theme->display_error($page, "Permission Denied", "Anonymous posting has been disabled"); $event->veto("Anonymous posting has been disabled");
} }
else if(trim($comment) == "") { else if(trim($comment) == "") {
$this->theme->display_error($page, "Comment Empty", "Comments need text..."); $event->veto("Comments need text...");
} }
else if($this->is_comment_limit_hit()) { else if($this->is_comment_limit_hit()) {
$this->theme->display_error($page, "Comment Limit Hit", $event->veto("You've posted several comments recently; wait a minute and try again...");
"You've posted several comments recently; wait a minute and try again...");
} }
else if($this->is_dupe($image_id, $comment)) { else if($this->is_dupe($image_id, $comment)) {
$this->theme->display_error($page, "Duplicate Comment", $event->veto("Someone already made that comment on that image -- try and be more original?");
"Someone already made that comment on that image -- try and be more original?");
} }
else if($user->is_anonymous() && $this->is_spam($comment)) { else if($user->is_anonymous() && $this->is_spam($comment)) {
$this->theme->display_error($page, "Spam Detected", $event->veto("Akismet thinks that your comment is spam. Try rewriting the comment, or logging in.");
"Akismet thinks that your comment is spam. Try rewriting the comment, or logging in.");
} }
else { else {
$database->Execute( $database->Execute(
"INSERT INTO comments(image_id, owner_id, owner_ip, posted, comment) ". "INSERT INTO comments(image_id, owner_id, owner_ip, posted, comment) ".
"VALUES(?, ?, ?, now(), ?)", "VALUES(?, ?, ?, now(), ?)",
array($image_id, $user->id, $_SERVER['REMOTE_ADDR'], $comment)); array($image_id, $user->id, $_SERVER['REMOTE_ADDR'], $comment));
$page->set_mode("redirect");
$page->set_redirect(make_link("post/view/".int_escape($image_id)));
} }
} }