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

upload_anon bool -> create_image perm

Browse source
This commit is contained in:
Shish 2012-03-19 12:59:02 +00:00
parent f99c186ee5
commit bca3dd919d
4 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/danbooru_api/main.php
View file

@ -112,7 +112,7 @@ class DanbooruApi extends Extension {
// Now we check if a file was uploaded or a url was provided to transload // Now we check if a file was uploaded or a url was provided to transload
// Much of this code is borrowed from /ext/upload // Much of this code is borrowed from /ext/upload
if($config->get_bool("upload_anon") || !$user->is_anonymous()) if($user->can("create_image"))
{ {
$file = null; $file = null;
$filename = ""; $filename = "";

9
contrib/oekaki/main.php
View file

@ -10,7 +10,7 @@ class Oekaki extends Extension {
global $user, $page; global $user, $page;
if($event->page_matches("oekaki")) { if($event->page_matches("oekaki")) {
if(!$this->can_upload($user)) { if(!$user->can("create_image")) {
$this->theme->display_permission_denied(); $this->theme->display_permission_denied();
} }
@ -84,14 +84,9 @@ class Oekaki extends Extension {
// FIXME: "edit this image" button on existing images? // FIXME: "edit this image" button on existing images?
function onPostListBuilding(PostListBuildingEvent $event) { function onPostListBuilding(PostListBuildingEvent $event) {
global $user, $page; global $user, $page;
if($this->can_upload($user)) { if($user->can("create_image")) {
$this->theme->display_block($page); $this->theme->display_block($page);
} }
} }
private function can_upload($user) {
global $config;
return ($config->get_bool("upload_anon") || !$user->is_anonymous());
}
} }
?> ?>

3
core/userclass.class.php
View file

@ -57,6 +57,7 @@ new UserClass("base", null, array(
"delete_comment" => False, "delete_comment" => False,
"replace_image" => False, "replace_image" => False,
"create_image" => False,
"edit_image_tag" => False, "edit_image_tag" => False,
"edit_image_source" => False, "edit_image_source" => False,
"edit_image_owner" => False, "edit_image_owner" => False,
@ -74,6 +75,7 @@ new UserClass("anonymous", "base", array(
new UserClass("user", "base", array( new UserClass("user", "base", array(
"big_search" => True, "big_search" => True,
"create_image" => True,
"edit_image_tag" => True, "edit_image_tag" => True,
"edit_image_source" => True, "edit_image_source" => True,
"create_image_report" => True, "create_image_report" => True,
@ -89,6 +91,7 @@ new UserClass("admin", "base", array(
"edit_user_password" => True, "edit_user_password" => True,
"edit_user_info" => True, "edit_user_info" => True,
"delete_user" => True, "delete_user" => True,
"create_image" => True,
"delete_image" => True, "delete_image" => True,
"delete_comment" => True, "delete_comment" => True,
"replace_image" => True, "replace_image" => True,

16
ext/upload/main.php
View file

@ -50,7 +50,6 @@ class Upload extends Extension {
global $config; global $config;
$config->set_default_int('upload_count', 3); $config->set_default_int('upload_count', 3);
$config->set_default_int('upload_size', '1MB'); $config->set_default_int('upload_size', '1MB');
$config->set_default_bool('upload_anon', false);
// SHIT: fucking PHP "security" measures -_-;;; // SHIT: fucking PHP "security" measures -_-;;;
$free_num = @disk_free_space(realpath("./images/")); $free_num = @disk_free_space(realpath("./images/"));
@ -67,7 +66,7 @@ class Upload extends Extension {
public function onPostListBuilding(PostListBuildingEvent $event) { public function onPostListBuilding(PostListBuildingEvent $event) {
global $user, $page; global $user, $page;
if($this->can_upload($user)) { if($user->can("create_image")) {
if($this->is_full) { if($this->is_full) {
$this->theme->display_full($page); $this->theme->display_full($page);
} }
@ -93,7 +92,6 @@ class Upload extends Extension {
$sb->add_label("<i>PHP Limit = ".ini_get('max_file_uploads')."</i>"); $sb->add_label("<i>PHP Limit = ".ini_get('max_file_uploads')."</i>");
$sb->add_shorthand_int_option("upload_size", "<br/>Max size per file: "); $sb->add_shorthand_int_option("upload_size", "<br/>Max size per file: ");
$sb->add_label("<i>PHP Limit = ".ini_get('upload_max_filesize')."</i>"); $sb->add_label("<i>PHP Limit = ".ini_get('upload_max_filesize')."</i>");
$sb->add_bool_option("upload_anon", "<br/>Allow anonymous uploads: ");
$sb->add_choice_option("transload_engine", $tes, "<br/>Transload: "); $sb->add_choice_option("transload_engine", $tes, "<br/>Transload: ");
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
@ -173,7 +171,7 @@ class Upload extends Extension {
} }
} }
else if($event->page_matches("upload")) { else if($event->page_matches("upload")) {
if(!$this->can_upload($user)) { if(!$user->can("create_image")) {
$this->theme->display_permission_denied(); $this->theme->display_permission_denied();
} }
else { else {
@ -227,16 +225,6 @@ class Upload extends Extension {
// do things {{{ // do things {{{
/**
* Check if a given user can upload.
* @param $user The user to check.
* @retval bool
*/
private function can_upload(User $user) {
global $config;
return ($config->get_bool("upload_anon") || !$user->is_anonymous());
}
/** /**
* Returns a descriptive error message for the specified PHP error code. * Returns a descriptive error message for the specified PHP error code.
* *