oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added more keys to the list of bad EXIF keys. CameraID and CameraType seem to make JSON croak...

Browse source 
Fixed issue where bad EXIF cache would kill the entire album
Added more variables for resolutions
Added better handling of Pending albums and photos.
This commit is contained in:
Doug Bell 2008-05-29 18:37:54 +00:00
parent adcd560cba
commit d43065b122
8 changed files with 180 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/WebGUI/Asset/File/GalleryFile/Photo.pm
View file

@ -176,7 +176,19 @@ sub getExifData {
my $self = shift;
return unless $self->get('exifData');
return decode_json( $self->get('exifData') );
# Our processing and eliminating of bad / unparsable keys
# isn't perfect, so handle errors gracefully
my $exif = eval { decode_json( $self->get('exifData') ) };
if ( $@ ) {
$self->session->errorHandler->warn(
"Could not parse JSON data for EXIF in Photo '" . $self->get('title')
. "' (" . $self->getId . "): " . $@
);
return;
}
return $exif;
}
#----------------------------------------------------------------------------
@ -394,8 +406,8 @@ sub updateExifDataFromFile {
}
}
# Remove other, pointless keys
for my $key ( qw( Directory NativeDigest ) ) {
# Remove other, pointless, possibly harmful keys
for my $key ( qw( Directory NativeDigest CameraID CameraType ) ) {
delete $info->{ $key };
}
@ -505,6 +517,8 @@ sub www_edit {
name => "title",
value => ( $form->get("title") || $self->get("title") ),
});
$self->getGallery;
$var->{ form_synopsis }
= WebGUI::Form::HTMLArea( $session, {