X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/a4b2e77077f0e2ac67df28279c81c5b40d5f551a..75fc44ce2fa43c984a1920f40d97631ace84d4f6:/IkiWiki/Plugin/poll.pm diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 82e862c59..fadc1773e 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -4,24 +4,29 @@ package IkiWiki::Plugin::poll; use warnings; use strict; use IkiWiki 2.00; +use Encode; sub import { #{{{ + hook(type => "getsetup", id => "poll", call => \&getsetup); hook(type => "preprocess", id => "poll", call => \&preprocess); hook(type => "sessioncgi", id => "poll", call => \&sessioncgi); } # }}} -sub yesno ($) { #{{{ - my $val=shift; - return (defined $val && lc($val) eq "yes"); +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, } #}}} my %pagenum; sub preprocess (@) { #{{{ my %params=(open => "yes", total => "yes", percent => "yes", @_); - my $open=yesno($params{open}); - my $showtotal=yesno($params{total}); - my $showpercent=yesno($params{percent}); + my $open=IkiWiki::yesno($params{open}); + my $showtotal=IkiWiki::yesno($params{total}); + my $showpercent=IkiWiki::yesno($params{percent}); $pagenum{$params{page}}++; my %choices; @@ -78,7 +83,7 @@ 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"); } @@ -97,7 +102,7 @@ sub sessioncgi ($$) { #{{{ my $oldchoice=$session->param($choice_param); if (defined $oldchoice && $oldchoice eq $choice) { # Same vote; no-op. - IkiWiki::redirect($cgi, "$config{url}/".htmlpage($page)); + IkiWiki::redirect($cgi, urlto($page, undef, 1)); exit; } @@ -144,7 +149,7 @@ sub sessioncgi ($$) { #{{{ error($@) if $@; my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id); print $cgi->redirect(-cookie => $cookie, - -url => "$config{url}/".htmlpage($page)); + -url => urlto($page, undef, 1)); exit; } } #}}}