X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/39c917cc5aa533bea5ec954a3c787e2ee53f4727..27c1595cec8606f44d2ec33989daca70cab7d22f:/IkiWiki/Plugin/poll.pm
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 320d2fa77..63c93c62d 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,8 +3,7 @@ package IkiWiki::Plugin::poll;
use warnings;
use strict;
-use IkiWiki;
-use URI;
+use IkiWiki 2.00;
sub import { #{{{
hook(type => "preprocess", id => "poll", call => \&preprocess);
@@ -45,27 +44,32 @@ sub preprocess (@) { #{{{
my $ret="";
foreach my $choice (@choices) {
+ if ($open && exists $config{cgiurl}) {
+ # use POST to avoid robots
+ $ret.="
\n";
}
- $ret.="
\n
\n";
}
if ($showtotal) {
- $ret.="Total votes: $total\n";
+ $ret.="".gettext("Total votes:")." $total\n";
}
return "$ret
";
} # }}}
@@ -121,17 +125,17 @@ sub cgi ($) { #{{{
IkiWiki::cgi_savesession($session);
$oldchoice=$session->param($choice_param);
if ($config{rcs}) {
- # prevent deadlock with post-commit hook
- IkiWiki::unlockwiki();
- IkiWiki::rcs_commit($pagesources{$page}, "poll vote",
+ IkiWiki::disable_commit_hook();
+ IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)",
IkiWiki::rcs_prepedit($pagesources{$page}),
$session->param("name"), $ENV{REMOTE_ADDR});
+ IkiWiki::enable_commit_hook();
+ IkiWiki::rcs_update();
}
- else {
- require IkiWiki::Render;
- IkiWiki::refresh();
- IkiWiki::saveindex();
- }
+ require IkiWiki::Render;
+ IkiWiki::refresh();
+ IkiWiki::saveindex();
+
# Need to set cookie in same http response that does the
# redir.
eval q{use CGI::Cookie};