X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/264a28a3b4684eef9a89b56a090b8728ec0e3bee..d2a369537688d31884a2a90886768dfc90b8d706:/IkiWiki/Plugin/poll.pm?ds=inline diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 654d46247..63c93c62d 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -3,7 +3,7 @@ package IkiWiki::Plugin::poll; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; sub import { #{{{ hook(type => "preprocess", id => "poll", call => \&preprocess); @@ -45,7 +45,8 @@ sub preprocess (@) { #{{{ my $ret=""; foreach my $choice (@choices) { if ($open && exists $config{cgiurl}) { - $ret.="
\n"; + # use POST to avoid robots + $ret.="\n"; } my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0; $ret.="

\n"; @@ -60,7 +61,7 @@ sub preprocess (@) { #{{{ $ret.="\n"; $ret.="\n"; $ret.="\n"; - $ret.="\n"; + $ret.="\n"; } $ret.="

\n
\n"; if ($open && exists $config{cgiurl}) { @@ -68,7 +69,7 @@ sub preprocess (@) { #{{{ } } if ($showtotal) { - $ret.="Total votes: $total\n"; + $ret.="".gettext("Total votes:")." $total\n"; } return "
$ret
"; } # }}} @@ -124,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::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};