From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 13 May 2015 22:52:47 +0000 (-0400)
Subject: move stub auth hook to loginselector
X-Git-Tag: 3.20150610~72^2~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/035c1a24499e3ba2c0301337160d63b69d9e5376

move stub auth hook to loginselector
---

diff --git a/IkiWiki/Plugin/emailauth.pm b/IkiWiki/Plugin/emailauth.pm
index 62c9fe877..3946ace03 100644
--- a/IkiWiki/Plugin/emailauth.pm
+++ b/IkiWiki/Plugin/emailauth.pm
@@ -8,7 +8,6 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "emailauth", "call" => \&getsetup);
-	hook(type => "auth", id => "emailauth", call => \&auth);
 	IkiWiki::loadplugin("loginselector");
 	IkiWiki::Plugin::loginselector::register_login_plugin(
 		"emailauth",
@@ -55,10 +54,4 @@ sub email_auth ($$$) {
 	error "EMAIL AUTH";
 }
 
-sub auth ($$) {
-	# While this hook is not currently used, it needs to exist
-	# so ikiwiki knows that the wiki supports logins, and will
-	# enable the Preferences page.
-}
-
 1
diff --git a/IkiWiki/Plugin/loginselector.pm b/IkiWiki/Plugin/loginselector.pm
index b5e2056a4..1a322a53a 100644
--- a/IkiWiki/Plugin/loginselector.pm
+++ b/IkiWiki/Plugin/loginselector.pm
@@ -77,6 +77,7 @@ sub import {
 	add_underlay("jquery");
 	hook(type => "getsetup", id => "loginselector",  call => \&getsetup);
 	hook(type => "checkconfig", id => "loginselector", call => \&checkconfig);
+	hook(type => "auth", id => "loginselector", call => \&authstub);
 }
 
 sub checkconfig () {
@@ -91,13 +92,14 @@ sub checkconfig () {
 		my $otherform_label=gettext("Other");
 		if (keys %{$IkiWiki::hooks{auth}} > 1) {
 			$real_cgi_signin=\&IkiWiki::cgi_signin;
+			# Special case to avoid labeling password auth as
+			# "Other" when it's the only auth plugin not
+			# integrated with the loginselector.
 			my %h=%{$IkiWiki::hooks{auth}};
 			foreach my $p (keys %login_plugins) {
 				delete $h{$p};
 			}
-			# Special case to avoid labeling password auth as
-			# "Other" when it's the only auth plugin not
-			# integrated with the loginselector.
+			delete $h{loginselector};
 			if (keys %h == 1 && exists $h{passwordauth}) {
 				$otherform_label=gettext("Password");
 			}
@@ -118,4 +120,10 @@ sub getsetup () {
 		},
 }
 
+sub authstub ($$) {
+	# While this hook is not currently used, it needs to exist
+	# so ikiwiki knows that the wiki supports logins, and will
+	# enable the Preferences page.
+}
+
 1