| Locked |
- ".($user->can("edit_image_lock") ? "
+ ".($user->can(Permissions::EDIT_IMAGE_LOCK) ? "
$b_locked
" : "
diff --git a/ext/tag_editcloud/main.php b/ext/tag_editcloud/main.php
index 24e6d1a3..0ae9088c 100644
--- a/ext/tag_editcloud/main.php
+++ b/ext/tag_editcloud/main.php
@@ -180,6 +180,6 @@ class TagEditCloud extends Extension
private function can_tag(Image $image): bool
{
global $user;
- return ($user->can("edit_image_tag") && (!$image->is_locked() || $user->can("edit_image_lock")));
+ return ($user->can(Permissions::EDIT_IMAGE_TAG) && (!$image->is_locked() || $user->can(Permissions::EDIT_IMAGE_LOCK)));
}
}
diff --git a/ext/tag_history/main.php b/ext/tag_history/main.php
index 618bd85a..6e241c3e 100644
--- a/ext/tag_history/main.php
+++ b/ext/tag_history/main.php
@@ -35,13 +35,13 @@ class Tag_History extends Extension
if ($event->page_matches("tag_history/revert")) {
// this is a request to revert to a previous version of the tags
- if ($user->can("edit_image_tag")) {
+ if ($user->can(Permissions::EDIT_IMAGE_TAG)) {
if (isset($_POST['revert'])) {
$this->process_revert_request($_POST['revert']);
}
}
} elseif ($event->page_matches("tag_history/bulk_revert")) {
- if ($user->can("bulk_edit_image_tag") && $user->check_auth_token()) {
+ if ($user->can(Permissions::BULK_EDIT_IMAGE_TAG) && $user->check_auth_token()) {
$this->process_bulk_revert_request();
}
} elseif ($event->page_matches("tag_history/all")) {
@@ -85,7 +85,7 @@ class Tag_History extends Extension
public function onUserBlockBuilding(UserBlockBuildingEvent $event)
{
global $user;
- if ($user->can("bulk_edit_image_tag")) {
+ if ($user->can(Permissions::BULK_EDIT_IMAGE_TAG)) {
$event->add_link("Tag Changes", make_link("tag_history/all/1"));
}
}
diff --git a/ext/tag_history/theme.php b/ext/tag_history/theme.php
index dfa1ab41..9e51ccb8 100644
--- a/ext/tag_history/theme.php
+++ b/ext/tag_history/theme.php
@@ -25,7 +25,7 @@ class Tag_HistoryTheme extends Themelet
$current_tags = html_escape($fields['tags']);
$name = $fields['name'];
$date_set = autodate($fields['date_set']);
- $h_ip = $user->can("view_ip") ? " ".show_ip($fields['user_ip'], "Tagging Image #$image_id as '$current_tags'") : "";
+ $h_ip = $user->can(Permissions::VIEW_IP) ? " ".show_ip($fields['user_ip'], "Tagging Image #$image_id as '$current_tags'") : "";
$setter = "".html_escape($name)."$h_ip";
$selected = ($n == 2) ? " checked" : "";
@@ -84,7 +84,7 @@ class Tag_HistoryTheme extends Themelet
$image_id = $fields['image_id'];
$current_tags = html_escape($fields['tags']);
$name = $fields['name'];
- $h_ip = $user->can("view_ip") ? " ".show_ip($fields['user_ip'], "Tagging Image #$image_id as '$current_tags'") : "";
+ $h_ip = $user->can(Permissions::VIEW_IP) ? " ".show_ip($fields['user_ip'], "Tagging Image #$image_id as '$current_tags'") : "";
$setter = "".html_escape($name)."$h_ip";
$history_list .= '
diff --git a/ext/tagger/main.php b/ext/tagger/main.php
index 631da7b4..2653634c 100644
--- a/ext/tagger/main.php
+++ b/ext/tagger/main.php
@@ -12,7 +12,7 @@ class Tagger extends Extension
{
global $page, $user;
- if ($user->can("edit_image_tag") && ($event->image->is_locked() || $user->can("edit_image_lock"))) {
+ if ($user->can(Permissions::EDIT_IMAGE_TAG) && ($event->image->is_locked() || $user->can(Permissions::EDIT_IMAGE_LOCK))) {
$this->theme->build_tagger($page, $event);
}
}
diff --git a/ext/trash/main.php b/ext/trash/main.php
index 89be2aee..bb1b766f 100644
--- a/ext/trash/main.php
+++ b/ext/trash/main.php
@@ -37,7 +37,7 @@ class Trash extends Extension
{
global $page, $user;
- if ($event->page_matches("trash_restore") && $user->can("view_trash")) {
+ if ($event->page_matches("trash_restore") && $user->can(Permissions::VIEW_TRASH)) {
// Try to get the image ID
$image_id = int_escape($event->get_arg(0));
if (empty($image_id)) {
@@ -59,7 +59,7 @@ class Trash extends Extension
{
global $user, $page;
- if($event->image->trash===true && !$user->can("view_trash")) {
+ if($event->image->trash===true && !$user->can(Permissions::VIEW_TRASH)) {
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("post/list"));
}
@@ -87,7 +87,7 @@ class Trash extends Extension
if (preg_match(self::SEARCH_REGEXP, strtolower($event->term), $matches)) {
- if($user->can("view_trash")) {
+ if($user->can(Permissions::VIEW_TRASH)) {
$event->add_querylet(new Querylet($database->scoreql_to_sql("trash = SCORE_BOOL_Y ")));
}
}
@@ -114,7 +114,7 @@ class Trash extends Extension
public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event)
{
global $config, $database, $user;
- if($event->image->trash===true && $user->can("view_trash")) {
+ if($event->image->trash===true && $user->can(Permissions::VIEW_TRASH)) {
$event->add_part($this->theme->get_image_admin_html($event->image->id));
}
}
@@ -123,7 +123,7 @@ class Trash extends Extension
{
global $user;
- if ($user->can("view_trash")&&in_array("in:trash", $event->search_terms)) {
+ if ($user->can(Permissions::VIEW_TRASH)&&in_array("in:trash", $event->search_terms)) {
$event->add_action("bulk_trash_restore","(U)ndelete", "u");
}
}
@@ -134,7 +134,7 @@ class Trash extends Extension
switch ($event->action) {
case "bulk_trash_restore":
- if ($user->can("view_trash")) {
+ if ($user->can(Permissions::VIEW_TRASH)) {
$total = 0;
foreach ($event->items as $image) {
self::set_trash($image->id, false);
diff --git a/ext/upload/main.php b/ext/upload/main.php
index e0274346..ed13c96b 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -155,7 +155,7 @@ class Upload extends Extension
{
global $database, $page, $user;
- if ($user->can("create_image")) {
+ if ($user->can(Permissions::CREATE_IMAGE)) {
if ($this->is_full) {
$this->theme->display_full($page);
} else {
@@ -165,7 +165,7 @@ class Upload extends Extension
if ($event->page_matches("upload/replace")) {
// check if the user is an administrator and can upload files.
- if (!$user->can("replace_image")) {
+ if (!$user->can(Permissions::REPLACE_IMAGE)) {
$this->theme->display_permission_denied();
} else {
if ($this->is_full) {
@@ -221,7 +221,7 @@ class Upload extends Extension
}
}
} elseif ($event->page_matches("upload")) {
- if (!$user->can("create_image")) {
+ if (!$user->can(Permissions::CREATE_IMAGE)) {
$this->theme->display_permission_denied();
} else {
/* Regular Upload Image */
@@ -371,7 +371,7 @@ class Upload extends Extension
$ok = true;
// Checks if user is admin > check if you want locked.
- if ($user->can("edit_image_lock") && !empty($_GET['locked'])) {
+ if ($user->can(Permissions::EDIT_IMAGE_LOCK) && !empty($_GET['locked'])) {
$locked = bool_escape($_GET['locked']);
}
diff --git a/ext/user/main.php b/ext/user/main.php
index b918a845..f7d202af 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -127,7 +127,7 @@ class UserPage extends Extension
$a["name"] = '%' . $_GET['username'] . '%';
}
- if ($user->can('delete_user') && @$_GET['email']) {
+ if ($user->can(Permissions::DELETE_USER) && @$_GET['email']) {
$q .= " AND SCORE_STRNORM(email) LIKE SCORE_STRNORM(:email)";
$a["email"] = '%' . $_GET['email'] . '%';
}
@@ -212,7 +212,7 @@ class UserPage extends Extension
global $user, $config;
$h_join_date = autodate($event->display_user->join_date);
- if ($event->display_user->can("hellbanned")) {
+ if ($event->display_user->can(Permissions::HELLBANNED)) {
$h_class = $event->display_user->class->parent->name;
} else {
$h_class = $event->display_user->class->name;
@@ -250,7 +250,7 @@ class UserPage extends Extension
$this->theme->display_user_links($page, $user, $ubbe->parts);
}
if (
- ($user->can("view_ip") || ($user->is_logged_in() && $user->id == $event->display_user->id)) && # admin or self-user
+ ($user->can(Permissions::VIEW_IP) || ($user->is_logged_in() && $user->id == $event->display_user->id)) && # admin or self-user
($event->display_user->id != $config->get_int('anon_id')) # don't show anon's IP list, it is le huge
) {
$this->theme->display_ip_list(
@@ -309,7 +309,7 @@ class UserPage extends Extension
{
global $user;
$event->add_link("My Profile", make_link("user"));
- if ($user->can("edit_user_class")) {
+ if ($user->can(Permissions::EDIT_USER_CLASS)) {
$event->add_link("User List", make_link("user_admin/list"), 98);
}
$event->add_link("Log Out", make_link("user_admin/logout"), 99);
@@ -337,7 +337,7 @@ class UserPage extends Extension
} elseif (preg_match("/^(?:poster|user)_id[=|:]([0-9]+)$/i", $event->term, $matches)) {
$user_id = int_escape($matches[1]);
$event->add_querylet(new Querylet("images.owner_id = $user_id"));
- } elseif ($user->can("view_ip") && preg_match("/^(?:poster|user)_ip[=|:]([0-9\.]+)$/i", $event->term, $matches)) {
+ } elseif ($user->can(Permissions::VIEW_IP) && preg_match("/^(?:poster|user)_ip[=|:]([0-9\.]+)$/i", $event->term, $matches)) {
$user_ip = $matches[1]; // FIXME: ip_escape?
$event->add_querylet(new Querylet("images.owner_ip = '$user_ip'"));
}
@@ -517,8 +517,8 @@ class UserPage extends Extension
if (
($a->name == $b->name) ||
- ($b->can("protected") && $a->class->name == "admin") ||
- (!$b->can("protected") && $a->can("edit_user_info"))
+ ($b->can(Permissions::PROTECTED) && $a->class->name == "admin") ||
+ (!$b->can(Permissions::PROTECTED) && $a->can(Permissions::EDIT_USER_INFO))
) {
return true;
} else {
@@ -544,7 +544,7 @@ class UserPage extends Extension
{
global $user;
- if ($user->can('edit_user_name') && $this->user_can_edit_user($user, $duser)) {
+ if ($user->can(Permissions::EDIT_USER_NAME) && $this->user_can_edit_user($user, $duser)) {
$duser->set_name($name);
flash_message("Username changed");
// TODO: set login cookie if user changed themselves
@@ -652,7 +652,7 @@ class UserPage extends Extension
$page->set_heading("Error");
$page->add_block(new NavBlock());
- if (!$user->can("delete_user")) {
+ if (!$user->can(Permissions::DELETE_USER)) {
$page->add_block(new Block("Not Admin", "Only admins can delete accounts"));
} elseif (!isset($_POST['id']) || !is_numeric($_POST['id'])) {
$page->add_block(new Block(
diff --git a/ext/user/theme.php b/ext/user/theme.php
index 45f6f08f..c773dd0e 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -26,7 +26,7 @@ class UserPageTheme extends Themelet
$html .= " |
|
diff --git a/ext/wiki/main.php b/ext/wiki/main.php
index 7279b630..65d29ae0 100644
--- a/ext/wiki/main.php
+++ b/ext/wiki/main.php
@@ -206,7 +206,7 @@ class Wiki extends Extension
}
// anon / user can edit if allowed by config
- if ($user->can("edit_wiki_page")) {
+ if ($user->can(Permissions::EDIT_WIKI_PAGE)) {
return true;
}
diff --git a/themes/danbooru/comment.theme.php b/themes/danbooru/comment.theme.php
index 03e094bc..0b40f418 100644
--- a/themes/danbooru/comment.theme.php
+++ b/themes/danbooru/comment.theme.php
@@ -104,7 +104,7 @@ class CustomCommentListTheme extends CommentListTheme
$h_userlink = "$h_name";
$h_del = "";
- if ($user->can("delete_comment")) {
+ if ($user->can(Permissions::DELETE_COMMENT)) {
$comment_preview = substr(html_unescape($tfe->stripped), 0, 50);
$j_delete_confirm_message = json_encode("Delete comment by {$comment->owner_name}:\n$comment_preview");
$h_delete_script = html_escape("return confirm($j_delete_confirm_message);");
diff --git a/themes/danbooru/view.theme.php b/themes/danbooru/view.theme.php
index f113541a..3b448c2e 100644
--- a/themes/danbooru/view.theme.php
+++ b/themes/danbooru/view.theme.php
@@ -23,7 +23,7 @@ class CustomViewImageTheme extends ViewImageTheme
$h_filesize = to_shorthand_int($image->filesize);
global $user;
- if ($user->can("view_ip")) {
+ if ($user->can(Permissions::VIEW_IP)) {
$h_ownerlink .= " ($h_ip)";
}
diff --git a/themes/danbooru2/comment.theme.php b/themes/danbooru2/comment.theme.php
index f043f445..94d56eda 100644
--- a/themes/danbooru2/comment.theme.php
+++ b/themes/danbooru2/comment.theme.php
@@ -105,7 +105,7 @@ class CustomCommentListTheme extends CommentListTheme
$h_userlink = "$h_name";
$h_del = "";
- if ($user->can("delete_comment")) {
+ if ($user->can(Permissions::DELETE_COMMENT)) {
$comment_preview = substr(html_unescape($tfe->stripped), 0, 50);
$j_delete_confirm_message = json_encode("Delete comment by {$comment->owner_name}:\n$comment_preview");
$h_delete_script = html_escape("return confirm($j_delete_confirm_message);");
diff --git a/themes/danbooru2/view.theme.php b/themes/danbooru2/view.theme.php
index 237f1a8c..3e588307 100644
--- a/themes/danbooru2/view.theme.php
+++ b/themes/danbooru2/view.theme.php
@@ -22,7 +22,7 @@ class CustomViewImageTheme extends ViewImageTheme
$h_filesize = to_shorthand_int($image->filesize);
global $user;
- if ($user->can("view_ip")) {
+ if ($user->can(Permissions::VIEW_IP)) {
$h_ownerlink .= " ($h_ip)";
}
diff --git a/themes/futaba/comment.theme.php b/themes/futaba/comment.theme.php
index 2fd0a6ad..7647c322 100644
--- a/themes/futaba/comment.theme.php
+++ b/themes/futaba/comment.theme.php
@@ -78,7 +78,7 @@ class CustomCommentListTheme extends CommentListTheme
$h_userlink = "$h_name";
$h_date = $comment->posted;
$h_del = "";
- if ($user->can("delete_comment")) {
+ if ($user->can(Permissions::DELETE_COMMENT)) {
$comment_preview = substr(html_unescape($tfe->stripped), 0, 50);
$j_delete_confirm_message = json_encode("Delete comment by {$comment->owner_name}:\n$comment_preview");
$h_delete_script = html_escape("return confirm($j_delete_confirm_message);");
diff --git a/themes/lite/view.theme.php b/themes/lite/view.theme.php
index a4613467..aea9b028 100644
--- a/themes/lite/view.theme.php
+++ b/themes/lite/view.theme.php
@@ -23,7 +23,7 @@ class CustomViewImageTheme extends ViewImageTheme
$h_filesize = to_shorthand_int($image->filesize);
global $user;
- if ($user->can("view_ip")) {
+ if ($user->can(Permissions::VIEW_IP)) {
$h_ownerlink .= " ($h_ip)";
}
diff --git a/themes/material/view.theme.php b/themes/material/view.theme.php
index eafdf3f4..71edf7c6 100644
--- a/themes/material/view.theme.php
+++ b/themes/material/view.theme.php
@@ -57,8 +57,8 @@ class CustomViewImageTheme extends ViewImageTheme
$html .= $part;
}
if (
- (!$image->is_locked() || $user->can("edit_image_lock")) &&
- $user->can("edit_image_tag")
+ (!$image->is_locked() || $user->can(Permissions::EDIT_IMAGE_LOCK)) &&
+ $user->can(Permissions::EDIT_IMAGE_TAG)
) {
$html .= "
|
![](\"//www.gravatar.com/avatar/$hash.jpg?cacheBreak=$cb\")