Update my user page

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index e3b9982f2d3bbf4d5185ae7a1b97c850f6cdaa89..107c6adcbb1e58e07d4e2a76a0845c14fb45fd5b 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -104,7 +104,6 @@ sub formbuilder_setup (@) {
                        size => 1, force => 1,
                        fieldset => "login",
                        comment => $session->param("name"));
                        size => 1, force => 1,
                        fieldset => "login",
                        comment => $session->param("name"));

-               $form->field(name => "email", type => "hidden");

        }
 }
 
        }
 }
 


@@ -119,7 +118,9 @@ sub validate ($$$;$) {
        my $claimed_identity = $csr->claimed_identity($openid_url);
        if (! $claimed_identity) {
                if ($errhandler) {
        my $claimed_identity = $csr->claimed_identity($openid_url);
        if (! $claimed_identity) {
                if ($errhandler) {

-                       $errhandler->($csr->err);
+                       if (ref($errhandler) eq 'CODE') {
+                               $errhandler->($csr->err);
+                       }

                        return 0;
                }
                else {
                        return 0;
                }
                else {


@@ -223,7 +224,7 @@ sub auth ($$) {
        }
        elsif (defined $q->param('openid_identifier')) {
                # myopenid.com affiliate support
        }
        elsif (defined $q->param('openid_identifier')) {
                # myopenid.com affiliate support

-               validate($q, $session, $q->param('openid_identifier'));
+               validate($q, $session, scalar $q->param('openid_identifier'));

        }
 }
 
        }
 }
 


@@ -238,10 +239,10 @@ sub getobj ($$) {
        my $ua;
        eval q{use LWPx::ParanoidAgent};
        if (! $@) {
        my $ua;
        eval q{use LWPx::ParanoidAgent};
        if (! $@) {

-               $ua=LWPx::ParanoidAgent->new;
+               $ua=LWPx::ParanoidAgent->new(agent => $config{useragent});

        }
        else {
        }
        else {

-               $ua=LWP::UserAgent->new;
+               $ua=useragent();

        }
 
        # Store the secret in the session.
        }
 
        # Store the secret in the session.