Merge branch 'master' into revert

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index fa851e46678f208efa04def72e988366df6ea87d..7e71d4fc3783740a4c1d76fb7966924097021333 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -13,6 +13,7 @@ sub import {
        hook(type => "refresh", id => "recentchanges", call => \&refresh);
        hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
        hook(type => "htmlize", id => "_change", call => \&htmlize);
        hook(type => "refresh", id => "recentchanges", call => \&refresh);
        hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
        hook(type => "htmlize", id => "_change", call => \&htmlize);

+       hook(type => "sessioncgi", id => "recentchanges", call => \&sessioncgi);

        # Load goto to fix up links from recentchanges
        IkiWiki::loadplugin("goto");
 }
        # Load goto to fix up links from recentchanges
        IkiWiki::loadplugin("goto");
 }


@@ -60,15 +61,82 @@ sub refresh ($) {
        }
 }
 
        }
 }
 

-# Enable the recentchanges link on wiki pages.
+sub confirmation_form {
+       my ($q, $session, $rev) = @_;
+
+       eval q{use CGI::FormBuilder};
+       error($@) if $@;
+       my $f = CGI::FormBuilder->new(
+               name => "revert",
+               header => 0,
+               charset => "utf-8",
+               method => 'POST',
+               javascript => 0,
+               params => $q,
+               action => $config{cgiurl},
+               stylesheet => 1,
+               template => { template('revert.tmpl') },
+       );
+
+       $f->field(name => "sid", type => "hidden", value => $session->id,
+               force => 1);
+       $f->field(name => "do", type => "hidden", value => "revert",
+               force => 1);
+
+       return $f, ["Revert", "Cancel"];
+}
+
+sub sessioncgi ($$) {
+       my ($q, $session) = @_;
+       my $do = $q->param('do');
+       my $rev = $q->param('rev');
+
+       return unless $do eq 'revert' && $rev;
+
+       IkiWiki::rcs_preprevert(cgi => $q, session => $session, rev => $rev);
+
+       my ($form, $buttons) = confirmation_form($q, $session);
+       IkiWiki::decode_form_utf8($form);
+
+       if ($form->submitted eq 'Revert' && $form->validate) {
+               IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
+               IkiWiki::disable_commit_hook();
+               my $r = IkiWiki::rcs_revert(
+                       session => $session,
+                       rev => $rev);
+               IkiWiki::enable_commit_hook();
+       
+               if ($r) {
+                       die "Revert '$rev' failed.";
+               }
+               else {
+                       require IkiWiki::Render;
+                       IkiWiki::refresh();
+                       IkiWiki::saveindex();
+               }
+       }
+       else {
+               $form->title(sprintf(gettext("confirm reversion of %s"), $rev));
+               my $patch_contents = IkiWiki::rcs_showpatch(rev => $rev);
+               $form->tmpl_param(patch_contents => encode_entities($patch_contents));
+               $form->field(name => "rev", type => "hidden", value => $rev, force => 1);
+               IkiWiki::showform($form, $buttons, $session, $q);
+               exit 0;
+       }
+
+       IkiWiki::redirect($q, urlto($config{recentchangespage}, ''));
+       exit 0;
+}
+
+# Enable the recentchanges link.

 sub pagetemplate (@) {
        my %params=@_;
        my $template=$params{template};
        my $page=$params{page};
 
        if (defined $config{recentchangespage} && $config{rcs} &&
 sub pagetemplate (@) {
        my %params=@_;
        my $template=$params{template};
        my $page=$params{page};
 
        if (defined $config{recentchangespage} && $config{rcs} &&

-           $page ne $config{recentchangespage} &&
-           $template->query(name => "recentchangesurl")) {
+           $template->query(name => "recentchangesurl") &&
+           $page ne $config{recentchangespage}) {

                $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
                $template->param(have_actions => 1);
        }
                $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
                $template->param(have_actions => 1);
        }


@@ -113,18 +181,24 @@ sub store ($$$) {
                } @{$change->{pages}}
        ];
        push @{$change->{pages}}, { link => '...' } if $is_excess;
                } @{$change->{pages}}
        ];
        push @{$change->{pages}}, { link => '...' } if $is_excess;

+       
+       if (length $config{cgiurl}) {
+               $change->{reverturl} = IkiWiki::cgiurl(
+                       do => "revert",
+                       rev => $change->{rev}
+               );
+       }

 
 

-       # See if the committer is an openid.

        $change->{author}=$change->{user};
        my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
        if (defined $oiduser) {
                $change->{authorurl}=$change->{user};
        $change->{author}=$change->{user};
        my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
        if (defined $oiduser) {
                $change->{authorurl}=$change->{user};

-               $change->{user}=$oiduser;
+               $change->{user}=defined $change->{nickname} ? $change->{nickname} : $oiduser;

        }
        elsif (length $config{cgiurl}) {
                $change->{authorurl} = IkiWiki::cgiurl(
                        do => "goto",
        }
        elsif (length $config{cgiurl}) {
                $change->{authorurl} = IkiWiki::cgiurl(
                        do => "goto",

-                       page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
+                       page => IkiWiki::userpage($change->{author}),

                );
        }
 
                );
        }