X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8024a2636feb60026a79715430a66bb572b9eae8..e713d077203856e8bab45de16570c5aaf0f8f2a7:/IkiWiki/Plugin/recentchanges.pm?ds=inline

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 4a8d1bf80..d6292c3f2 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -61,70 +61,74 @@ 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;
 
-    eval q{use CGI::FormBuilder};
-    error($@) if $@;
-    my $f = CGI::FormBuilder->new(
+	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 $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') },
+		template => { template('revert.tmpl') },
+		fields => [qw{revertmessage do sid rev}],
 	);
+	my $buttons=["Revert", "Cancel"];
+
+	$form->field(name => "revertmessage", type => "text", size => 80);
+	$form->field(name => "sid", type => "hidden", value => $session->id,
+		force => 1);
+	$form->field(name => "do", type => "hidden", value => "revert",
+		force => 1);
+
+	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();
+		IkiWiki::rcs_commit_staged(
+			message => $message,
+			session => $session,
+		);
+		IkiWiki::enable_commit_hook();
+	
+		require IkiWiki::Render;
+		IkiWiki::refresh();
+		IkiWiki::saveindex();
+	}
+	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, 200)));
+		$form->field(name => "rev", type => "hidden", value => $rev, force => 1);
+		IkiWiki::showform($form, $buttons, $session, $q);
+		exit 0;
+	}
 
-    $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 "FIXME revert '$rev' failed.";
-        } else {
-            require IkiWiki::Render;
-            IkiWiki::refresh();
-            IkiWiki::saveindex();
-            # FIXME indicate success.
-        }
-    } 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;
+	IkiWiki::redirect($q, urlto($config{recentchangespage}));
+	exit 0;
 }
 
 # Enable the recentchanges link.
@@ -174,19 +178,20 @@ sub store ($$$) {
 			else {
 				$_->{link} = pagetitle($_->{page});
 			}
-			$_->{baseurl}="$config{url}/" if length $config{url};
 
 			$_;
 		} @{$change->{pages}}
 	];
 	push @{$change->{pages}}, { link => '...' } if $is_excess;
-
-        if (length $config{cgiurl}) {
-            $change->{reverturl} = IkiWiki::cgiurl(
-                  do => "revert",
-                  rev => $change->{rev}
-                );
-        }
+	
+	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}
+		);
+	}
 
 	$change->{author}=$change->{user};
 	my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
@@ -220,7 +225,7 @@ sub store ($$$) {
 		wikiname => $config{wikiname},
 	);
 	
-	$template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
+	$template->param(permalink => urlto($config{recentchangespage})."#change-".titlepage($change->{rev}))
 		if exists $config{url};
 	
 	IkiWiki::run_hooks(pagetemplate => sub {