bugfix

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

diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index 04532f4dce6151a2d5645ce5adce91debace50f7..31160c02ffb581ad28da533e42737db8761295fe 100644 (file)
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -3,14 +3,24 @@ package IkiWiki::Plugin::signinedit;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "signinedit", call => \&getsetup);
        hook(type => "canedit", id => "signinedit", call => \&canedit,
             last => 1);
-} # }}}
+}
 
-sub canedit ($$$) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+                       section => "auth",
+               },
+}
+
+sub canedit ($$$) {
        my $page=shift;
        my $cgi=shift;
        my $session=shift;
@@ -18,8 +28,14 @@ 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.
-       IkiWiki::needsignin($cgi, $session);
-       return "";
-} #}}}
+        if (! defined $session->param("name") ||
+            ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+               return "" unless exists $IkiWiki::hooks{auth};
+               return sub { IkiWiki::needsignin($cgi, $session) };
+       }
+       else {
+               return "";
+       }
+}
 
 1