Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 0fa329251f0b7eb5e6814e50f68d020eaf047eb8..5b50fd11509c07cf301b6f9a500331bff4392f93 100644 (file)
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -15,6 +15,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "auth",

                },
                locked_pages => {
                        type => "pagespec",
                },
                locked_pages => {
                        type => "pagespec",


@@ -37,10 +38,11 @@ sub canedit ($$) {
        if (defined $config{locked_pages} && length $config{locked_pages} &&
            pagespec_match($page, $config{locked_pages},
                    user => $session->param("name"),
        if (defined $config{locked_pages} && length $config{locked_pages} &&
            pagespec_match($page, $config{locked_pages},
                    user => $session->param("name"),

-                   ip => $ENV{REMOTE_ADDR},
+                   ip => $session->remote_addr(),

            )) {
            )) {

-               if (! defined $user ||
-                   ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+               if ((! defined $user ||
+                   ! IkiWiki::userinfo_get($session->param("name"), "regdate")) &&
+                   exists $IkiWiki::hooks{auth}) {

                        return sub { IkiWiki::needsignin($cgi, $session) };
                }
                else {
                        return sub { IkiWiki::needsignin($cgi, $session) };
                }
                else {