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

if image replacement is unwanted, don't allow users to replace images

Browse Source
This commit is contained in:
Shish 2012-03-19 11:07:13 +00:00
parent 87c59ead29
commit 1a34557da7
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/image/main.php
View File

@ -201,7 +201,7 @@ class ImageIO extends Extension {
$event->add_part($this->theme->get_deleter_html($event->image->id)); $event->add_part($this->theme->get_deleter_html($event->image->id));
} }
/* In the future, could perhaps allow users to replace images that they own as well... */ /* In the future, could perhaps allow users to replace images that they own as well... */
if ($user->can("replace_image") && $config->get_bool("upload_replace")) { if ($user->can("replace_image")) {
$event->add_part($this->theme->get_replace_html($event->image->id)); $event->add_part($this->theme->get_replace_html($event->image->id));
} }
} }

7
ext/upload/main.php
View File

@ -51,7 +51,6 @@ class Upload extends Extension {
$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); $config->set_default_bool('upload_anon', false);
$config->set_default_bool('upload_replace', true);
// SHIT: fucking PHP "security" measures -_-;;; // SHIT: fucking PHP "security" measures -_-;;;
$free_num = @disk_free_space(realpath("./images/")); $free_num = @disk_free_space(realpath("./images/"));
@ -95,7 +94,6 @@ class Upload extends Extension {
$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_bool_option("upload_anon", "<br/>Allow anonymous uploads: ");
$sb->add_bool_option("upload_replace", "<br/>Allow replacing images: ");
$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);
} }
@ -116,11 +114,6 @@ class Upload extends Extension {
global $config, $page, $user; global $config, $page, $user;
if($event->page_matches("upload/replace")) { if($event->page_matches("upload/replace")) {
/* Upload & Replace Image Request */
if(!$config->get_bool("upload_replace")) {
throw new UploadException("Upload Replacing Images is not enabled.");
}
// check if the user is an administrator and can upload files. // check if the user is an administrator and can upload files.
if(!$user->can("replace_image")) { if(!$user->can("replace_image")) {
$this->theme->display_permission_denied(); $this->theme->display_permission_denied();