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

Use the veto error message, not adding blocks from within main.php

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@422 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-08-02 20:49:25 +00:00
parent 15ee93bf9b
commit 064bd7fd01
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ext/image/main.php
View File

@ -34,8 +34,8 @@ class ImageIO extends Extension {
} }
if(is_a($event, 'UploadingImageEvent')) { if(is_a($event, 'UploadingImageEvent')) {
$ok = $this->add_image($event->image); $error = $this->add_image($event->image);
if(!$ok) $event->veto(); if(!empty($error)) $event->veto($error);
} }
if(is_a($event, 'ImageDeletionEvent')) { if(is_a($event, 'ImageDeletionEvent')) {
@ -172,11 +172,9 @@ class ImageIO extends Extension {
*/ */
$existing = $database->get_image_by_hash($image->hash); $existing = $database->get_image_by_hash($image->hash);
if(!is_null($existing)) { if(!is_null($existing)) {
$page->add_block(new Block("Error uploading {$image->filename}", $error = "Image <a href='".make_link("post/view/{$existing->id}")."'>{$existing->id}</a> ".
"Image <a href='".make_link("post/view/{$existing->id}")."'>{$existing->id}</a> ". "already has hash {$image->hash}:<p>".build_thumb_html($existing);
"already has hash {$image->hash}:<p>". return $error;
build_thumb_html($existing)));
return false;
} }
// actually insert the info // actually insert the info
@ -195,27 +193,25 @@ class ImageIO extends Extension {
* insert the image info into the database * insert the image info into the database
*/ */
if(!copy($image->temp_filename, $image->get_image_filename())) { if(!copy($image->temp_filename, $image->get_image_filename())) {
$page->add_block(new Block("Error uploading {$image->filename}",
"The image couldn't be moved from the temporary area to the
main data store -- is the web server allowed to write to '".
($image->get_image_filename())."'?"));
send_event(new ImageDeletionEvent($image->id)); send_event(new ImageDeletionEvent($image->id));
return false; $error = "The image couldn't be moved from the temporary area to the
main data store -- is the web server allowed to write to '".
($image->get_image_filename())."'?";
return $error;
} }
chmod($image->get_image_filename(), 0644); chmod($image->get_image_filename(), 0644);
if(!$this->make_thumb($image->get_image_filename(), $image->get_thumb_filename())) { if(!$this->make_thumb($image->get_image_filename(), $image->get_thumb_filename())) {
$page->add_block(new Block("Error uploading {$image->filename}",
"The image thumbnail couldn't be generated -- is the web
server allowed to write to '".($image->get_thumb_filename())."'?"));
send_event(new ImageDeletionEvent($image->id)); send_event(new ImageDeletionEvent($image->id));
return false; $error="The image thumbnail couldn't be generated -- is the web
server allowed to write to '".($image->get_thumb_filename())."'?";
return $error;
} }
chmod($image->get_thumb_filename(), 0644); chmod($image->get_thumb_filename(), 0644);
send_event(new TagSetEvent($image->id, $image->get_tag_array())); send_event(new TagSetEvent($image->id, $image->get_tag_array()));
return true; return null;
} }
// }}} // }}}
// fetch image {{{ // fetch image {{{