generalized the openid selector to a login selector

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index e3b9982f2d3bbf4d5185ae7a1b97c850f6cdaa89..bfd130ace1b7228592acec680a708305b006b263 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -25,11 +25,18 @@ sub checkconfig () {
                # a reference to the normal signin form.
                require IkiWiki::CGI;
                my $real_cgi_signin;
+               my $otherform_label=gettext("Other");
                if (keys %{$IkiWiki::hooks{auth}} > 1) {
                        $real_cgi_signin=\&IkiWiki::cgi_signin;
+                       my %h=%{$IkiWiki::hooks{auth}};
+                       delete $h{openid};
+                       delete $h{emailauth};
+                       if (keys %h == 1 && exists $h{passwordauth}) {
+                               $otherform_label=gettext("Password");
+                       }
                }
                inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
-                       openid_selector($real_cgi_signin, @_);
+                       openid_selector($real_cgi_signin, $otherform_label, @_);
                });
        }
 }
@@ -57,11 +64,12 @@ sub getsetup () {
 
 sub openid_selector {
        my $real_cgi_signin=shift;
+       my $otherform_label=shift;
         my $q=shift;
         my $session=shift;
 
+       my $template=IkiWiki::template("openid-selector.tmpl");
        my $openid_url=$q->param('openid_identifier');
-       my $openid_error;
 
        if (! load_openid_module()) {
                if ($real_cgi_signin) {
@@ -70,18 +78,17 @@ sub openid_selector {
                }
                error(sprintf(gettext("failed to load openid module: "), @_));
        }
-       elsif (defined $q->param("action") && $q->param("action") eq "verify") {
+       elsif (defined $q->param("action") && $q->param("action") eq "verify" && defined $openid_url && length $openid_url) {
                validate($q, $session, $openid_url, sub {
-                       $openid_error=shift;
+                       $template->param(login_error => shift())
                });
        }
 
-       my $template=IkiWiki::template("openid-selector.tmpl");
        $template->param(
                cgiurl => IkiWiki::cgiurl(),
-               (defined $openid_error ? (openid_error => $openid_error) : ()),
                (defined $openid_url ? (openid_url => $openid_url) : ()),
-               ($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),
+               ($real_cgi_signin ? (otherform => $real_cgi_signin->($q, $session, 1)) : ()),
+               otherform_label => $otherform_label,
        );
 
        IkiWiki::printheader($session);
@@ -104,7 +111,6 @@ sub formbuilder_setup (@) {
                        size => 1, force => 1,
                        fieldset => "login",
                        comment => $session->param("name"));
-               $form->field(name => "email", type => "hidden");
        }
 }
 
@@ -119,7 +125,9 @@ sub validate ($$$;$) {
        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 {
@@ -223,7 +231,7 @@ sub auth ($$) {
        }
        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 +246,10 @@ sub getobj ($$) {
        my $ua;
        eval q{use LWPx::ParanoidAgent};
        if (! $@) {
-               $ua=LWPx::ParanoidAgent->new;
+               $ua=LWPx::ParanoidAgent->new(agent => $config{useragent});
        }
        else {
-               $ua=LWP::UserAgent->new;
+               $ua=useragent();
        }
 
        # Store the secret in the session.