X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e68cce6d1d51a513f54ab7d7e77e7c249aad3c06..4af4d26582f0c2b915d7102fb4a604b176385748:/IkiWiki/Plugin/img.pm diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 83f003629..82db15a7e 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -26,6 +26,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,24 +160,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=''.$imgtag.''; - } - else { - $imgtag=''.$imgtag.''; - } + my $link; + if (! defined $params{link}) { + $link=$fileurl; } elsif ($params{link} =~ /^\w+:\/\//) { - if (exists $params{caption} || !exists $params{align}) { - $imgtag=''.$imgtag.''; - } - else { - $imgtag=''.$imgtag.''; - } + $link=$params{link}; + } + + if (defined $link) { + $imgtag=''.$imgtag.''; } else { my $b = bestlink($params{page}, $params{link}); @@ -183,14 +183,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 '
'.$imgtag.' |