aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/recentchanges.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-10-04 16:52:52 -0400
committerJoey Hess <joey@kitenet.net>2010-10-04 16:56:04 -0400
commit3dce3cc1be0141bd0d9df65a7049df454fee5137 (patch)
tree9e273174e7edcceac2edae5812eb0fad386dca5a /IkiWiki/Plugin/recentchanges.pm
parent80da2b28403a7b2c9dd797e8acecdbe8088ec279 (diff)
downloadikiwiki-3dce3cc1be0141bd0d9df65a7049df454fee5137.tar
ikiwiki-3dce3cc1be0141bd0d9df65a7049df454fee5137.tar.gz
indentation and layout
Diffstat (limited to 'IkiWiki/Plugin/recentchanges.pm')
-rw-r--r--IkiWiki/Plugin/recentchanges.pm110
1 files changed, 56 insertions, 54 deletions
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 9a62cb243..7e71d4fc3 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_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.
@@ -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}) };