X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/10a45c8f435f1280226d5dce45a238ced04cd476..d2a369537688d31884a2a90886768dfc90b8d706:/IkiWiki/Plugin/poll.pm diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 34c9e8a9f..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); @@ -22,7 +21,7 @@ sub preprocess (@) { #{{{ my $open=yesno($params{open}); my $showtotal=yesno($params{total}); - my $percent=yesno($params{percent}); + my $showpercent=yesno($params{percent}); $pagenum{$params{page}}++; my %choices; @@ -45,27 +44,32 @@ sub preprocess (@) { #{{{ my $ret=""; foreach my $choice (@choices) { + if ($open && exists $config{cgiurl}) { + # use POST to avoid robots + $ret.="
\n"; + } my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0; - if ($percent) { - $ret.="$choice ($percent%) "; + $ret.="

\n"; + if ($showpercent) { + $ret.="$choice ($percent%)\n"; } else { - $ret.="$choice ($choices{$choice}) "; + $ret.="$choice ($choices{$choice})\n"; + } + if ($open && exists $config{cgiurl}) { + $ret.="\n"; + $ret.="\n"; + $ret.="\n"; + $ret.="\n"; + $ret.="\n"; } + $ret.="

\n
\n"; if ($open && exists $config{cgiurl}) { - my $url=URI->new($config{cgiurl}); - $url->query_form( - "do" => "poll", - "num" => $pagenum{$params{page}}, - "page" => $params{page}, - "choice" => $choice, - ); - $ret.="vote"; + $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};