X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/396341b2c3c9cf8f15cc43d3aaec3be759345add..07a08122d926ab6b7741c94bc6c0038ffe0113fb:/IkiWiki/Plugin/template.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 3d088289d..b8c2f05b2 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,48 +4,73 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki;
-use HTML::Template;
+use IkiWiki 3.00;
 use Encode;
 
-sub import { #{{{
-	hook(type => "preprocess", id => "template", call => \&preprocess);
-} # }}}
+sub import {
+	hook(type => "getsetup", id => "template", call => \&getsetup);
+	hook(type => "preprocess", id => "template", call => \&preprocess,
+		scan => 1);
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+			section => "widget",
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 
+	# This needs to run even in scan mode, in order to process
+	# links and other metadata included via the template.
+	my $scan=! defined wantarray;
+
 	if (! exists $params{id}) {
-		return "[[template missing id parameter]]"
+		error gettext("missing id parameter")
+	}
+
+	# The bare id is used, so a page templates/$id can be used as 
+	# the template.
+	my $template;
+	eval {
+		$template=template_depends($params{id}, $params{page},
+			blind_cache => 1);
+	};
+	if ($@) {
+		error gettext("failed to process template:")." $@";
+	}
+	if (! $template) {
+		error sprintf(gettext("%s not found"),
+			htmllink($params{page}, $params{destpage},
+				"/templates/$params{id}"))
 	}
 
-	my $template_page="templates/$params{id}";
-	add_depends($params{page}, $template_page);
-
-	my $template_file=$pagesources{$template_page};
-	return "[[template ".
-	       htmllink($params{page}, $params{destpage}, $template_page).
-	       " not found]]"
-		unless defined $template_file;
-
-	my $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,
-		blind_cache => 1,
-	);
+	$params{basename}=IkiWiki::basename($params{page});
 
 	foreach my $param (keys %params) {
-		$template->param($param => $params{$param});
+		my $value=IkiWiki::preprocess($params{page}, $params{destpage},
+		          IkiWiki::filter($params{page}, $params{destpage},
+		          $params{$param}), $scan);
+		if ($template->query(name => $param)) {
+			my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},
+					pagetype($pagesources{$params{page}}),
+					$value);
+			chomp $htmlvalue;
+			$template->param($param => $htmlvalue);
+		}
+		if ($template->query(name => "raw_$param")) {
+			chomp $value;
+			$template->param("raw_$param" => $value);
+		}
 	}
 
 	return IkiWiki::preprocess($params{page}, $params{destpage},
-		$template->output);
-} # }}}
+	       IkiWiki::filter($params{page}, $params{destpage},
+	       $template->output), $scan);
+}
 
 1