realm is an url pattern

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index f8b5174ff2f0d56ef37a02df9c2a0ab6794a3a17..d6507201080da9915cf318d2bc63f811b4fac79a 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -3,11 +3,11 @@ package IkiWiki::Plugin::edittemplate;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Template;
 use Encode;
 
-sub import { #{{{
+sub import {
        hook(type => "getsetup", id => "edittemplate",
                call => \&getsetup);
        hook(type => "needsbuild", id => "edittemplate",
@@ -16,17 +16,18 @@ sub import { #{{{
                call => \&preprocess);
        hook(type => "formbuilder", id => "edittemplate",
                call => \&formbuilder);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        return
                plugin => {
                        safe => 1,
                        rebuild => undef,
+                       section => "web",
                },
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
        my $needsbuild=shift;
 
        foreach my $page (keys %pagestate) {
@@ -40,9 +41,9 @@ sub needsbuild (@) { #{{{
                        }
                }
        }
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
         my %params=@_;
 
        return "" if $params{page} ne $params{destpage};
@@ -54,19 +55,18 @@ sub preprocess (@) { #{{{
                error gettext("match not specified")
        }
 
-       $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
+       my $link=linkpage($params{template});
+       my $bestlink=bestlink($params{page}, $link);
+       $pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 
        return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-
-       my $link=IkiWiki::linkpage($params{template});
-       add_depends($params{page}, $link);
-       my $linkHTML = htmllink($params{page}, $params{destpage}, $link);
-
+       add_depends($params{page}, $link, deptype("presence"));
        return sprintf(gettext("edittemplate %s registered for %s"),
-               $linkHTML, $params{match});
-} # }}}
+               htmllink($params{page}, $params{destpage}, $link),
+               $params{match});
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
        my %params=@_;
        my $form=$params{form};
 
@@ -84,10 +84,13 @@ sub formbuilder (@) { #{{{
        foreach my $field ($form->field) {
                if ($field eq 'page') {
                        @page_locs=$field->def_value;
-                       push @page_locs, $field->options;
+
+                       # FormBuilder is on the bad crack. See #551499
+                       my @options=map { ref $_ ? @$_ : $_ } $field->options;
+
+                       push @page_locs, @options;
                }
        }
-
        foreach my $p (@page_locs) {
                foreach my $registering_page (keys %pagestate) {
                        if (exists $pagestate{$registering_page}{edittemplate}) {
@@ -105,39 +108,29 @@ sub formbuilder (@) { #{{{
                        }
                }
        }
-} #}}}
+}
 
-sub filltemplate ($$) { #{{{
+sub filltemplate ($$) {
        my $template_page=shift;
        my $page=shift;
 
-       my $template_file=$pagesources{$template_page};
-       if (! defined $template_file) {
-               return;
-       }
-
        my $template;
        eval {
-               $template=HTML::Template->new(
-                       filter => sub {
-                               my $text_ref = shift;
-                               $$text_ref=&Encode::decode_utf8($$text_ref);
-                               chomp $$text_ref;
-                       },
-                       filename => srcfile($template_file),
-                       die_on_bad_params => 0,
-                       no_includes => 1,
-               );
+               # force page name absolute so it doesn't look in templates/
+               $template=template("/".$template_page);
        };
        if ($@) {
                # Indicate that the earlier preprocessor directive set 
                # up a template that doesn't work.
-               return "[[!pagetemplate ".gettext("failed to process")." $@]]";
+               return "[[!pagetemplate ".gettext("failed to process template:")." $@]]";
+       }
+       if (! defined $template) {
+               return;
        }
 
        $template->param(name => $page);
 
        return $template->output;
-} #}}}
+}
 
 1