X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3e593eb9c0edd3f5cce7381ca145c0889441d719..ed4b6afc9b3b43e1f7e70ff01a77472c7983a549:/IkiWiki/Plugin/openid.pm?ds=inline
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 7ea67c5ca..ab9fc560b 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::openid;
use warnings;
use strict;
-use IkiWiki;
+use IkiWiki 2.00;
sub import { #{{{
hook(type => "getopt", id => "openid", call => \&getopt);
@@ -26,16 +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 => "OpenID",
+ label => gettext("Log in with")." ".htmllink("", "", "OpenID", noimageinline => 1),
+ fieldset => "OpenID",
size => 30,
- comment => '('.
- htmllink("", "", "OpenID", 1, 0, "What's this?")
- .($config{openidsignup} ? " | Get an OpenID" : "")
- .')'
+ comment => ($config{openidsignup} ? " | ".gettext("Get an OpenID")."" : "")
);
# Handle submission of an OpenID as validation.
@@ -56,6 +66,14 @@ 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");
+ }
+ }
}
sub validate ($$$;$) { #{{{
@@ -134,13 +152,14 @@ sub getobj ($$) { #{{{
# Store the secret in the session.
my $secret=$session->param("openid_secret");
if (! defined $secret) {
- $secret=$session->param(openid_secret => time);
+ $secret=rand;
+ $session->param(openid_secret => $secret);
}
return Net::OpenID::Consumer->new(
ua => $ua,
args => $q,
- consumer_secret => $secret,
+ consumer_secret => sub { return shift()+$secret },
required_root => $config{cgiurl},
);
} #}}}