X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/377e82b16c95833a37c1f87e57122e8b44c187cb..f5c270b11dbfb2589df21388a07f55002e076d3c:/IkiWiki/Plugin/recentchanges.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 7eba931be..fe414d865 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -11,10 +11,9 @@ sub import {
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
 	hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
 	hook(type => "refresh", id => "recentchanges", call => \&refresh);
-	hook(type => "pageactions", id => "recentchanges", call => \&pageactions,
-		first => 1);
 	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");
 }
@@ -62,20 +61,83 @@ sub refresh ($) {
 	}
 }
 
-# Enable the recentchanges link on wiki pages.
-sub pageactions (@) {
-	my %params=@_;
-	my $page=$params{page};
+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') },
+	);
 
-	if (defined $config{recentchangespage} && $config{rcs} &&
-	    $page ne $config{recentchangespage}) {
-		return htmllink($page, $page, $config{recentchangespage},
-			gettext("RecentChanges"));
+	$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;
+
+	my @changes=$IkiWiki::hooks{rcs}{rcs_preprevert}{call}->($rev);
+	IkiWiki::check_canchange(
+		cgi => $q,
+		session => $session,
+		changes => \@changes,
+	);
+
+	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::hooks{rcs}{rcs_revert}{call}->($rev);
+		if (! defined $r) { # success
+			rcs_commit_staged(
+				message => sprintf(gettext("This reverts commit %s"), $rev),
+				session => $session,
+				rev => $rev,
+			);
+		}
+		IkiWiki::enable_commit_hook();
+	
+		if (defined $r) {
+			die "Revert '$rev' failed.";
+		}
+		else {
+			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)));
+		$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;
 }
 
-# Backwards compatability for templates still using
-# RECENTCHANGESURL.
+# Enable the recentchanges link.
 sub pagetemplate (@) {
 	my %params=@_;
 	my $template=$params{template};
@@ -128,13 +190,21 @@ sub store ($$$) {
 		} @{$change->{pages}}
 	];
 	push @{$change->{pages}}, { link => '...' } if $is_excess;
+	
+	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}
+		);
+	}
 
-	# 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->{user}=$oiduser;
+		$change->{user}=defined $change->{nickname} ? $change->{nickname} : $oiduser;
 	}
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(