Changeset 17059

Timestamp:

2008-08-28T13:51:09+12:00 (16 years ago)

Author:

ak19

Message:

The invalid MIMEtype image/jpg for generated images are now changed to the correct MIMEtype image/jpeg (and it's also in lowercase now, just in case).

File:

• gsdl/trunk/perllib/plugins/ImageConverter.pm (modified) (4 diffs)

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -218 +218 @@
 
     if ($image_type ne " ") {
-    $type = $image_type;
+    $type = $self->correct_mime_type($image_type);
     }
 
@@ -251 +251 @@
 
     my $thumbnailsize = $self->{'thumbnailsize'};
-    my $thumbnailtype = $self->{'thumbnailtype'};
+    my $thumbnailtype = $self->correct_mime_type($self->{'thumbnailtype'});
     
     # Generate the thumbnail with convert
@@ -289 +289 @@
     
     my $screenviewsize = $self->{'screenviewsize'};
-    my $screenviewtype = $self->{'screenviewtype'};
+    my $screenviewtype = $self->correct_mime_type($self->{'screenviewtype'});
     
     # make the screenview image
@@ -433 +433 @@
 }
 
+# image/jpg is not a valid mime-type, it ought to be image/jpeg. 
+# Sometimes JPEG is passed in also, want to keep things lowercase just in case.
+sub correct_mime_type {
+    my $self = shift(@_);
+    my ($file_extension) = @_;
+    
+    $file_extension = lc($file_extension);
+    $file_extension =~ s/jpg/jpeg/s; 
+
+    return $file_extension;
+}
+
 1;