testing

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index def0549c5d10367cb2dc7dd90f0f091e7028e0e8..53237bcdb571c646b5d19d9403d1056cc58dfa8b 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -85,7 +85,16 @@ sub cgi_recentchanges ($) { #{{{
        my $changelog=[rcs_recentchanges(100)];
        foreach my $change (@$changelog) {
                $change->{when} = concise(ago($change->{when}));
        my $changelog=[rcs_recentchanges(100)];
        foreach my $change (@$changelog) {
                $change->{when} = concise(ago($change->{when}));

-               $change->{user} = htmllink("", "", escapeHTML($change->{user}), 1);
+
+               if ($change->{user} =~ m!^https?://! &&
+                   eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
+                       # Munge user-urls, as used by eg, OpenID.
+                       my $oid=Net::OpenID::VerifiedIdentity->new(identity => $change->{user});
+                       $change->{user} = "<a href=\"".$change->{user}."\">".escapeHTML($oid->display)."</a>";
+               }
+               else {
+                       $change->{user} = htmllink("", "", escapeHTML($change->{user}), 1);
+               }

 
                my $is_excess = exists $change->{pages}[10]; # limit pages to first 10
                delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
 
                my $is_excess = exists $change->{pages}[10]; # limit pages to first 10
                delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;


@@ -120,7 +129,7 @@ sub cgi_signin ($$) { #{{{
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "signin",
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "signin",

-               fields => [qw(do title page subpage from name password openid_url)],
+               fields => [qw(do name password openid_url)],

                header => 1,
                charset => "utf-8",
                method => 'POST',
                header => 1,
                charset => "utf-8",
                method => 'POST',


@@ -142,15 +151,15 @@ sub cgi_signin ($$) { #{{{
                
        decode_form_utf8($form);
        
                
        decode_form_utf8($form);
        

-       $form->field(name => "name", required => 0);
+       $form->field(name => "name", required => 0, size => 30);

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

-       $form->field(name => "page", type => "hidden");
-       $form->field(name => "title", type => "hidden");
-       $form->field(name => "from", type => "hidden");
-       $form->field(name => "subpage", type => "hidden");

        $form->field(name => "password", type => "password", required => 0);
        if ($config{openid}) {
        $form->field(name => "password", type => "password", required => 0);
        if ($config{openid}) {

-               $form->field(name => "openid_url", label => "OpenID", comment => "to log in via OpenID");
+               $form->field(name => "openid_url", label => "OpenID", size => 30,
+                       comment => '('.
+                               htmllink("", "", "OpenID", 1, 0, "What's this?")
+                               .($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">Get an OpenID</a>" : "")
+                               .')');

        }
        else {
                $form->field(name => "openid_url", type => "hidden");
        }
        else {
                $form->field(name => "openid_url", type => "hidden");


@@ -158,7 +167,7 @@ sub cgi_signin ($$) { #{{{
        if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
                $form->title("register");
                $form->text("");
        if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
                $form->title("register");
                $form->text("");

-               $form->fields(qw(do title page subpage from name password confirm_password email));
+               $form->fields(qw(do name password confirm_password email));

                $form->field(name => "confirm_password", type => "password");
                $form->field(name => "email", type => "text");
                $form->field(name => "openid_url", type => "hidden");
                $form->field(name => "confirm_password", type => "password");
                $form->field(name => "email", type => "text");
                $form->field(name => "openid_url", type => "hidden");


@@ -179,7 +188,7 @@ sub cgi_signin ($$) { #{{{
                                name => "openid_url",
                                validate => sub {
                                        # FIXME: ugh
                                name => "openid_url",
                                validate => sub {
                                        # FIXME: ugh

-                                       IkiWiki::Plugin::openid::validate($q, $session, $form, shift);
+                                       IkiWiki::Plugin::openid::validate($q, $session, shift, $form);

                                },
                        );
                }
                                },
                        );
                }


@@ -247,19 +256,7 @@ sub cgi_signin ($$) { #{{{
        if ($form->submitted && $form->validate) {
                if ($form->submitted eq 'Login') {
                        $session->param("name", $form->field("name"));
        if ($form->submitted && $form->validate) {
                if ($form->submitted eq 'Login') {
                        $session->param("name", $form->field("name"));

-                       if (defined $form->field("do") && 
-                           $form->field("do") ne 'signin') {
-                               redirect($q, cgiurl(
-                                       do => $form->field("do"),
-                                       page => $form->field("page"),
-                                       title => $form->field("title"),
-                                       from => $form->field("from"),
-                                       subpage => $form->field("subpage"),
-                               ));
-                       }
-                       else {
-                               redirect($q, $config{url});
-                       }
+                       cgi_postsignin($q, $session);

                }
                elsif ($form->submitted eq 'Create Account') {
                        my $user_name=$form->field('name');
                }
                elsif ($form->submitted eq 'Create Account') {
                        my $user_name=$form->field('name');


@@ -318,6 +315,23 @@ sub cgi_signin ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub cgi_postsignin ($$) { #{{{
+       my $q=shift;
+       my $session=shift;
+
+       # Continue with whatever was being done before the signin process.
+       if (defined $q->param("do") && $q->param("do") ne "signin" &&
+           defined $session->param("postsignin")) {
+               my $postsignin=CGI->new($session->param("postsignin"));
+               $session->clear("postsignin");
+               cgi($postsignin, $session);
+               exit;
+       }
+       else {
+               redirect($q, $config{url});
+       }
+} #}}}
+

 sub cgi_prefs ($$) { #{{{
        my $q=shift;
        my $session=shift;
 sub cgi_prefs ($$) { #{{{
        my $q=shift;
        my $session=shift;


@@ -350,7 +364,7 @@ sub cgi_prefs ($$) { #{{{
        my $user_name=$session->param("name");
        $form->field(name => "do", type => "hidden");
        $form->field(name => "name", disabled => 1,
        my $user_name=$session->param("name");
        $form->field(name => "do", type => "hidden");
        $form->field(name => "name", disabled => 1,

-               value => $user_name, force => 1);
+               value => $user_name, force => 1, size => 30);

        $form->field(name => "password", type => "password");
        $form->field(name => "confirm_password", type => "password");
        $form->field(name => "subscriptions", size => 50,
        $form->field(name => "password", type => "password");
        $form->field(name => "confirm_password", type => "password");
        $form->field(name => "subscriptions", size => 50,


@@ -669,14 +683,19 @@ sub cgi_editpage ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub cgi () { #{{{
-       eval q{use CGI; use CGI::Session};
-       error($@) if $@;
-       
-       my $q=CGI->new;
+sub cgi (;$$) { #{{{
+       my $q=shift;
+       my $session=shift;
+
+       if (! $q) {
+               eval q{use CGI; use CGI::Session};
+               error($@) if $@;

        
        

-       run_hooks(cgi => sub { shift->($q) });
+               $q=CGI->new;

        
        

+               run_hooks(cgi => sub { shift->($q) });
+       }
+

        my $do=$q->param('do');
        if (! defined $do || ! length $do) {
                my $error = $q->cgi_error;
        my $do=$q->param('do');
        if (! defined $do || ! length $do) {
                my $error = $q->cgi_error;


@@ -697,12 +716,14 @@ sub cgi () { #{{{
                cgi_hyperestraier();
        }
        
                cgi_hyperestraier();
        }
        

-       CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
+       if (! $session) {
+               CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));

        
        

-       my $oldmask=umask(077);
-       my $session = CGI::Session->new("driver:DB_File", $q,
-               { FileName => "$config{wikistatedir}/sessions.db" });
-       umask($oldmask);
+               my $oldmask=umask(077);
+               $session = CGI::Session->new("driver:DB_File", $q,
+                       { FileName => "$config{wikistatedir}/sessions.db" });
+               umask($oldmask);
+       }

        
        # Auth hooks can sign a user in.
        if ($do ne 'signin' && ! defined $session->param("name")) {
        
        # Auth hooks can sign a user in.
        if ($do ne 'signin' && ! defined $session->param("name")) {


@@ -724,10 +745,12 @@ sub cgi () { #{{{
 
        # Everything below this point needs the user to be signed in.
        if (((! $config{anonok} || $do eq 'prefs') &&
 
        # Everything below this point needs the user to be signed in.
        if (((! $config{anonok} || $do eq 'prefs') &&

-            (! $config{httpauth}) &&

             (! defined $session->param("name") ||
             ! userinfo_get($session->param("name"), "regdate")))
             || $do eq 'signin') {
             (! defined $session->param("name") ||
             ! userinfo_get($session->param("name"), "regdate")))
             || $do eq 'signin') {

+               if ($do ne 'signin' && ! defined $session->param("postsignin")) {
+                       $session->param(postsignin => $ENV{QUERY_STRING});
+               }

                cgi_signin($q, $session);
        
                # Force session flush with safe umask.
                cgi_signin($q, $session);
        
                # Force session flush with safe umask.


@@ -737,6 +760,9 @@ sub cgi () { #{{{
                
                return;
        }
                
                return;
        }

+       elsif (defined $session->param("postsignin")) {
+               cgi_postsignin($q, $session);
+       }

 
        if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
                print $q->header(-status => "403 Forbidden");
 
        if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
                print $q->header(-status => "403 Forbidden");