From ae493178cf58cf5d7edfa30ccabe758b06febcb4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jan 2010 15:01:25 -0500 Subject: [PATCH] lockedit: Detect if no authentication plugins are enabled, and die with an error message as this configuration does not make sense. --- IkiWiki/Plugin/lockedit.pm | 7 +++++++ debian/changelog | 2 ++ 2 files changed, 9 insertions(+) diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 0fa329251..8914ba498 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -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; diff --git a/debian/changelog b/debian/changelog index aa4f1ac3c..2c121ef54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Mon, 04 Jan 2010 12:53:24 -0500