update info on my split-view setup, and ask for plugin advice

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index f19a559a9e325d2bac6e1309a124e9ed22ed7ac1..b6642619ac29330944da4af8b3e3c90ffcf21e9a 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -8,6 +8,7 @@ use IkiWiki 3.00;
 
 sub import {
        add_underlay("openid-selector");
 
 sub import {
        add_underlay("openid-selector");

+       add_underlay("jquery");

        hook(type => "checkconfig", id => "openid", call => \&checkconfig);
        hook(type => "getsetup", id => "openid", call => \&getsetup);
        hook(type => "auth", id => "openid", call => \&auth);
        hook(type => "checkconfig", id => "openid", call => \&checkconfig);
        hook(type => "getsetup", id => "openid", call => \&getsetup);
        hook(type => "auth", id => "openid", call => \&auth);


@@ -77,14 +78,14 @@ sub openid_selector {
 
        my $template=IkiWiki::template("openid-selector.tmpl");
        $template->param(
 
        my $template=IkiWiki::template("openid-selector.tmpl");
        $template->param(

-               cgiurl => $config{cgiurl},
+               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)) : ()),
        );
 
        IkiWiki::printheader($session);
                (defined $openid_error ? (openid_error => $openid_error) : ()),
                (defined $openid_url ? (openid_url => $openid_url) : ()),
                ($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),
        );
 
        IkiWiki::printheader($session);

-       print IkiWiki::misctemplate("signin", $template->output);
+       print IkiWiki::cgitemplate($q, "signin", $template->output);

        exit;
 }
 
        exit;
 }
 


@@ -148,7 +149,7 @@ sub validate ($$$;$) {
        }
 
        my $cgiurl=$config{openid_cgiurl};
        }
 
        my $cgiurl=$config{openid_cgiurl};

-       $cgiurl=$config{cgiurl} if ! defined $cgiurl;
+       $cgiurl=$q->url if ! defined $cgiurl;

 
        my $trust_root=$config{openid_realm};
        $trust_root=$cgiurl if ! defined $trust_root;
 
        my $trust_root=$config{openid_realm};
        $trust_root=$cgiurl if ! defined $trust_root;


@@ -175,7 +176,7 @@ sub auth ($$) {
                        IkiWiki::redirect($q, $setup_url);
                }
                elsif ($csr->user_cancel) {
                        IkiWiki::redirect($q, $setup_url);
                }
                elsif ($csr->user_cancel) {

-                       IkiWiki::redirect($q, $config{url});
+                       IkiWiki::redirect($q, IkiWiki::baseurl(undef));

                }
                elsif (my $vident = $csr->verified_identity) {
                        $session->param(name => $vident->url);
                }
                elsif (my $vident = $csr->verified_identity) {
                        $session->param(name => $vident->url);


@@ -187,16 +188,16 @@ sub auth ($$) {
                                        $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
                                );
                        }
                                        $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
                                );
                        }

-                       my $username;
+                       my $nickname;

                        foreach my $ext (@extensions) {
                                foreach my $field (qw{value.email email}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                                $session->param(email => $ext->{$field});
                        foreach my $ext (@extensions) {
                                foreach my $field (qw{value.email email}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                                $session->param(email => $ext->{$field});

-                                               if (! defined $username &&
+                                               if (! defined $nickname &&

                                                    $ext->{$field}=~/(.+)@.+/) {
                                                    $ext->{$field}=~/(.+)@.+/) {

-                                                       $username = $1;
+                                                       $nickname = $1;

                                                }
                                                last;
                                        }
                                                }
                                                last;
                                        }


@@ -205,14 +206,14 @@ sub auth ($$) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {

-                                               $username=$ext->{$field};
+                                               $nickname=$ext->{$field};

                                                last;
                                        }
                                }
                        }
                                                last;
                                        }
                                }
                        }

-                       if (defined $username) {
-                               $username=~s/\s+/_/g;
-                               $session->param(username => $username);
+                       if (defined $nickname) {
+                               $session->param(nickname =>
+                                       Encode::decode_utf8($nickname));

                        }
                }
                else {
                        }
                }
                else {


@@ -229,6 +230,7 @@ sub getobj ($$) {
        my $q=shift;
        my $session=shift;
 
        my $q=shift;
        my $session=shift;
 

+       eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available

        eval q{use Net::OpenID::Consumer};
        error($@) if $@;
 
        eval q{use Net::OpenID::Consumer};
        error($@) if $@;
 


@@ -249,7 +251,7 @@ sub getobj ($$) {
        }
        
        my $cgiurl=$config{openid_cgiurl};
        }
        
        my $cgiurl=$config{openid_cgiurl};

-       $cgiurl=$config{cgiurl} if ! defined $cgiurl;
+       $cgiurl=$q->url if ! defined $cgiurl;

 
        return Net::OpenID::Consumer->new(
                ua => $ua,
 
        return Net::OpenID::Consumer->new(
                ua => $ua,