From c430792148b2193585dfed6cc2a5f778f7167de1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 8 Oct 2010 18:50:24 -0400
Subject: refactor
---
IkiWiki/Plugin/recentchanges.pm | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index fe414d865..88100af0f 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -61,12 +61,23 @@ 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",
@@ -77,30 +88,13 @@ sub confirmation_form {
stylesheet => 1,
template => { template('revert.tmpl') },
);
+ my $buttons=["Revert", "Cancel"];
- $f->field(name => "sid", type => "hidden", value => $session->id,
+ $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;
-
- 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) {
--
cgit v1.2.3