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

Merge branch 'master' of github.com:shish/shimmie2

Browse Source
This commit is contained in:
Shish 2012-02-12 07:47:49 +00:00
commit c640b4ce71
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/report_image/main.php
View File

@ -52,7 +52,7 @@ class ReportImage extends Extension {
} }
else if($event->get_arg(0) == "remove") { else if($event->get_arg(0) == "remove") {
if(isset($_POST['id'])) { if(isset($_POST['id'])) {
if($user->is_admin()) { if($user->can("view_image_reort")) {
send_event(new RemoveReportedImageEvent($_POST['id'])); send_event(new RemoveReportedImageEvent($_POST['id']));
$page->set_mode("redirect"); $page->set_mode("redirect");
$page->set_redirect(make_link("image_report/list")); $page->set_redirect(make_link("image_report/list"));
@ -60,7 +60,7 @@ class ReportImage extends Extension {
} }
} }
else if($event->get_arg(0) == "list") { else if($event->get_arg(0) == "list") {
if($user->is_admin()) { if($user->can("view_image_report")) {
$this->theme->display_reported_images($page, $this->get_reported_images()); $this->theme->display_reported_images($page, $this->get_reported_images());
} }
} }
@ -97,8 +97,10 @@ class ReportImage extends Extension {
public function onUserBlockBuilding(UserBlockBuildingEvent $event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->can("view_image_report")) {
$event->add_link("Reported Images", make_link("image_report/list")); $count = $this->count_reported_images();
$h_count = $count > 0 ? " ($count)" : "";
$event->add_link("Reported Images$h_count", make_link("image_report/list"));
} }
} }
@ -155,6 +157,11 @@ class ReportImage extends Extension {
return $reports; return $reports;
} }
public function count_reported_images() {
global $database;
return $database->get_one("SELECT count(*) FROM image_reports");
}
} }
// ===== Changelog ===== // ===== Changelog =====
// * Version 0.3a / 0.3a_rc - 11/06/07 - I can no longer use the same theme.php file for both SVN and RCx. Sorry. // * Version 0.3a / 0.3a_rc - 11/06/07 - I can no longer use the same theme.php file for both SVN and RCx. Sorry.

3
core/user.class.php
View File

@ -116,6 +116,7 @@ class User {
"edit_image_owner" => False, "edit_image_owner" => False,
"mass_tag_edit" => False, "mass_tag_edit" => False,
"report_image" => $config->get_bool('report_image_anon'), "report_image" => $config->get_bool('report_image_anon'),
"view_image_report" => False,
), ),
"user" => array( "user" => array(
"change_setting" => False, "change_setting" => False,
@ -138,6 +139,7 @@ class User {
"edit_image_owner" => False, "edit_image_owner" => False,
"mass_tag_edit" => False, "mass_tag_edit" => False,
"report_image" => True, "report_image" => True,
"view_image_report" => False,
), ),
"admin" => array( "admin" => array(
"change_setting" => True, "change_setting" => True,
@ -159,6 +161,7 @@ class User {
"edit_image_owner" => True, "edit_image_owner" => True,
"mass_tag_edit" => True, "mass_tag_edit" => True,
"report_image" => True, "report_image" => True,
"view_image_report" => True,
), ),
); );