X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..8cfe428a28b2714c57282566466f4f7bdbdfdffb:/IkiWiki/Plugin/template.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 1a4faf05f..b872f0962 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,47 +4,74 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 use HTML::Template;
 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,
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 
 	if (! exists $params{id}) {
-		return "[[template missing id parameter]]"
+		error gettext("missing id parameter")
 	}
 
 	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);
-                },
-                filename => srcfile($template_file),
-                die_on_bad_params => 0,
-		no_includes => 1,
-		blind_cache => 1,
-	);
+	return sprintf(gettext("template %s not found"),
+		htmllink($params{page}, $params{destpage}, "/".$template_page))
+			unless defined $template_file;
+
+	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,
+			blind_cache => 1,
+		);
+	};
+	if ($@) {
+		error gettext("failed to process:")." $@"
+	}
+
+	$params{basename}=IkiWiki::basename($params{page});
 
 	foreach my $param (keys %params) {
-		$template->param($param => $params{$param});
+		if ($template->query(name => $param)) {
+			$template->param($param =>
+				IkiWiki::htmlize($params{page}, $params{destpage},
+					pagetype($pagesources{$params{page}}),
+					$params{$param}));
+		}
+		if ($template->query(name => "raw_$param")) {
+			$template->param("raw_$param" => $params{$param});
+		}
 	}
 
 	return IkiWiki::preprocess($params{page}, $params{destpage},
-		$template->output);
-} # }}}
+		IkiWiki::filter($params{page}, $params{destpage},
+		$template->output));
+}
 
 1