X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d101269bde7eb2d3497b8fe9e6cc6e78aec4663c..646d7bf6a3c9d4f153f8129400a24ad147dcd67c:/IkiWiki/Plugin/poll.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 32cb5c48f..fadc1773e 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -7,15 +7,24 @@ 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 getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, +} #}}} + my %pagenum; sub preprocess (@) { #{{{ my %params=(open => "yes", total => "yes", percent => "yes", @_); - my $open=IkiWIki::yesno($params{open}); + my $open=IkiWiki::yesno($params{open}); my $showtotal=IkiWiki::yesno($params{total}); my $showpercent=IkiWiki::yesno($params{percent}); $pagenum{$params{page}}++; @@ -93,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; } @@ -140,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; } } #}}}