add getconfig for inline
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 21:24:52 +0000 (17:24 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 21:24:52 +0000 (17:24 -0400)
Also, moved the pingurl getopt parsing to inline.

IkiWiki/Plugin/inline.pm
ikiwiki.in

index 2f09019431b44fd4c5ab458f44fe90026367d996..3ca4fccdf51307be98b635348e6cb21074250298 100644 (file)
@@ -15,6 +15,7 @@ my $nested=0;
 
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
+       hook(type => "getsetup", id => "inline", call => \&getsetup);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
        hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
        hook(type => "preprocess", id => "inline", 
@@ -39,8 +40,51 @@ sub getopt () { #{{{
                "atom!" => \$config{atom},
                "allowrss!" => \$config{allowrss},
                "allowatom!" => \$config{allowatom},
+               "pingurl=s" => sub {
+                       push @{$config{pingurl}}, $_[1];
+               },      
        );
-}
+} #}}}
+
+sub getsetup () { #{{{
+       return
+               rss => {
+                       type => "boolean",
+                       default => 0,
+                       description => "enable rss feeds by default",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               atom => {
+                       type => "boolean",
+                       default => 0,
+                       description => "enable atom feeds by default",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               allowrss => {
+                       type => "boolean",
+                       default => 0,
+                       description => "allow rss feeds to be used",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               allowatom => {
+                       type => "boolean",
+                       default => 0,
+                       description => "allow atom feeds to be used",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               pingurl => {
+                       type => "string",
+                       default => "",
+                       example => "http://rpc.technorati.com/rpc/ping",
+                       description => "urls to ping (using XMP-RPC) on feed update",
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
 
 sub checkconfig () { #{{{
        if (($config{rss} || $config{atom}) && ! length $config{url}) {
index 3bb881c4320f246b1edd4f9af80014149036d9e4..f48f2cfebcc32c8d6647d1d208ae7b3ad3f24dc0 100755 (executable)
@@ -73,9 +73,6 @@ sub getconfig () { #{{{
                        "disable-plugin=s@" => sub {
                                push @{$config{disable_plugins}}, $_[1];
                        },
-                       "pingurl=s" => sub {
-                               push @{$config{pingurl}}, $_[1];
-                       },
                        "set=s" => sub {
                                my ($var, $val)=split('=', $_[1], 2);
                                if (! defined $var || ! defined $val) {