Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
response
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
img.pm
diff --git
a/IkiWiki/Plugin/img.pm
b/IkiWiki/Plugin/img.pm
index 083061bf62b5cf5bcbc91b911dbf7452b4eed69e..eb1b6812482dab4065f40dbe6b8a4ebc96726a49 100644
(file)
--- a/
IkiWiki/Plugin/img.pm
+++ b/
IkiWiki/Plugin/img.pm
@@
-19,6
+19,7
@@
sub getsetup () {
plugin => {
safe => 1,
rebuild => undef,
plugin => {
safe => 1,
rebuild => undef,
+ section => "widget",
},
}
},
}
@@
-26,6
+27,10
@@
sub preprocess (@) {
my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
my %params=@_;
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}) {
if (exists $imgdefaults{$params{page}}) {
foreach my $key (keys %{$imgdefaults{$params{page}}}) {
if (! exists $params{$key}) {
@@
-34,7
+39,7
@@
sub preprocess (@) {
}
}
}
}
- if (! exists $params{size}) {
+ if (! exists $params{size}
|| ! length $params{size}
) {
$params{size}='full';
}
$params{size}='full';
}
@@
-110,16
+115,14
@@
sub preprocess (@) {
$im = Image::Magick->new;
$r = $im->Read($outfile);
error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
$im = Image::Magick->new;
$r = $im->Read($outfile);
error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
-
- $dwidth = $im->Get("width");
- $dheight = $im->Get("height");
}
else {
($dwidth, $dheight)=($w, $h);
$r = $im->Resize(geometry => "${w}x${h}");
error sprintf(gettext("failed to resize: %s"), $r) if $r;
}
else {
($dwidth, $dheight)=($w, $h);
$r = $im->Resize(geometry => "${w}x${h}");
error sprintf(gettext("failed to resize: %s"), $r) if $r;
- # don't actually write file in preview mode
+ # don't actually write resized file in preview mode;
+ # rely on width and height settings
if (! $params{preview}) {
my @blob = $im->ImageToBlob();
writefile($imglink, $config{destdir}, $blob[0], 1);
if (! $params{preview}) {
my @blob = $im->ImageToBlob();
writefile($imglink, $config{destdir}, $blob[0], 1);
@@
-128,6
+131,9
@@
sub preprocess (@) {
$imglink = $file;
}
}
$imglink = $file;
}
}
+
+ $dwidth = $im->Get("width") unless defined $dwidth;
+ $dheight = $im->Get("height") unless defined $dheight;
}
}
else {
}
}
else {
@@
-150,17
+156,20
@@
sub preprocess (@) {
$imgurl="$config{url}/$imglink";
}
$imgurl="$config{url}/$imglink";
}
+ my $attrs='';
+ foreach my $attr (qw{alt title class id hspace vspace}) {
+ if (exists $params{$attr}) {
+ $attrs.=" $attr=\"$params{$attr}\"";
+ }
+ }
+
my $imgtag='<img src="'.$imgurl.
'" width="'.$dwidth.
'" height="'.$dheight.'"'.
my $imgtag='<img src="'.$imgurl.
'" width="'.$dwidth.
'" height="'.$dheight.'"'.
- (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
- (exists $params{title} ? ' title="'.$params{title}.'"' : '').
- (exists $params{class} ? ' class="'.$params{class}.'"' : '').
- (exists $params{id} ? ' id="'.$params{id}.'"' : '').
+ $attrs.
+ (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
' />';
' />';
- my $alignclass=exists $params{align} ? "align-$params{align}" : "";
-
my $link;
if (! defined $params{link}) {
$link=$fileurl;
my $link;
if (! defined $params{link}) {
$link=$fileurl;
@@
-170,9
+179,7
@@
sub preprocess (@) {
}
if (defined $link) {
}
if (defined $link) {
- $imgtag='<a href="'.$link.'"'.
- (!exists $params{caption} && $alignclass ? ' class="'.$alignclass.'"' : '').
- '>'.$imgtag.'</a>';
+ $imgtag='<a href="'.$link.'">'.$imgtag.'</a>';
}
else {
my $b = bestlink($params{page}, $params{link});
}
else {
my $b = bestlink($params{page}, $params{link});
@@
-182,15
+189,13
@@
sub preprocess (@) {
$imgtag=htmllink($params{page}, $params{destpage},
$params{link}, linktext => $imgtag,
noimageinline => 1,
$imgtag=htmllink($params{page}, $params{destpage},
$params{link}, linktext => $imgtag,
noimageinline => 1,
- (!exists $params{caption} && $alignclass) ?
- (class => $alignclass) : (),
);
}
}
if (exists $params{caption}) {
return '<table class="img'.
);
}
}
if (exists $params{caption}) {
return '<table class="img'.
- (
$alignclass ? ' '.$alignclass : ''
).
+ (
exists $params{align} ? " align-$params{align}" : ""
).
'">'.
'<caption>'.$params{caption}.'</caption>'.
'<tr><td>'.$imgtag.'</td></tr>'.
'">'.
'<caption>'.$params{caption}.'</caption>'.
'<tr><td>'.$imgtag.'</td></tr>'.