james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #462 from shish/bypass_comment_checks

Browse Source 
Allow admins to bypass comment checks (rate limit etc)
This commit is contained in:
Shish 2014-12-17 13:40:06 +00:00
commit c0279565f4
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/userclass.class.php
View File

@ -97,6 +97,7 @@ new UserClass("base", null, array(
"create_comment" => False, "create_comment" => False,
"delete_comment" => False, "delete_comment" => False,
"bypass_comment_checks" => False, # spam etc
"replace_image" => False, "replace_image" => False,
"create_image" => False, "create_image" => False,
@ -163,6 +164,7 @@ new UserClass("admin", "base", array(
"ban_image" => True, "ban_image" => True,
"create_comment" => True, "create_comment" => True,
"delete_comment" => True, "delete_comment" => True,
"bypass_comment_checks" => True,
"replace_image" => True, "replace_image" => True,
"manage_extension_list" => True, "manage_extension_list" => True,
"manage_alias_list" => True, "manage_alias_list" => True,

4
ext/ban_words/main.php
View File

@ -54,7 +54,9 @@ xanax
} }
public function onCommentPosting(CommentPostingEvent $event) { public function onCommentPosting(CommentPostingEvent $event) {
$this->test_text($event->comment, new CommentPostingException("Comment contains banned terms")); if(!$user->can("bypass_comment_checks")) {
$this->test_text($event->comment, new CommentPostingException("Comment contains banned terms"));
}
} }
public function onSourceSet(SourceSetEvent $event) { public function onSourceSet(SourceSetEvent $event) {

39
ext/comment/main.php
View File

@ -564,6 +564,29 @@ class CommentList extends Extension {
private function add_comment_wrapper(/*int*/ $image_id, User $user, /*string*/ $comment) { private function add_comment_wrapper(/*int*/ $image_id, User $user, /*string*/ $comment) {
global $database, $config; global $database, $config;
if(!$user->can("bypass_comment_checks")) {
// will raise an exception if anything is wrong
$this->comment_checks($image_id, $user, $comment);
}
// all checks passed
if($user->is_anonymous()) {
set_prefixed_cookie("nocache", "Anonymous Commenter", time()+60*60*24, "/");
}
$database->Execute(
"INSERT INTO comments(image_id, owner_id, owner_ip, posted, comment) ".
"VALUES(:image_id, :user_id, :remote_addr, now(), :comment)",
array("image_id"=>$image_id, "user_id"=>$user->id, "remote_addr"=>$_SERVER['REMOTE_ADDR'], "comment"=>$comment));
$cid = $database->get_last_insert_id('comments_id_seq');
$snippet = substr($comment, 0, 100);
$snippet = str_replace("\n", " ", $snippet);
$snippet = str_replace("\r", " ", $snippet);
log_info("comment", "Comment #$cid added to Image #$image_id: $snippet", false, array("image_id"=>$image_id, "comment_id"=>$cid));
}
private function comment_checks(/*int*/ $image_id, User $user, /*string*/ $comment) {
global $config;
// basic sanity checks // basic sanity checks
if(!$user->can("create_comment")) { if(!$user->can("create_comment")) {
throw new CommentPostingException("Anonymous posting has been disabled"); throw new CommentPostingException("Anonymous posting has been disabled");
@ -604,22 +627,6 @@ class CommentList extends Extension {
else if($user->is_anonymous() && $this->is_spam_akismet($comment)) { else if($user->is_anonymous() && $this->is_spam_akismet($comment)) {
throw new CommentPostingException("Akismet thinks that your comment is spam. Try rewriting the comment, or logging in."); throw new CommentPostingException("Akismet thinks that your comment is spam. Try rewriting the comment, or logging in.");
} }
// all checks passed
else {
if($user->is_anonymous()) {
set_prefixed_cookie("nocache", "Anonymous Commenter", time()+60*60*24, "/");
}
$database->Execute(
"INSERT INTO comments(image_id, owner_id, owner_ip, posted, comment) ".
"VALUES(:image_id, :user_id, :remote_addr, now(), :comment)",
array("image_id"=>$image_id, "user_id"=>$user->id, "remote_addr"=>$_SERVER['REMOTE_ADDR'], "comment"=>$comment));
$cid = $database->get_last_insert_id('comments_id_seq');
$snippet = substr($comment, 0, 100);
$snippet = str_replace("\n", " ", $snippet);
$snippet = str_replace("\r", " ", $snippet);
log_info("comment", "Comment #$cid added to Image #$image_id: $snippet", false, array("image_id"=>$image_id, "comment_id"=>$cid));
}
} }
// }}} // }}}
} }