Put old unixauth plugin under git control. Needs some serious attention.

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 42de81bd16defdfbb4535cfd3c373e3bd1e52383..68b001671653000b4907ababf1d63782d834381c 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,15 +5,24 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my %imgdefaults;
 
 
 my %imgdefaults;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "img", call => \&getsetup);

        hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
        hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);

-} #}}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {

        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 


@@ -34,7 +43,8 @@ sub preprocess (@) { #{{{
                return '';
        }
 
                return '';
        }
 

-       push @{$links{$params{page}}}, $image;
+       add_link($params{page}, $image);
+

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


@@ -42,8 +52,8 @@ sub preprocess (@) { #{{{
 
        my $file = bestlink($params{page}, $image);
        my $srcfile = srcfile($file, 1);
 
        my $file = bestlink($params{page}, $image);
        my $srcfile = srcfile($file, 1);

-       if (! defined $srcfile) {
-               error(sprintf(gettext("%s not found"), $image));
+       if (! length $file || ! defined $srcfile) {
+               return htmllink($params{page}, $params{destpage}, $image);

        }
 
        my $dir = $params{page};
        }
 
        my $dir = $params{page};


@@ -56,9 +66,12 @@ sub preprocess (@) { #{{{
        my $r;
 
        if ($params{size} ne 'full') {
        my $r;
 
        if ($params{size} ne 'full') {

-               my ($w, $h) = ($params{size} =~ /^(\d+)x(\d+)$/);
-               error sprintf(gettext('bad size "%s"'), $params{size})
-                       unless (defined $w && defined $h);
+               add_depends($params{page}, $image);
+
+               my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
+               error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
+                       unless (defined $w && defined $h &&
+                               (length $w || length $h));

 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";


@@ -92,8 +105,6 @@ sub preprocess (@) { #{{{
                $imglink = $file;
        }
 
                $imglink = $file;
        }
 

-       add_depends($imglink, $params{page});
-

        my ($fileurl, $imgurl);
        if (! $params{preview}) {
                $fileurl=urlto($file, $params{destpage});
        my ($fileurl, $imgurl);
        if (! $params{preview}) {
                $fileurl=urlto($file, $params{destpage});


@@ -109,10 +120,11 @@ sub preprocess (@) { #{{{
        }
 
        my $imgtag='<img src="'.$imgurl.
        }
 
        my $imgtag='<img src="'.$imgurl.

-               '" alt="'.(exists $params{alt} ? $params{alt} : '').

                '" width="'.$im->Get("width").
                '" height="'.$im->Get("height").'"'.
                '" width="'.$im->Get("width").
                '" height="'.$im->Get("height").'"'.

+               (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').

                (exists $params{title} ? ' title="'.$params{title}.'"' : '').
                (exists $params{title} ? ' title="'.$params{title}.'"' : '').

+               (exists $params{align} ? ' align="'.$params{align}.'"' : '').

                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';


@@ -139,6 +151,6 @@ sub preprocess (@) { #{{{
        else {
                return $imgtag;
        }
        else {
                return $imgtag;
        }

-} #}}}
+}

 
 1
 
 1