From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 14 May 2015 03:23:53 +0000 (-0400)
Subject: avoid showing password prefs for emailauth user
X-Git-Tag: 3.20150610~72^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/497513e737a92d2115f5d2a16610561b8a1dffdc

avoid showing password prefs for emailauth user
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f414996db..53eb8235b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -165,7 +165,7 @@ sub getsetup () {
 	default_plugins => {
 		type => "internal",
 		default => [qw{mdwn link inline meta htmlscrubber passwordauth
-				openid signinedit lockedit conditional
+				openid emailauth signinedit lockedit conditional
 				recentchanges parentlinks editpage
 				templatebody}],
 		description => "plugins to enable by default",
@@ -1464,6 +1464,14 @@ sub openiduser ($) {
 	return;
 }
 
+sub emailuser ($) {
+	my $user=shift;
+	if (defined $user && $user =~ m/(.+)@/) {
+		return $1;
+	}
+	return;
+}
+
 sub htmlize ($$$$) {
 	my $page=shift;
 	my $destpage=shift;
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 0cf2a26ea..7c01bb3ff 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -277,7 +277,7 @@ sub formbuilder_setup (@) {
 	}
 	elsif ($form->title eq "preferences") {
 		my $user=$session->param("name");
-		if (! IkiWiki::openiduser($user)) {
+		if (! IkiWiki::openiduser($user) && ! IkiWiki::emailuser($user)) {
 			$form->field(name => "name", disabled => 1, 
 				value => $user, force => 1,
 				fieldset => "login");