Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm
index ba02325ff7e1b8a8089797952623c9e4f4cd77b0..2be983693d7d2d67f5cbd39a93b19c0885f6cfa6 100644 (file)
--- a/IkiWiki/Plugin/anonok.pm
+++ b/IkiWiki/Plugin/anonok.pm
@@ -6,9 +6,26 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 use IkiWiki 2.00;
 
 sub import { #{{{

-       hook(type => "canedit", id => "anonok", call => \&canedit,);
+       hook(type => "getsetup", id => "anonok", call => \&getsetup);
+       hook(type => "canedit", id => "anonok", call => \&canedit);

 } # }}}
 
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+               anonok_pagespec => {
+                       type => "pagespec",
+                       example => "*/discussion",
+                       description => "PageSpec to limit which pages anonymous users can edit",
+                       link => "ikiwiki/PageSpec",
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
+

 sub canedit ($$$) { #{{{
        my $page=shift;
        my $cgi=shift;
 sub canedit ($$$) { #{{{
        my $page=shift;
        my $cgi=shift;


@@ -16,7 +33,7 @@ sub canedit ($$$) { #{{{
 
        my $ret;
 
 
        my $ret;
 

-       if (length $config{anonok_pagespec}) {
+       if (exists $config{anonok_pagespec} && length $config{anonok_pagespec}) {

                if (pagespec_match($page, $config{anonok_pagespec},
                                   location => $page)) {
                        return "";
                if (pagespec_match($page, $config{anonok_pagespec},
                                   location => $page)) {
                        return "";