autoindex: Switch to using %wikistate instead of abusing $pagestate{index}.

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index b7651ce02b3c71ac96b4a561f3ef5e22738a6a5b..5f0551d9272972d34d685df5ecc57e3802ca054f 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -3,20 +3,31 @@ 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",
                call => \&needsbuild);
        hook(type => "preprocess", id => "edittemplate",
                call => \&preprocess);
        hook(type => "formbuilder", id => "edittemplate",
                call => \&formbuilder);
-} #}}}
-
-sub needsbuild (@) { #{{{
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "web",
+               },
+}
+
+sub needsbuild (@) {
        my $needsbuild=shift;
 
        foreach my $page (keys %pagestate) {
@@ -30,31 +41,38 @@ sub needsbuild (@) { #{{{
                        }
                }
        }
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
         my %params=@_;
 
        return "" if $params{page} ne $params{destpage};
 
        if (! exists $params{template} || ! length($params{template})) {
-               return return "[[meta ".gettext("template not specified")."]]";
+               error gettext("template not specified")
        }
        if (! exists $params{match} || ! length($params{match})) {
-               return return "[[meta ".gettext("match not specified")."]]";
+               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}));
+       add_depends($params{page}, $link, deptype("presence"));
        return sprintf(gettext("edittemplate %s registered for %s"),
-               $params{template}, $params{match});
-} # }}}
+               htmllink($params{page}, $params{destpage}, $link),
+               $params{match});
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
        my %params=@_;
        my $form=$params{form};
 
-       return if $form->field("do") ne "create";
+       return if $form->field("do") ne "create" ||
+               (defined $form->field("editcontent") && length $form->field("editcontent"));
+       
        my $page=$form->field("page");
        
        # The tricky bit here is that $page is probably just the base
@@ -66,26 +84,33 @@ 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}) {
                                foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
                                        if (pagespec_match($p, $pagespec, location => $registering_page)) {
+                                               my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
                                                $form->field(name => "editcontent",
-                                                        value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+                                                        value =>  filltemplate($template, $page));
+                                               $form->field(name => "type",
+                                                        value => pagetype($pagesources{$template}))
+                                                               if $pagesources{$template};
                                                return;
                                        }
                                }
                        }
                }
        }
-} #}}}
+}
 
-sub filltemplate ($$) { #{{{
+sub filltemplate ($$) {
        my $template_page=shift;
        my $page=shift;
 
@@ -108,12 +133,14 @@ sub filltemplate ($$) { #{{{
                );
        };
        if ($@) {
-               return "[[pagetemplate ".gettext("failed to process")." $@]]";
+               # Indicate that the earlier preprocessor directive set 
+               # up a template that doesn't work.
+               return "[[!pagetemplate ".gettext("failed to process")." $@]]";
        }
 
        $template->param(name => $page);
 
        return $template->output;
-} #}}}
+}
 
 1