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 4683b00ba707a51809001dd3baa79f6068a1bf3c..0e7f2e01400d899816e2c94f3be0a1a3f67dd7be 100644 (file)
--- a/IkiWiki/Plugin/skeleton.pm
+++ b/IkiWiki/Plugin/skeleton.pm
@@ -6,41 +6,41 @@ package IkiWiki::Plugin::skeleton;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "getopt", id => "skeleton", 
-               call => \&getopt);
-       IkiWiki::hook(type => "checkconfig", id => "skeleton", 
-               call => \&checkconfig);
-       IkiWiki::hook(type => "preprocess", id => "skeleton", 
-               call => \&preprocess);
-       IkiWiki::hook(type => "filter", id => "skeleton", 
-               call => \&filter);
-       IkiWiki::hook(type => "htmlize", id => "skeleton",
-               call => \&htmlize);
-       IkiWiki::hook(type => "sanitize", id => "skeleton", 
-               call => \&sanitize);
-       IkiWiki::hook(type => "format", id => "skeleton", 
-               call => \&format);
-       IkiWiki::hook(type => "pagetemplate", id => "skeleton", 
-               call => \&pagetemplate);
-       IkiWiki::hook(type => "delete", id => "skeleton", 
-               call => \&delete);
-       IkiWiki::hook(type => "change", id => "skeleton", 
-               call => \&change);
-       IkiWiki::hook(type => "cgi", id => "skeleton", 
-               call => \&cgi);
-       IkiWiki::hook(type => "savestate", id => "savestate", 
-               call => \&savestate);
+       hook(type => "getopt", id => "skeleton",  call => \&getopt);
+       hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+       hook(type => "needsbuild", id => "skeleton", call => \&needsbuild);
+       hook(type => "preprocess", id => "skeleton", call => \&preprocess);
+       hook(type => "filter", id => "skeleton", call => \&filter);
+       hook(type => "htmlize", id => "skeleton", call => \&htmlize);
+       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 => "skeleton", call => \&savestate);

 } # }}}
 
 sub getopt () { #{{{
 } # }}}
 
 sub getopt () { #{{{

-       IkiWiki::debug("skeleton plugin getopt");
+       debug("skeleton plugin getopt");

 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{

-       IkiWiki::debug("skeleton plugin checkconfig");
+       debug("skeleton plugin checkconfig");
+} #}}}
+
+sub needsbuild () { #{{{
+       debug("skeleton plugin needsbuild");

 } #}}}
 
 sub preprocess (@) { #{{{
 } #}}}
 
 sub preprocess (@) { #{{{


@@ -52,33 +52,33 @@ sub preprocess (@) { #{{{
 sub filter (@) { #{{{
        my %params=@_;
        
 sub filter (@) { #{{{
        my %params=@_;
        

-       IkiWiki::debug("skeleton plugin running as filter");
+       debug("skeleton plugin running as filter");

 
        return $params{content};
 } # }}}
 
 
        return $params{content};
 } # }}}
 

-sub htmlize ($) { #{{{
-       my $content=shift;
+sub htmlize (@) { #{{{
+       my %params=@_;

 
 

-       IkiWiki::debug("skeleton plugin running as htmlize");
+       debug("skeleton plugin running as htmlize");

 
 

-       return $content;
+       return $params{content};

 } # }}}
 
 } # }}}
 

-sub sanitize ($) { #{{{
-       my $content=shift;
+sub sanitize (@) { #{{{
+       my %params=@_;

        
        

-       IkiWiki::debug("skeleton plugin running as a sanitizer");
+       debug("skeleton plugin running as a sanitizer");

 
 

-       return $content;
+       return $params{content};

 } # }}}
 
 } # }}}
 

-sub format ($) { #{{{
-       my $content=shift;
+sub format (@) { #{{{
+       my %params=@_;

        
        

-       IkiWiki::debug("skeleton plugin running as a formatter");
+       debug("skeleton plugin running as a formatter");

 
 

-       return $content;
+       return $params{content};

 } # }}}
 
 sub pagetemplate (@) { #{{{
 } # }}}
 
 sub pagetemplate (@) { #{{{


@@ -86,29 +86,78 @@ sub pagetemplate (@) { #{{{
        my $page=$params{page};
        my $template=$params{template};
        
        my $page=$params{page};
        my $template=$params{template};
        

-       IkiWiki::debug("skeleton plugin running as a pagetemplate hook");
+       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=@_;
 
 } # }}}
 
 sub delete (@) { #{{{
        my @files=@_;
 

-       IkiWiki::debug("skeleton plugin told that files were deleted: @files");
+       debug("skeleton plugin told that files were deleted: @files");

 } #}}}
 
 sub change (@) { #{{{
        my @files=@_;
 
 } #}}}
 
 sub change (@) { #{{{
        my @files=@_;
 

-       IkiWiki::debug("skeleton plugin told that changed files were rendered: @files");
+       debug("skeleton plugin told that changed files were rendered: @files");

 } #}}}
 
 sub cgi ($) { #{{{
        my $cgi=shift;
 
 } #}}}
 
 sub cgi ($) { #{{{
        my $cgi=shift;
 

-       IkiWiki::debug("skeleton plugin running in cgi");
+       debug("skeleton plugin running in cgi");
+} #}}}
+
+sub auth ($$) { #{{{
+       my $cgi=shift;
+       my $session=shift;
+
+       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;
+       my $session=shift;
+
+       debug("skeleton plugin running in canedit");
+} #}}}
+
+sub editcontent ($$$) { #{{{
+       my %params=@_;
+
+       debug("skeleton plugin running in editcontent");
+
+       return $params{content};
+} #}}}
+
+sub formbuilder_setup (@) { #{{{
+       my %params=@_;
+       
+       debug("skeleton plugin running in formbuilder_setup");
+} # }}}
+
+sub formbuilder (@) { #{{{
+       my %params=@_;
+       
+       debug("skeleton plugin running in formbuilder");
+} # }}}
+

 sub savestate () { #{{{
 sub savestate () { #{{{

-       IkiWiki::debug("skeleton plugin running in savestate");
+       debug("skeleton plugin running in savestate");

 } #}}}
 
 1
 } #}}}
 
 1