Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index 08932e2f6bb69a13f064ea8a17796a241862a5f8..ef7b9b428029f57687da3538a52b2ab75727c6ad 100644 (file)
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -6,10 +6,19 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 use IkiWiki 2.00;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "signinedit", call => \&getsetup);

        hook(type => "canedit", id => "signinedit", call => \&canedit,
             last => 1);
 } # }}}
 
        hook(type => "canedit", id => "signinedit", call => \&canedit,
             last => 1);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
+

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


@@ -18,8 +27,13 @@ sub canedit ($$$) { #{{{
        # Have the user sign in, if they are not already. This is why the
        # hook runs last, so that any hooks that don't need the user to
        # signin can override this.
        # Have the user sign in, if they are not already. This is why the
        # hook runs last, so that any hooks that don't need the user to
        # signin can override this.

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

 } #}}}
 
 1
 } #}}}
 
 1