* 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 4a7255069928c7d2b3bafb23730f7ef4783462c1..e8dbe964ffb2e901f759e22bb72aaf8ebec11c8a 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::openid;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "getopt", id => "openid", call => \&getopt);
 
 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};
        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") {
 
        if ($form->title eq "signin") {

+               # This avoids it displaying a redundant label for the
+               # OpenID fieldset.
+               $form->fieldsets("OpenID");
+

                $form->field(
                        name => "openid_url",
                $form->field(
                        name => "openid_url",

-                       label => "OpenID",
+                       label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+                       fieldset => "OpenID",

                        size => 30,
                        size => 30,

-                       comment => '('.
-                               htmllink("", "", "OpenID", 1, 0, gettext("What's this?"))
-                               .($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.
                );
 
                # Handle submission of an OpenID as validation.


@@ -58,8 +68,10 @@ sub formbuilder_setup (@) { #{{{
        }
        elsif ($form->title eq "preferences") {
                if (! defined $form->field(name => "name")) {
        }
        elsif ($form->title eq "preferences") {
                if (! defined $form->field(name => "name")) {

-                       $form->field(name => "OpenID", disabled => 1, value =>
-                               $session->param("name"), size => 30, force => 1);
+                       $form->field(name => "OpenID", disabled => 1,
+                               value => $session->param("name"), 
+                               size => 50, force => 1,
+                               fieldset => "login");

                }
        }
 }
                }
        }
 }