X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e9e75f5f29d78b0631f98d9b0fa93184fcb181fe..e4516078cc7c5e9148a0f079e3d9a71eeccd4155:/IkiWiki/Plugin/skeleton.pm.example?ds=inline

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 30c8dbd5c..f9caef40c 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -20,22 +20,29 @@ sub import {
 	hook(type => "scan", id => "skeleton", call => \&scan);
 	hook(type => "htmlize", id => "skeleton", call => \&htmlize);
 	hook(type => "sanitize", id => "skeleton", call => \&sanitize);
-	hook(type => "postscan", id => "skeleton", call => \&postscan);
+	hook(type => "indexhtml", id => "skeleton", call => \&indexhtml);
 	hook(type => "format", id => "skeleton", call => \&format);
 	hook(type => "pagetemplate", id => "skeleton", call => \&pagetemplate);
 	hook(type => "templatefile", id => "skeleton", call => \&templatefile);
+	hook(type => "pageactions", id => "skeleton", call => \&pageactions);
 	hook(type => "delete", id => "skeleton", call => \&delete);
-	hook(type => "change", id => "skeleton", call => \&change);
+	hook(type => "rendered", id => "skeleton", call => \&rendered);
+	hook(type => "changes", id => "skeleton", call => \&changes);
 	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 => "cansave", id => "skeleton", call => \&cansave);
+	hook(type => "canremove", id => "skeleton", call => \&canremove);
+	hook(type => "canrename", id => "skeleton", call => \&canrename);
 	hook(type => "checkcontent", id => "skeleton", call => \&checkcontent);
 	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 => "renamepage", id => "skeleton", call => \&renamepage);
+	hook(type => "rename", id => "skeleton", call => \&rename);
 	hook(type => "savestate", id => "skeleton", call => \&savestate);
+	hook(type => "genwrapper", id => "skeleton", call => \&genwrapper);
+	hook(type => "disable", id => "skeleton", call => \&disable);
 }
 
 sub getopt () {
@@ -65,8 +72,12 @@ sub refresh () {
 	debug("skeleton plugin refresh");
 }
 
-sub needsbuild () {
+sub needsbuild ($) {
+	my $needsbuild=shift;
+
 	debug("skeleton plugin needsbuild");
+
+	return $needsbuild;
 }
 
 sub preprocess (@) {
@@ -113,10 +124,10 @@ sub sanitize (@) {
 	return $params{content};
 }
 
-sub postscan (@) {
+sub indexhtml (@) {
 	my %params=@_;
 	
-	debug("skeleton plugin running as postscan");
+	debug("skeleton plugin running as indexhtml");
 }
 
 sub format (@) {
@@ -142,16 +153,30 @@ sub templatefile (@) {
 	debug("skeleton plugin running as a templatefile hook");
 }
 
+sub pageactions (@) {
+	my %params=@_;
+	my $page=$params{page};
+
+	debug("skeleton plugin running as a pageactions hook");
+	return ();
+}
+
 sub delete (@) {
 	my @files=@_;
 
 	debug("skeleton plugin told that files were deleted: @files");
 }
 
-sub change (@) {
+sub rendered (@) {
+	my @files=@_;
+
+	debug("skeleton plugin told that files were rendered: @files");
+}
+
+sub changes (@) {
 	my @files=@_;
 
-	debug("skeleton plugin told that changed files were rendered: @files");
+	debug("skeleton plugin told that files were changed: @files");
 }
 
 sub cgi ($) {
@@ -182,36 +207,22 @@ sub canedit ($$$) {
 	debug("skeleton plugin running in canedit");
 }
 
-<<<<<<< HEAD:IkiWiki/Plugin/skeleton.pm.example
-sub cansave ($$$$) {
-	my $page=shift;
-	my $content=shift;
-	my $cgi=shift;
-	my $session=shift;
-
-	debug("skeleton plugin running in cansave");
-}
-
-sub canremove ($$$) {
-	my $page=shift;
-	my $cgi=shift;
-	my $session=shift;
+sub canremove (@) {
+	my %params=@_;
 
 	debug("skeleton plugin running in canremove");
 }
 
-sub canrename ($$$) {
-	my $page=shift;
-	my $cgi=shift;
-	my $session=shift;
+sub canrename (@) {
+	my %params=@_;
 
 	debug("skeleton plugin running in canrename");
-=======
+}
+
 sub checkcontent (@) {
 	my %params=@_;
 
 	debug("skeleton plugin running in checkcontent");
->>>>>>> upstream/master:IkiWiki/Plugin/skeleton.pm.example
 }
 
 sub editcontent ($$$) {
@@ -234,8 +245,28 @@ sub formbuilder (@) {
 	debug("skeleton plugin running in formbuilder");
 }
 
+sub renamepage (@) {
+	my %params=@_;
+	
+	debug("skeleton plugin running in renamepage");
+}
+
+sub rename (@) {
+	my %params=@_;
+	
+	debug("skeleton plugin running in rename");
+}
+
 sub savestate () {
 	debug("skeleton plugin running in savestate");
 }
 
+sub genwrapper () {
+	debug("skeleton plugin running in genwrapper");
+}
+
+sub disable () {
+	debug("skeleton plugin running in disable");
+}
+
 1