Also filter the attributes cite, longdesc, and usemap, which can contain URIs

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a453a49ba43321c1261ae12db846c1c3adb88c5e..b6e7c9e41db20db9639ec7927a2994a0560a799e 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -32,6 +32,11 @@ sub preprocess (@) { #{{{
        }
 
        push @{$links{$params{page}}}, $image;
        }
 
        push @{$links{$params{page}}}, $image;

+       # optimisation: detect scan mode, and avoid generating the image
+       if (! defined wantarray) {
+               return;
+       }
+

        my $file = bestlink($params{page}, $image);
 
        my $dir = $params{page};
        my $file = bestlink($params{page}, $image);
 
        my $dir = $params{page};


@@ -96,12 +101,28 @@ sub preprocess (@) { #{{{
                return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
        }
 
                return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
        }
 

-       return '<a href="'.$fileurl.'"><img src="'.$imgurl.
+       my $imgtag='<img src="'.$imgurl.

                '" alt="'.$alt.'" width="'.$im->Get("width").
                '" height="'.$im->Get("height").'"'.
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                '" alt="'.$alt.'" width="'.$im->Get("width").
                '" height="'.$im->Get("height").'"'.
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').

-               ' /></a>';
+               ' />';
+
+       if (! defined $params{link} || lc($params{link}) eq 'yes') {
+               return  '<a href="'.$fileurl.'">'.$imgtag.'</a>';
+       }
+       elsif ($params{link} =~ /^\w+:\/\//) {
+               return  '<a href="'.$params{link}.'">'.$imgtag.'</a>';
+       }
+       elsif (length bestlink($params{page}, $params{link})) {
+               add_depends($params{page}, $params{link});
+               return htmllink($params{page}, $params{destpage},
+                       $params{link}, linktext => $imgtag,
+                       noimageinline => 1);
+       }
+       else {
+               return $imgtag;
+       }

 } #}}}
 
 1
 } #}}}
 
 1