]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Plugin/lockedit.pm
beautify url recentchanges_link redirs to
[ikiwiki.git] / IkiWiki / Plugin / lockedit.pm
index a829df1cfba6bf29ce266461c2a8cfde4ffc8be7..5ffb4e6f9edd254691f4fb5b246e3afb2aeea147 100644 (file)
@@ -21,10 +21,15 @@ sub canedit ($$) { #{{{
 
        foreach my $admin (@{$config{adminuser}}) {
                if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) {
-                       IkiWiki::needsignin($cgi, $session) unless defined $user;
-                       return sprintf(gettext("%s is locked by %s and cannot be edited"),
-                               htmllink("", "", $page, noimageinline => 1),
-                               IkiWiki::userlink($admin));
+                       if (! defined $user ||
+                           ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+                               return sub { IkiWiki::needsignin($cgi, $session) };
+                       }
+                       else {
+                               return sprintf(gettext("%s is locked by %s and cannot be edited"),
+                                       htmllink("", "", $page, noimageinline => 1),
+                                       IkiWiki::userlink($admin));
+                       }
                }
        }
 
@@ -35,11 +40,11 @@ sub formbuilder_setup (@) { #{{{
        my %params=@_;
        
        my $form=$params{form};
-       my $session=$params{session};
-       my $cgi=$params{cgi};
-       my $user_name=$session->param("name");
-
        if ($form->title eq "preferences") {
+               my $session=$params{session};
+               my $cgi=$params{cgi};
+               my $user_name=$session->param("name");
+
                $form->field(name => "locked_pages", size => 50,
                        fieldset => "admin",
                        comment => "(".htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).")");