lockedit: Detect if no authentication plugins are enabled, and die with an error message as this configuration does not make sense.

master
Joey Hess 2010-01-04 15:01:25 -05:00
parent f8bd25bfc7
commit ae493178cf
2 changed files with 9 additions and 0 deletions

View File

@ -7,6 +7,7 @@ use IkiWiki 3.00;
sub import {
hook(type => "getsetup", id => "lockedit", call => \&getsetup);
hook(type => "checkconfig", id => "lockedit", call => \&checkconfig);
hook(type => "canedit", id => "lockedit", call => \&canedit);
}
@ -26,6 +27,12 @@ sub getsetup () {
},
}
sub checkconfig () {
if (! exists $IkiWiki::hooks{auth}) {
error gettext("lockedit plugin is enabled, but no authentication plugins are enabled");
}
}
sub canedit ($$) {
my $page=shift;
my $cgi=shift;

2
debian/changelog vendored
View File

@ -4,6 +4,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
(Sjoerd)
* signinedit: Auto-disable the plugin when all authentication methods
are disabled.
* lockedit: Detect if no authentication plugins are enabled, and
die with an error message as this configuration does not make sense.
-- Joey Hess <joeyh@debian.org> Mon, 04 Jan 2010 12:53:24 -0500