* Only try postsignin if no other action matched. Fixes a bug where the

[git.ikiwiki.info.git] / IkiWiki / Plugin / openid.pm

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index a24ee75196b333f54e6e067e002b3e689a9cef26..e8dbe964ffb2e901f759e22bb72aaf8ebec11c8a 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -26,12 +26,24 @@ sub formbuilder_setup (@) { #{{{
        my $form=$params{form};
        my $session=$params{session};
        my $cgi=$params{cgi};
+       
+       # 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;
+       }
 
        if ($form->title eq "signin") {
+               # This avoids it displaying a redundant label for the
+               # OpenID fieldset.
+               $form->fieldsets("OpenID");
+
                $form->field(
                        name => "openid_url",
-                       label => "OpenID",
-                       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>" : "")
                );