X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/89000b48f3cb809b13aa64db79abb90d446458b9..ce826411b20f94a6ff95b87574b355f897547840:/IkiWiki/Plugin/poll.pm diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index a5727fc8e..6edf233b4 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::poll; use warnings; use strict; use IkiWiki 2.00; +use Encode; sub import { #{{{ hook(type => "preprocess", id => "poll", call => \&preprocess); @@ -74,11 +75,11 @@ sub preprocess (@) { #{{{ return "
$ret
"; } # }}} -sub sessioncgi ($) { #{{{ +sub sessioncgi ($$) { #{{{ my $cgi=shift; my $session=shift; if (defined $cgi->param('do') && $cgi->param('do') eq "poll") { - my $choice=$cgi->param('choice'); + my $choice=decode_utf8($cgi->param('choice')); if (! defined $choice) { error("no choice specified"); } @@ -101,6 +102,8 @@ sub sessioncgi ($) { #{{{ exit; } + my $prefix=$config{prefix_directives} ? "!poll" : "poll"; + my $content=readfile(srcfile($pagesources{$page})); # Now parse the content, find the right poll, # and find the choice within it, and increment its number. @@ -108,16 +111,16 @@ sub sessioncgi ($) { #{{{ my $edit=sub { my $escape=shift; my $params=shift; - return "\\[[poll $params]]" if $escape; + return "\\[[$prefix $params]]" if $escape; 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; } } - return "[[poll $params]]"; + return "[[$prefix $params]]"; }; - $content =~ s{(\\?)\[\[poll\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg; + $content =~ s{(\\?)\[\[\Q$prefix\E\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg; # Store their vote, update the page, and redirect to it. writefile($pagesources{$page}, $config{srcdir}, $content);