Changeset 32325

Timestamp:

2018-08-06T20:04:55+12:00 (6 years ago)

Author:

ak19

Message:

Dr Bainbridge worked out the solution to HTMLPlugin not handling embedded base64 encoded images. Fixed!

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

@@ -230 +230 @@
     # some links may just be anchor names
     next unless ($raw_link =~ /\S+/);
-
+    # don't block embedded images, which start with src="data:image..."
+    next if($raw_link =~ m@data\:image@);
+    
     if ($raw_link !~ m@^/@ && $raw_link !~ m/^([A-Z]:?)\\/i) {
         # Turn relative file path into full path
@@ -796 +798 @@
     $file, $doc_obj, $section) = @_;
 
+    # don't modify embedded images. These start with data:image and are base-64 encoded. Return them as is
+    # If we let this method proceed, it will not just mark embedded images as "external links", but will wrongly
+    # clean up double slashes in the base-64 encoded part as single slash, which clobbers the encoding/image.
+    return ($front . $link .$back) if($link =~ m@^[\"\']?data\:image@);
+
+    
     # remove quotes from link at start and end if necessary
     if ($link=~/^[\"\']/) {