allow template pages to not be under templates/

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0aaf605694d9fc2a53cb5c527a3b2e38e11da506..78612cd089e41aef71def2c386b7f23b5fc89ba4 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1653,9 +1653,20 @@ sub saveindex () {
 
 sub template_file ($) {
        my $name=shift;
+       
+       my $tpage=($name =~ /^\//) ? $name : "templates/$name";
+       if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
+               $tpage=$pagesources{$tpage};
+               $name.=".tmpl";
+       }
+
+       my $template=srcfile($tpage, 1);
+       if (defined $template) {
+               return $template, $tpage if wantarray;
+               return $template;
+       }
 
-       my $template=srcfile("templates/$name", 1);
-       return $template if defined $template;
+       $name=~s:/::; # avoid path traversal
        
        foreach my $dir ($config{templatedir},
                         "$installdir/share/ikiwiki/templates") {
@@ -1664,18 +1675,16 @@ sub template_file ($) {
        return;
 }
 
-sub template ($;@) {
-       template_depends(shift, undef, @_);
-}
-
 sub template_depends ($$;@) {
        my $name=shift;
        my $page=shift;
-
-       if (defined $page) {
-               add_depends($page, "templates/$name");
+       
+       my ($filename, $tpage)=template_file($name);
+       if (defined $page && defined $tpage) {
+               add_depends($page, $tpage);
        }
-       my $filename=template_file($name);
+
+       return unless defined $filename;
 
        require HTML::Template;
        return HTML::Template->new(
@@ -1691,6 +1700,10 @@ sub template_depends ($$;@) {
        );
 }
 
+sub template ($;@) {
+       template_depends(shift, undef, @_);
+}
+
 sub misctemplate ($$;@) {
        my $title=shift;
        my $pagebody=shift;