cherry-pick uri security fix

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

diff --git a/IkiWiki/Plugin/skeleton.pm b/IkiWiki/Plugin/skeleton.pm
index fb4cfe9afada4bc62398f32b208cb9c1490b2ec8..0e7f2e01400d899816e2c94f3be0a1a3f67dd7be 100644 (file)
--- a/IkiWiki/Plugin/skeleton.pm
+++ b/IkiWiki/Plugin/skeleton.pm
@@ -18,14 +18,17 @@ sub import { #{{{
        hook(type => "sanitize", id => "skeleton", call => \&sanitize);
        hook(type => "format", id => "skeleton", call => \&format);
        hook(type => "pagetemplate", id => "skeleton", call => \&pagetemplate);
+       hook(type => "templatefile", id => "skeleton", call => \&templatefile);
        hook(type => "delete", id => "skeleton", call => \&delete);
        hook(type => "change", id => "skeleton", call => \&change);
        hook(type => "cgi", id => "skeleton", call => \&cgi);
        hook(type => "auth", id => "skeleton", call => \&auth);
+       hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
        hook(type => "canedit", id => "skeleton", call => \&canedit);
+       hook(type => "editcontent", id => "skeleton", call => \&editcontent);
        hook(type => "formbuilder_setup", id => "skeleton", call => \&formbuilder_setup);
        hook(type => "formbuilder", id => "skeleton", call => \&formbuilder);
-       hook(type => "savestate", id => "savestate", call => \&savestate);
+       hook(type => "savestate", id => "skeleton", call => \&savestate);
 } # }}}
 
 sub getopt () { #{{{
@@ -86,6 +89,13 @@ sub pagetemplate (@) { #{{{
        debug("skeleton plugin running as a pagetemplate hook");
 } # }}}
 
+sub templatefile (@) { #{{{
+       my %params=@_;
+       my $page=$params{page};
+       
+       debug("skeleton plugin running as a templatefile hook");
+} # }}}
+
 sub delete (@) { #{{{
        my @files=@_;
 
@@ -111,6 +121,13 @@ sub auth ($$) { #{{{
        debug("skeleton plugin running in auth");
 } #}}}
 
+sub sessionncgi ($$) { #{{{
+       my $cgi=shift;
+       my $session=shift;
+
+       debug("skeleton plugin running in sessioncgi");
+} #}}}
+
 sub canedit ($$$) { #{{{
        my $page=shift;
        my $cgi=shift;
@@ -119,6 +136,14 @@ sub canedit ($$$) { #{{{
        debug("skeleton plugin running in canedit");
 } #}}}
 
+sub editcontent ($$$) { #{{{
+       my %params=@_;
+
+       debug("skeleton plugin running in editcontent");
+
+       return $params{content};
+} #}}}
+
 sub formbuilder_setup (@) { #{{{
        my %params=@_;