403 response may be a "not found" too

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

diff --git a/IkiWiki/Plugin/pagetemplate.pm b/IkiWiki/Plugin/pagetemplate.pm
index b5ebf623d19a08d94e669ce1940534141e46e0e1..1d8a84ca77726d5d8486fc632b2606b98e25b5f6 100644 (file)
--- a/IkiWiki/Plugin/pagetemplate.pm
+++ b/IkiWiki/Plugin/pagetemplate.pm
@@ -3,31 +3,41 @@ package IkiWiki::Plugin::pagetemplate;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my %templates;
 
 
 my %templates;
 

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

        hook(type => "preprocess", id => "pagetemplate", call => \&preprocess);
        hook(type => "templatefile", id => "pagetemplate", call => \&templatefile);
        hook(type => "preprocess", id => "pagetemplate", call => \&preprocess);
        hook(type => "templatefile", id => "pagetemplate", call => \&templatefile);

-} # }}}
+}

 
 

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

        my %params=@_;
 
        if (! exists $params{template} ||
            $params{template} !~ /^[-A-Za-z0-9._+]+$/ ||
            ! defined IkiWiki::template_file($params{template})) {
        my %params=@_;
 
        if (! exists $params{template} ||
            $params{template} !~ /^[-A-Za-z0-9._+]+$/ ||
            ! defined IkiWiki::template_file($params{template})) {

-                return "[[pagetemplate ".gettext("bad or missing template")."]]";
+                error gettext("bad or missing template")

        }
 
        if ($params{page} eq $params{destpage}) {
                $templates{$params{page}}=$params{template};
        }
 
        }
 
        if ($params{page} eq $params{destpage}) {
                $templates{$params{page}}=$params{template};
        }
 

-} # }}}
+       return "";
+}

 
 

-sub templatefile (@) { #{{{
+sub templatefile (@) {

        my %params=@_;
 
        if (exists $templates{$params{page}}) {
        my %params=@_;
 
        if (exists $templates{$params{page}}) {


@@ -35,6 +45,6 @@ sub templatefile (@) { #{{{
        }
        
        return undef;
        }
        
        return undef;

-} # }}}
+}

 
 1
 
 1