use warnings;
use strict;
use IkiWiki;
-use URI;
sub import { #{{{
hook(type => "preprocess", id => "poll", call => \&preprocess);
my $open=yesno($params{open});
my $showtotal=yesno($params{total});
- my $percent=yesno($params{percent});
+ my $showpercent=yesno($params{percent});
$pagenum{$params{page}}++;
my %choices;
my $ret="";
foreach my $choice (@choices) {
+ if ($open && exists $config{cgiurl}) {
+ # use POST to avoid robots
+ $ret.="<form method=\"POST\" action=\"$config{cgiurl}\">\n";
+ }
my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0;
- if ($percent) {
- $ret.="$choice ($percent%) ";
+ $ret.="<p>\n";
+ if ($showpercent) {
+ $ret.="$choice ($percent%)\n";
}
else {
- $ret.="$choice ($choices{$choice}) ";
+ $ret.="$choice ($choices{$choice})\n";
+ }
+ if ($open && exists $config{cgiurl}) {
+ $ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n";
+ $ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\" />\n";
+ $ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n";
+ $ret.="<input type=\"hidden\" name=\"choice\" value=\"$choice\" />\n";
+ $ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";
}
+ $ret.="</p>\n<hr class=poll align=left width=\"$percent%\"/>\n";
if ($open && exists $config{cgiurl}) {
- my $url=URI->new($config{cgiurl});
- $url->query_form(
- "do" => "poll",
- "num" => $pagenum{$params{page}},
- "page" => $params{page},
- "choice" => $choice,
- );
- $ret.="<a class=pollbutton href=\"$url\">vote</a>";
+ $ret.="</form>\n";
}
- $ret.="<br />\n<hr class=poll align=left width=\"$percent%\"/>\n";
}
if ($showtotal) {
- $ret.="<span>Total votes: $total</span>\n";
+ $ret.="<span>".gettext("Total votes:")." $total</span>\n";
}
return "<div class=poll>$ret</div>";
} # }}}
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)." \"$oldchoice\"".$3/se;
+ $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1 >=0 ? $2-1 : 0)." \"$oldchoice\"".$3/se;
}
}
return "[[poll $params]]";
if ($config{rcs}) {
# prevent deadlock with post-commit hook
IkiWiki::unlockwiki();
- IkiWiki::rcs_commit($pagesources{$page}, "poll vote",
+ IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)",
IkiWiki::rcs_prepedit($pagesources{$page}),
$session->param("name"), $ENV{REMOTE_ADDR});
}