]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/recentchanges.pm
Use local paths for most references to pages
[git.ikiwiki.info.git] / IkiWiki / Plugin / recentchanges.pm
index 4cd910667495ece04c3913da9ce13d581c10fdc8..de12bb2c68d0f32ab82f696012f693a4217b8019 100644 (file)
@@ -61,61 +61,65 @@ sub refresh ($) {
        }
 }
 
-sub confirmation_form {
-       my ($q, $session, $rev) = @_;
+sub sessioncgi ($$) {
+       my ($q, $session) = @_;
+       my $do = $q->param('do');
+       my $rev = $q->param('rev');
+
+       return unless $do eq 'revert' && $rev;
+
+       my @changes=$IkiWiki::hooks{rcs}{rcs_preprevert}{call}->($rev);
+       IkiWiki::check_canchange(
+               cgi => $q,
+               session => $session,
+               changes => \@changes,
+       );
 
        eval q{use CGI::FormBuilder};
        error($@) if $@;
-       my $f = CGI::FormBuilder->new(
+       my $form = CGI::FormBuilder->new(
                name => "revert",
                header => 0,
                charset => "utf-8",
                method => 'POST',
                javascript => 0,
                params => $q,
-               action => $config{cgiurl},
+               action => IkiWiki::cgiurl(),
                stylesheet => 1,
                template => { template('revert.tmpl') },
+               fields => [qw{revertmessage do sid rev}],
        );
+       my $buttons=["Revert", "Cancel"];
 
-       $f->field(name => "sid", type => "hidden", value => $session->id,
+       $form->field(name => "revertmessage", type => "text", size => 80);
+       $form->field(name => "sid", type => "hidden", value => $session->id,
                force => 1);
-       $f->field(name => "do", type => "hidden", value => "revert",
+       $form->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'));
+               my $message=sprintf(gettext("This reverts commit %s"), $rev);
+               if (defined $form->field('revertmessage') &&
+                   length $form->field('revertmessage')) {
+                       $message=$form->field('revertmessage')."\n\n".$message;
+               }
+               my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
+               error $r if defined $r;
                IkiWiki::disable_commit_hook();
-               my $r = IkiWiki::rcs_revert(
+               IkiWiki::rcs_commit_staged(
+                       message => $message,
                        session => $session,
-                       rev => $rev);
+               );
                IkiWiki::enable_commit_hook();
        
-               if ($r) {
-                       die "Revert '$rev' failed.";
-               }
-               else {
-                       require IkiWiki::Render;
-                       IkiWiki::refresh();
-                       IkiWiki::saveindex();
-               }
+               require IkiWiki::Render;
+               IkiWiki::refresh();
+               IkiWiki::saveindex();
        }
-       else {
+       elsif ($form->submitted ne 'Cancel') {
                $form->title(sprintf(gettext("confirm reversion of %s"), $rev));
                $form->tmpl_param(diff => encode_entities(scalar IkiWiki::rcs_diff($rev)));
                $form->field(name => "rev", type => "hidden", value => $rev, force => 1);
@@ -123,7 +127,7 @@ sub sessioncgi ($$) {
                exit 0;
        }
 
-       IkiWiki::redirect($q, urlto($config{recentchangespage}, ''));
+       IkiWiki::redirect($q, urlto($config{recentchangespage}, undef));
        exit 0;
 }
 
@@ -174,14 +178,16 @@ sub store ($$$) {
                        else {
                                $_->{link} = pagetitle($_->{page});
                        }
-                       $_->{baseurl}="$config{url}/" if length $config{url};
+                       $_->{baseurl}=IkiWiki::baseurl(undef) if length $config{url};
 
                        $_;
                } @{$change->{pages}}
        ];
        push @{$change->{pages}}, { link => '...' } if $is_excess;
        
-       if (length $config{cgiurl}) {
+       if (length $config{cgiurl} &&
+           exists $IkiWiki::hooks{rcs}{rcs_preprevert} &&
+           exists $IkiWiki::hooks{rcs}{rcs_revert}) {
                $change->{reverturl} = IkiWiki::cgiurl(
                        do => "revert",
                        rev => $change->{rev}
@@ -220,7 +226,7 @@ sub store ($$$) {
                wikiname => $config{wikiname},
        );
        
-       $template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
+       $template->param(permalink => urlto($config{recentchangespage}, undef)."#change-".titlepage($change->{rev}))
                if exists $config{url};
        
        IkiWiki::run_hooks(pagetemplate => sub {