web commit from 83.222.23.243: poll vote (Accept only OpenID for logins)

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index b1c9db80c969055edc59227b5c79d83945b7b911..14a32f63542fb827e40ff926771982436e02f59a 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -62,7 +62,7 @@ sub preprocess (@) { #{{{
                        return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
 
                        $r = $im->Resize(geometry => "${w}x${h}");
-                       return "[[img ".sprinftf(gettext("failed to resize: %s"), $r)."]]" if $r;
+                       return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
 
                        # don't actually write file in preview mode
                        if (! $params{preview}) {
@@ -96,9 +96,23 @@ sub preprocess (@) { #{{{
                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").'" /></a>';
+               '" height="'.$im->Get("height").'"'.
+               (exists $params{class} ? ' class="'.$params{class}.'"' : '').
+               (exists $params{id} ? ' id="'.$params{id}.'"' : '').
+               ' />';
+
+       if (! defined $params{link} || lc($params{link}) eq 'yes') {
+               return  '<a href="'.$fileurl.'">'.$imgtag.'</a>';
+       }
+       elsif (length bestlink($params{page}, $params{link})) {
+               return htmllink($params{page}, $params{destpage},
+                       $params{link}, linktext => $imgtag);
+       }
+       else {
+               return $imgtag;
+       }
 } #}}}
 
 1