Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 4a7255069928c7d2b3bafb23730f7ef4783462c1..f12cbdaa37fad0c77ada865a521ff68a0d95e785 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -4,10 +4,11 @@ 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);

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

        hook(type => "auth", id => "openid", call => \&auth);
        hook(type => "formbuilder_setup", id => "openid",
                call => \&formbuilder_setup, last => 1);
        hook(type => "auth", id => "openid", call => \&auth);
        hook(type => "formbuilder_setup", id => "openid",
                call => \&formbuilder_setup, last => 1);


@@ -20,22 +21,47 @@ sub getopt () { #{{{
        GetOptions("openidsignup=s" => \$config{openidsignup});
 } #}}}
 
        GetOptions("openidsignup=s" => \$config{openidsignup});
 } #}}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+               openidsignup => {
+                       type => "string",
+                       example => "http://myopenid.com/",
+                       description => "an url where users can signup for an OpenID",
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
+

 sub formbuilder_setup (@) { #{{{
        my %params=@_;
 
        my $form=$params{form};
        my $session=$params{session};
        my $cgi=$params{cgi};
 sub formbuilder_setup (@) { #{{{
        my %params=@_;
 
        my $form=$params{form};
        my $session=$params{session};
        my $cgi=$params{cgi};

-
+       

        if ($form->title eq "signin") {
        if ($form->title eq "signin") {

+               # 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;
+               }
+
+               # 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 +84,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");

                }
        }
 }
                }
        }
 }


@@ -152,4 +180,31 @@ sub getobj ($$) { #{{{
        );
 } #}}}
 
        );
 } #}}}
 

+package IkiWiki;
+
+# This is not used by this plugin, but this seems the best place to put it.
+# Used elsewhere to pretty-display the name of an openid user.
+sub openiduser ($) { #{{{
+       my $user=shift;
+
+       if ($user =~ m!^https?://! &&
+           eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
+               my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
+               my $display=$oid->display;
+               # Convert "user.somehost.com" to "user [somehost.com]".
+               if ($display !~ /\[/) {
+                       $display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
+               }
+               # Convert "http://somehost.com/user" to "user [somehost.com]".
+               if ($display !~ /\[/) {
+                       $display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
+               }
+               $display=~s!^https?://!!; # make sure this is removed
+               eval q{use CGI 'escapeHTML'};
+               error($@) if $@;
+               return escapeHTML($display);
+       }
+       return;
+}
+

 1
 1