X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c5d63c549de267dfc5de44f60b619f576e57023d..5c416cea475025494459fc741d8533afcb91f2a6:/IkiWiki/Plugin/poll.pm
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 3bd4af206..5a09e2087 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -69,6 +69,12 @@ sub preprocess (@) {
$ret.="\n";
$ret.="\n";
$ret.="\n";
+ if (defined $params{postlink}) {
+ $ret.="\n";
+ }
+ if (defined $params{posttrail}) {
+ $ret.="\n";
+ }
$ret.="\n";
}
$ret.="
\n
\n";
@@ -99,7 +105,7 @@ sub sessioncgi ($$) {
my $cgi=shift;
my $session=shift;
if (defined $cgi->param('do') && $cgi->param('do') eq "poll") {
- my $choice=decode_utf8($cgi->param('choice'));
+ my $choice=decode_utf8(scalar $cgi->param('choice'));
if (! defined $choice || not length $choice) {
error("no choice specified");
}
@@ -112,13 +118,25 @@ sub sessioncgi ($$) {
error("bad page name");
}
+ my $postvote=urlto($page);
+ if (defined $cgi->param('postlink') && length $cgi->param('postlink')) {
+ $postvote=urlto(bestlink($page, $cgi->param('postlink')));
+ }
+ elsif (defined $cgi->param('posttrail') && length $cgi->param('posttrail')) {
+ my $trailname=bestlink($page, $cgi->param('posttrail'));
+ my $trailnext=$pagestate{$page}{trail}{item}{$trailname}[1];
+ if (defined $trailnext) {
+ $postvote=urlto($trailnext);
+ }
+ }
+
# Did they vote before? If so, let them change their vote,
# and check for dups.
my $choice_param="poll_choice_${page}_$num";
my $oldchoice=$session->param($choice_param);
if (defined $oldchoice && $oldchoice eq $choice) {
# Same vote; no-op.
- IkiWiki::redirect($cgi, urlto($page));
+ IkiWiki::redirect($cgi, $postvote);
exit;
}
@@ -149,7 +167,7 @@ sub sessioncgi ($$) {
};
$content =~ s{(\\?)\[\[\Q$prefix\E\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg;
- # Store their vote, update the page, and redirect to it.
+ # Store their vote, update the page, and redirect.
writefile($pagesources{$page}, $config{srcdir}, $content);
$session->param($choice_param, $choice);
IkiWiki::cgi_savesession($session);
@@ -174,8 +192,7 @@ sub sessioncgi ($$) {
eval q{use CGI::Cookie};
error($@) if $@;
my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id);
- print $cgi->redirect(-cookie => $cookie,
- -url => urlto($page));
+ print $cgi->redirect(-cookie => $cookie, -url => $postvote);
exit;
}
}