X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fa52a730ff3b30c7d2cdd8cd5f9c8c25a0c0a2a5..3096c8ea69783b1c1cfbf5b9f940d2939d2a33f5:/IkiWiki/Plugin/lockedit.pm

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index f204e72c0..5ffb4e6f9 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::lockedit;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "canedit", id => "lockedit", call => \&canedit);
@@ -20,10 +20,16 @@ sub canedit ($$) { #{{{
 	return undef if defined $user && IkiWiki::is_admin($user);
 
 	foreach my $admin (@{$config{adminuser}}) {
-		if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"), "")) {
-			return sprintf(gettext("%s is locked by %s and cannot be edited"),
-				htmllink("", "", $page, noimageinline => 1),
-				IkiWiki::userlink($admin));
+		if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) {
+			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));
+			}
 		}
 	}
 
@@ -34,13 +40,14 @@ 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,
-			comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
+			fieldset => "admin",
+			comment => "(".htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).")");
 		if (! IkiWiki::is_admin($user_name)) {
 			$form->field(name => "locked_pages", type => "hidden");
 		}