X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e7ddbb822ac6251bc2204b86495d86f631937d1f..8daaa11baa70e07f6405ccb4474e97cac9627961:/IkiWiki/Plugin/poll.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index e92d0292f..a3321a32e 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -4,7 +4,6 @@ package IkiWiki::Plugin::poll; use warnings; use strict; use IkiWiki; -use URI; 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
"; } # }}} @@ -94,6 +98,7 @@ sub cgi ($) { #{{{ if (defined $oldchoice && $oldchoice eq $choice) { # Same vote; no-op. IkiWiki::redirect($cgi, "$config{url}/".htmlpage($page)); + exit; } my $content=readfile(srcfile($pagesources{$page})); @@ -104,28 +109,13 @@ sub cgi ($) { #{{{ my $escape=shift; my $params=shift; return "\\[[poll $params]]" if $escape; - return $params unless --$num == 0; - my @bits=split(' ', $params); - my @ret; - while (@bits) { - my $n=shift @bits; - if ($n=~/=/) { - # val=param setting - push @ret, $n; - next; - } - my $c=shift @bits; - $c=~s/^"(.*)"/$1/g; - next unless defined $n && defined $c; - if ($c eq $choice) { - $n++; - } - if (defined $oldchoice && $c eq $oldchoice) { - $n--; + if (--$num == 0) { + $params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se; + if (defined $oldchoice) { + $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1 >=0 ? $2-1 : 0)." \"$oldchoice\"".$3/se; } - push @ret, $n, "\"$c\""; } - return "[[poll ".join(" ", @ret)."]]"; + return "[[poll $params]]"; }; $content =~ s{(\\?)\[\[poll\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg; @@ -137,7 +127,7 @@ sub cgi ($) { #{{{ if ($config{rcs}) { # prevent deadlock with post-commit hook IkiWiki::unlockwiki(); - IkiWiki::rcs_commit($pagesources{$page}, "poll vote", + IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)", IkiWiki::rcs_prepedit($pagesources{$page}), $session->param("name"), $ENV{REMOTE_ADDR}); }