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

make image metadata optional

Browse Source
This commit is contained in:
Shish 2009-08-09 22:00:59 +01:00
parent a9a9318c41
commit 81987f0e79
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/handle_pixel/theme.php
View File

@ -2,8 +2,11 @@
class PixelFileHandlerTheme extends Themelet { class PixelFileHandlerTheme extends Themelet {
public function display_image(Page $page, Image $image) { public function display_image(Page $page, Image $image) {
global $config;
$ilink = $image->get_image_link(); $ilink = $image->get_image_link();
$html = "<img id='main_image' src='$ilink'>"; $html = "<img id='main_image' src='$ilink'>";
if($config->get_bool("image_show_meta")) {
# FIXME: only read from jpegs? # FIXME: only read from jpegs?
$exif = @exif_read_data($image->get_image_filename(), 0, true); $exif = @exif_read_data($image->get_image_filename(), 0, true);
if($exif) { if($exif) {
@ -19,6 +22,7 @@ class PixelFileHandlerTheme extends Themelet {
$page->add_block(new Block("EXIF Info", $head, "left")); $page->add_block(new Block("EXIF Info", $head, "left"));
} }
} }
}
$page->add_block(new Block("Image", $html, "main", 0)); $page->add_block(new Block("Image", $html, "main", 0));
} }
} }

2
ext/image/main.php
View File

@ -89,6 +89,7 @@ class ImageIO extends SimpleExtension {
$config->set_default_int('thumb_quality', 75); $config->set_default_int('thumb_quality', 75);
$config->set_default_int('thumb_mem_limit', parse_shorthand_int('8MB')); $config->set_default_int('thumb_mem_limit', parse_shorthand_int('8MB'));
$config->set_default_bool('image_show_meta', true);
$config->set_default_string('image_ilink', ''); $config->set_default_string('image_ilink', '');
$config->set_default_string('image_tlink', ''); $config->set_default_string('image_tlink', '');
$config->set_default_string('image_tip', '$tags // $size // $filesize'); $config->set_default_string('image_tip', '$tags // $size // $filesize');
@ -131,6 +132,7 @@ class ImageIO extends SimpleExtension {
//$sb->add_text_option("image_tlink", "<br>Thumbnail link: "); //$sb->add_text_option("image_tlink", "<br>Thumbnail link: ");
$sb->add_text_option("image_tip", "Image tooltip: "); $sb->add_text_option("image_tip", "Image tooltip: ");
$sb->add_choice_option("upload_collision_handler", array('Error'=>'error', 'Merge'=>'merge'), "<br>Upload collision handler: "); $sb->add_choice_option("upload_collision_handler", array('Error'=>'error', 'Merge'=>'merge'), "<br>Upload collision handler: ");
$sb->add_bool_option("image_show_meta", "<br>Show metadata: ");
$event->panel->add_block($sb); $event->panel->add_block($sb);
$thumbers = array(); $thumbers = array();