Changeset 11286

Timestamp:

2006-02-17T16:49:46+13:00 (18 years ago)

Author:

kjdon

Message:

Richards (DLC) fixes for allowing single quotes to surround href, src etc attributes

File:

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

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -466 +466 @@
 
     # usemap="./#index" not handled correctly => change to "#index"
-    $$textref =~ s/(<img[^>]*?usemap\s*=\s*\"?)([^\">\s]+)(\"?[^>]*>)/
+    $$textref =~ s/(<img[^>]*?usemap\s*=\s*[\"\']?)([^\"\'>\s]+)([\"\']?[^>]*>)/
         $self->replace_usemap_links($1, $2, $3)/isge;
 
-    $$textref =~ s/(<(?:a|area|frame|link|script)\s+[^>]*?\s*(?:href|src)\s*=\s*\"?)([^\">\s]+)(\"?[^>]*>)/
+    $$textref =~ s/(<(?:a|area|frame|link|script)\s+[^>]*?\s*(?:href|src)\s*=\s*[\"\']?)([^\"\'>\s]+)([\"\']?[^>]*>)/
         $self->replace_href_links ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge;
     }
@@ -476 +476 @@
 
     # allow spaces if inside quotes - jrm21
-    $$textref =~ s/(<(?:img|embed|table|tr|td)[^>]*?(?:src|background)\s*=\s*)(\"[^\"]+\"|[^\s>]+)([^>]*>)/
+    $$textref =~ s/(<(?:img|embed|table|tr|td)[^>]*?(?:src|background)\s*=\s*)([\"\'][^\"\']+[\"\']|[^\s>]+)([^>]*>)/
     $self->replace_images ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge;
 
@@ -493 +493 @@
 
     # remove quotes from link at start and end if necessary
-    if ($link=~/^\"/) {
-    $link=~s/^\"//;$link=~s/\"$//;
+    if ($link=~/^[\"\']/) {
+    $link=~s/^[\"\']//;$link=~s/[\"\']$//;
     $front.='"';
     $back="\"$back";