Changeset 16904 for gsdl/trunk/perllib/plugins/HTMLPlugin.pm

Timestamp:

2008-08-19T14:56:43+12:00 (16 years ago)

Author:

ak19

Message:

1. The percents in URL-encoded associated images' filenames are only escaped with percent-25s (used in urls referring to URL-encoded filenames) if there aren't any percent-25s already in there. 2. If the html file and assocfiles are already URL encoded it doesn't URL encode them again

File:

• gsdl/trunk/perllib/plugins/HTMLPlugin.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -1109 +1109 @@
     # situations. If the *original* file's name was in URL encoding, the following method will not decode it.
     my $utf8_filename = $filename;
-    
 #    print STDERR "*** filename before URL decoding: $filename\n";
     $filename = $self->opt_url_decode($utf8_filename);
@@ -1150 +1149 @@
     return "_httpdocimg_/$newname";
     } else {
-    ($newname) = $utf8_filename =~ m/([^\/\\]*)$/;
-    
+    if(&unicode::is_url_encoded($utf8_filename)) {
+        # use the possibly-decoded filename instead to avoid double URL encoding
+        ($newname) = $filename =~ m/([^\/\\]*)$/;
+    } else {
+        ($newname) = $utf8_filename =~ m/([^\/\\]*)$/;
+    }
 #   print STDERR "Before url encoding newname: $newname\n";
     # Make sure this name uses only ASCII characters 
@@ -1164 +1167 @@
     # of filenames, URL-encode the additional percent signs of the URL-encoded filename
     my $newname_url = $newname;
-    $newname_url =~ s/%/%25/g;
+    $newname_url =~ s/%/%25/g if $newname_url !~ m/%25/;
     return "_httpdocimg_/$newname_url"; 
     }