X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dde68ed9b9e189146f26232b1dc763593e63f799..1405006fbf8d78e3f629c60a98e01b5254de414e:/IkiWiki/Plugin/openid.pm

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 9728acd48..10a8fa22f 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -26,14 +26,26 @@ sub formbuilder_setup (@) { #{{{
 	my $form=$params{form};
 	my $session=$params{session};
 	my $cgi=$params{cgi};
-
+	
 	if ($form->title eq "signin") {
+		# Give up if module is unavailable to avoid
+		# needing to depend on it.
+		eval q{use Net::OpenID::Consumer};
+		if ($@) {
+			debug("unable to load Net::OpenID::Consumer, not enabling OpenID login");
+			return;
+		}
+
+		# This avoids it displaying a redundant label for the
+		# OpenID fieldset.
+		$form->fieldsets("OpenID");
+
  		$form->field(
 			name => "openid_url",
-			label => "",
-			fieldset => gettext("Log in with")." ".htmllink("", "", "OpenID", noimageinline => 1),
+			label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+			fieldset => "OpenID",
 			size => 30,
-			comment => ($config{openidsignup} ? "(<a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>)" : "")
+			comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
 		);
 
 		# Handle submission of an OpenID as validation.
@@ -152,4 +164,31 @@ sub getobj ($$) { #{{{
 	);
 } #}}}
 
+package IkiWiki;
+
+# This is not used by this plugin, but this seems the best place to put it.
+# Used elsewhere to pretty-display the name of an openid user.
+sub openiduser ($) { #{{{
+	my $user=shift;
+
+	if ($user =~ m!^https?://! &&
+	    eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
+		my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
+		my $display=$oid->display;
+		# Convert "user.somehost.com" to "user [somehost.com]".
+		if ($display !~ /\[/) {
+			$display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
+		}
+		# Convert "http://somehost.com/user" to "user [somehost.com]".
+		if ($display !~ /\[/) {
+			$display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
+		}
+		$display=~s!^https?://!!; # make sure this is removed
+		eval q{use CGI 'escapeHTML'};
+		error($@) if $@;
+		return escapeHTML($display);
+	}
+	return;
+}
+
 1