X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8576fe4c4913c2ebe678c54f9353ac22c6bdaa84..340fe9707c61064774658e6ec2aec3b07b33c120:/IkiWiki/Plugin/edittemplate.pm?ds=inline

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index b814c0e67..b7651ce02 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -4,14 +4,16 @@ package IkiWiki::Plugin::edittemplate;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use HTML::Template;
+use Encode;
 
 sub import { #{{{
 	hook(type => "needsbuild", id => "edittemplate",
 		call => \&needsbuild);
 	hook(type => "preprocess", id => "edittemplate",
 		call => \&preprocess);
-	hook(type => "formbuilder_setup", id => "edittemplate",
-		call => \&formbuilder_setup);
+	hook(type => "formbuilder", id => "edittemplate",
+		call => \&formbuilder);
 } #}}}
 
 sub needsbuild (@) { #{{{
@@ -19,7 +21,8 @@ sub needsbuild (@) { #{{{
 
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{edittemplate}) {
-			if (grep { $_ eq $pagesources{$page} } @$needsbuild) {
+			if (exists $pagesources{$page} && 
+			    grep { $_ eq $pagesources{$page} } @$needsbuild) {
 				# remove state, it will be re-added
 				# if the preprocessor directive is still
 				# there during the rebuild
@@ -47,15 +50,70 @@ sub preprocess (@) { #{{{
 		$params{template}, $params{match});
 } # }}}
 
-sub formbuilder_setup { #{{{
+sub formbuilder (@) { #{{{
 	my %params=@_;
 	my $form=$params{form};
+
+	return if $form->field("do") ne "create";
 	my $page=$form->field("page");
+	
+	# The tricky bit here is that $page is probably just the base
+	# page name, without any subdir, but the pagespec for a template
+	# probably does include the subdir (ie, "bugs/*"). We don't know
+	# what subdir the user will pick to put the page in. So, try them
+	# all, starting with the one that was made default.
+	my @page_locs=$page;
+	foreach my $field ($form->field) {
+		if ($field eq 'page') {
+			@page_locs=$field->def_value;
+			push @page_locs, $field->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)) {
+						$form->field(name => "editcontent",
+							 value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+						return;
+					}
+				}
+			}
+		}
+	}
+} #}}}
+
+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,
+		);
+	};
+	if ($@) {
+		return "[[pagetemplate ".gettext("failed to process")." $@]]";
+	}
 
-	return if $form->title ne "editpage"
-	          || $form->field("do") ne "create";
+	$template->param(name => $page);
 
-	$form->field(name => "editcontent", value => "hi mom!");
+	return $template->output;
 } #}}}
 
 1