X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ab9d6bae95821a117642ef96e708a26b2ad9953b..237ea79d715fbba5c1be0b73fbe008b3221975fb:/IkiWiki/Plugin/recentchanges.pm

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 9a62cb243..948bb1366 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -62,11 +62,11 @@ sub refresh ($) {
 }
 
 sub confirmation_form {
-    my ($q, $session, $rev) = @_;
+	my ($q, $session, $rev) = @_;
 
-    eval q{use CGI::FormBuilder};
-    error($@) if $@;
-    my $f = CGI::FormBuilder->new(
+	eval q{use CGI::FormBuilder};
+	error($@) if $@;
+	my $f = CGI::FormBuilder->new(
 		name => "revert",
 		header => 0,
 		charset => "utf-8",
@@ -75,55 +75,57 @@ sub confirmation_form {
 		params => $q,
 		action => $config{cgiurl},
 		stylesheet => 1,
-                template => { template('revert.tmpl') },
+		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);
+	$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"];
+	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;
+	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_diff($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.
@@ -179,13 +181,13 @@ sub store ($$$) {
 		} @{$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}) {
+		$change->{reverturl} = IkiWiki::cgiurl(
+			do => "revert",
+			rev => $change->{rev}
+		);
+	}
 
 	$change->{author}=$change->{user};
 	my $oiduser=eval { IkiWiki::openiduser($change->{user}) };