X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fb3d5b480085fff26e4d7af3e915615144950511..6fc898df75223b93eba827847fd67934a65d7bee:/IkiWiki/Plugin/poll.pm

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 6edf233b4..fadc1773e 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -7,22 +7,26 @@ 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;
@@ -98,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;
 		}
 
@@ -145,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;
 	}
 } #}}}