update

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 6f1919ea04a5621a94a1fae2e746c2d7600411af..f06121578266bedc92027a0624cd05a21cdf6c0f 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -19,6 +19,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
+                       section => "widget",
                },
 }
 
@@ -26,6 +27,10 @@ sub preprocess (@) {
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 
+       if (! defined $image) {
+               error("bad image filename");
+       }
+
        if (exists $imgdefaults{$params{page}}) {
                foreach my $key (keys %{$imgdefaults{$params{page}}}) {
                        if (! exists $params{$key}) {
@@ -156,22 +161,20 @@ sub preprocess (@) {
                (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
                (exists $params{title} ? ' title="'.$params{title}.'"' : '').
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
+               (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
 
-       if (! defined $params{link} || lc($params{link}) eq 'yes') {
-               if (exists $params{caption} || !exists $params{align}) {
-                       $imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
-               } else {
-                       $imgtag='<a href="'.$fileurl.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
-               }
+       my $link;
+       if (! defined $params{link}) {
+               $link=$fileurl;
        }
        elsif ($params{link} =~ /^\w+:\/\//) {
-               if (exists $params{caption} || !exists $params{align}) {
-                       $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
-               } else {
-                       $imgtag='<a href="'.$params{link}.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
-               }
+               $link=$params{link};
+       }
+
+       if (defined $link) {
+               $imgtag='<a href="'.$link.'">'.$imgtag.'</a>';
        }
        else {
                my $b = bestlink($params{page}, $params{link});
@@ -181,14 +184,13 @@ sub preprocess (@) {
                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
                                noimageinline => 1,
-                               (exists $params{caption} || !exists $params{align}) ?
-                                       () : (class => 'align-'.$params{align}));
+                       );
                }
        }
 
        if (exists $params{caption}) {
                return '<table class="img'.
-                       (exists $params{align} ? ' align-'.$params{align} : '').
+                       (exists $params{align} ? " align-$params{align}" : "").
                        '">'.
                        '<caption>'.$params{caption}.'</caption>'.
                        '<tr><td>'.$imgtag.'</td></tr>'.