X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dde68ed9b9e189146f26232b1dc763593e63f799..ed4b6afc9b3b43e1f7e70ff01a77472c7983a549:/IkiWiki/Plugin/openid.pm diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 9728acd48..ab9fc560b 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}; + + # 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 => "", - fieldset => gettext("Log in with")." ".htmllink("", "", "OpenID", noimageinline => 1), + label => gettext("Log in with")." ".htmllink("", "", "OpenID", noimageinline => 1), + fieldset => "OpenID", size => 30, - comment => ($config{openidsignup} ? "(".gettext("Get an OpenID").")" : "") + comment => ($config{openidsignup} ? " | ".gettext("Get an OpenID")."" : "") ); # Handle submission of an OpenID as validation.