Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 525fcb0e5d7fd0e074036421d74a3bc59b2dc33e..f6cac6cdd8c69b520824c2557d14d9a9ea3d5fdc 100644 (file)
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -14,6 +14,10 @@ sub import { #{{{
 
 sub getsetup () { #{{{
        return
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },

                locked_pages => {
                        type => "pagespec",
                        example => "!*/Discussion",
                locked_pages => {
                        type => "pagespec",
                        example => "!*/Discussion",


@@ -33,7 +37,10 @@ sub canedit ($$) { #{{{
        return undef if defined $user && IkiWiki::is_admin($user);
 
        if (defined $config{locked_pages} && length $config{locked_pages} &&
        return undef if defined $user && IkiWiki::is_admin($user);
 
        if (defined $config{locked_pages} && length $config{locked_pages} &&

-           pagespec_match($page, $config{locked_pages})) {
+           pagespec_match($page, $config{locked_pages},
+                   user => $session->param("name"),
+                   ip => $ENV{REMOTE_ADDR},
+           )) {

                if (! defined $user ||
                    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
                        return sub { IkiWiki::needsignin($cgi, $session) };
                if (! defined $user ||
                    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
                        return sub { IkiWiki::needsignin($cgi, $session) };


@@ -47,7 +54,10 @@ sub canedit ($$) { #{{{
 
        # XXX deprecated, should be removed eventually
        foreach my $admin (@{$config{adminuser}}) {
 
        # XXX deprecated, should be removed eventually
        foreach my $admin (@{$config{adminuser}}) {

-               if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) {
+               if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"),
+                   user => $session->param("name"),
+                   ip => $ENV{REMOTE_ADDR},
+               )) {

                        if (! defined $user ||
                            ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
                                return sub { IkiWiki::needsignin($cgi, $session) };
                        if (! defined $user ||
                            ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
                                return sub { IkiWiki::needsignin($cgi, $session) };