X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/96da041907bcd4e74be6b2beef06d265708644ee..46c2d66fd37b12c2d02466118cb206000174f1b4:/IkiWiki/Plugin/lockedit.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 5ffb4e6f9..0fa329251 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -3,15 +3,30 @@ package IkiWiki::Plugin::lockedit;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "lockedit", call => \&getsetup);
 	hook(type => "canedit", id => "lockedit", call => \&canedit);
-	hook(type => "formbuilder_setup", id => "lockedit",
-	     call => \&formbuilder_setup);
-} # }}}
-
-sub canedit ($$) { #{{{
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+		},
+		locked_pages => {
+			type => "pagespec",
+			example => "!*/Discussion",
+			description => "PageSpec controlling which pages are locked",
+			link => "ikiwiki/PageSpec",
+			safe => 1,
+			rebuild => 0,
+		},
+}
+
+sub canedit ($$) {
 	my $page=shift;
 	my $cgi=shift;
 	my $session=shift;
@@ -19,50 +34,23 @@ sub canedit ($$) { #{{{
 	my $user=$session->param("name");
 	return undef if defined $user && IkiWiki::is_admin($user);
 
-	foreach my $admin (@{$config{adminuser}}) {
-		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));
-			}
+	if (defined $config{locked_pages} && length $config{locked_pages} &&
+	    pagespec_match($page, $config{locked_pages},
+		    user => $session->param("name"),
+		    ip => $ENV{REMOTE_ADDR},
+	    )) {
+		if (! defined $user ||
+		    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+			return sub { IkiWiki::needsignin($cgi, $session) };
+		}
+		else {
+			return sprintf(gettext("%s is locked and cannot be edited"),
+				htmllink("", "", $page, noimageinline => 1));
+			
 		}
 	}
 
 	return undef;
-} #}}}
-
-sub formbuilder_setup (@) { #{{{
-	my %params=@_;
-	
-	my $form=$params{form};
-	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).")");
-		if (! IkiWiki::is_admin($user_name)) {
-			$form->field(name => "locked_pages", type => "hidden");
-		}
-		if (! $form->submitted) {
-			$form->field(name => "locked_pages", force => 1,
-				value => IkiWiki::userinfo_get($user_name, "locked_pages"));
-		}
-		if ($form->submitted && $form->submitted eq 'Save Preferences') {
-			if (defined $form->field("locked_pages")) {
-				IkiWiki::userinfo_set($user_name, "locked_pages",
-					$form->field("locked_pages")) ||
-						error("failed to set locked_pages");
-			}
-		}
-	}
-} #}}}
+}
 
 1