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

Changed upload to detect unrecognized files so that it doesn't just blankly refresh when the type isn't handled

Browse Source
This commit is contained in:
Matthew Barbour 2019-06-14 12:59:58 -05:00 committed by matthew
parent 58acb71282
commit 8950d27d64
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/upload/main.php
View File

@ -27,7 +27,6 @@ class DataUploadEvent extends Event
public $merged = false; public $merged = false;
/** /**
* Some data is being uploaded. * Some data is being uploaded.
* This should be caught by a file handler. * This should be caught by a file handler.
@ -348,6 +347,9 @@ class Upload extends Extension
$event = new DataUploadEvent($file['tmp_name'], $metadata); $event = new DataUploadEvent($file['tmp_name'], $metadata);
send_event($event); send_event($event);
if ($event->image_id == -1) {
throw new UploadException("File type not supported: " . $metadata['extension']);
}
$page->add_http_header("X-Shimmie-Image-ID: " . int_escape($event->image_id)); $page->add_http_header("X-Shimmie-Image-ID: " . int_escape($event->image_id));
} catch (UploadException $ex) { } catch (UploadException $ex) {
$this->theme->display_upload_error( $this->theme->display_upload_error(
@ -441,6 +443,9 @@ class Upload extends Extension
try { try {
$event = new DataUploadEvent($tmp_filename, $metadata); $event = new DataUploadEvent($tmp_filename, $metadata);
send_event($event); send_event($event);
if ($event->image_id == -1) {
throw new UploadException("File type not supported: " . $metadata['extension']);
}
} catch (UploadException $ex) { } catch (UploadException $ex) {
$this->theme->display_upload_error( $this->theme->display_upload_error(
$page, $page,