From b547170a965e93a759de1612d4ce64d38eeea59c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Feb 2010 15:07:10 -0500
Subject: [PATCH] Improve display of openid in preferences page.

Now that openiduser is in IkiWiki core, it's ok to have passwordauth check
for it, and avoid displaying useless password fields when showing
preferences for an openid.

Also improved the styling of the display of the openid in the preferneces
page.
---
 IkiWiki/Plugin/openid.pm       | 14 +++++++-------
 IkiWiki/Plugin/passwordauth.pm |  3 ++-
 debian/changelog               |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index dc0e0f48e..b60740c0e 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -82,13 +82,13 @@ sub formbuilder_setup (@) {
 			}
 		}
 	}
-	elsif ($form->title eq "preferences") {
-		if (! defined $form->field(name => "name")) {
-			$form->field(name => "OpenID", disabled => 1,
-				value => $session->param("name"), 
-				size => 50, force => 1,
-				fieldset => "login");
-		}
+	elsif ($form->title eq "preferences" &&
+	       IkiWiki::openiduser($session->param("name"))) {
+		$form->field(name => "openid_url", disabled => 1,
+			label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+			value => $session->param("name"), 
+			size => 50, force => 1,
+			fieldset => "login");
 	}
 }
 
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 1898030b5..b70f9b788 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -206,7 +206,8 @@ sub formbuilder_setup (@) {
 			}
 		}
 	}
-	elsif ($form->title eq "preferences") {
+	elsif ($form->title eq "preferences" &&
+	        IkiWiki::openiduser($session->param("name"))) {
 		$form->field(name => "name", disabled => 1, 
 			value => $session->param("name"), force => 1,
 			fieldset => "login");
diff --git a/debian/changelog b/debian/changelog
index 7beb0db82..9867cf75a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     than default underline. Closes: #517656
   * Allow jumping directly into account registration process by going to 
     ikiwiki.cgi?do=register
+  * Improve display of openid in preferences page.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
2.39.2