X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fc11e4ad8106ffe9e2e27aeae72055e1f371e755..a2463a812bf33bb22114a5fa1b12519e33fa01b0:/IkiWiki/Plugin/poll.pm
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index bca8f5d54..82e862c59 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,12 +3,11 @@ package IkiWiki::Plugin::poll;
use warnings;
use strict;
-use IkiWiki;
-use URI;
+use IkiWiki 2.00;
sub import { #{{{
hook(type => "preprocess", id => "poll", call => \&preprocess);
- hook(type => "cgi", id => "poll", call => \&cgi);
+ hook(type => "sessioncgi", id => "poll", call => \&sessioncgi);
} # }}}
sub yesno ($) { #{{{
@@ -22,7 +21,7 @@ sub 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;
@@ -45,33 +44,39 @@ sub preprocess (@) { #{{{
my $ret="";
foreach my $choice (@choices) {
+ if ($open && exists $config{cgiurl}) {
+ # use POST to avoid robots
+ $ret.="
\n";
}
- $ret.="
\n
\n";
}
if ($showtotal) {
- $ret.="Total votes: $total\n";
+ $ret.="".gettext("Total votes:")." $total\n";
}
return "$ret
";
} # }}}
-sub cgi ($) { #{{{
+sub sessioncgi ($$) { #{{{
my $cgi=shift;
+ my $session=shift;
if (defined $cgi->param('do') && $cgi->param('do') eq "poll") {
my $choice=$cgi->param('choice');
if (! defined $choice) {
@@ -88,7 +93,6 @@ sub cgi ($) { #{{{
# Did they vote before? If so, let them change their vote,
# and check for dups.
- my $session=IkiWiki::cgi_getsession();
my $choice_param="poll_choice_${page}_$num";
my $oldchoice=$session->param($choice_param);
if (defined $oldchoice && $oldchoice eq $choice) {
@@ -97,6 +101,8 @@ sub cgi ($) { #{{{
exit;
}
+ my $prefix=$config{prefix_directives} ? "!poll" : "poll";
+
my $content=readfile(srcfile($pagesources{$page}));
# Now parse the content, find the right poll,
# and find the choice within it, and increment its number.
@@ -104,16 +110,16 @@ sub cgi ($) { #{{{
my $edit=sub {
my $escape=shift;
my $params=shift;
- return "\\[[poll $params]]" if $escape;
+ return "\\[[$prefix $params]]" if $escape;
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]]";
+ return "[[$prefix $params]]";
};
- $content =~ s{(\\?)\[\[poll\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg;
+ $content =~ s{(\\?)\[\[\Q$prefix\E\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg;
# Store their vote, update the page, and redirect to it.
writefile($pagesources{$page}, $config{srcdir}, $content);
@@ -121,17 +127,17 @@ sub cgi ($) { #{{{
IkiWiki::cgi_savesession($session);
$oldchoice=$session->param($choice_param);
if ($config{rcs}) {
- # prevent deadlock with post-commit hook
- IkiWiki::unlockwiki();
- IkiWiki::rcs_commit($pagesources{$page}, "poll vote",
+ IkiWiki::disable_commit_hook();
+ IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)",
IkiWiki::rcs_prepedit($pagesources{$page}),
$session->param("name"), $ENV{REMOTE_ADDR});
+ IkiWiki::enable_commit_hook();
+ IkiWiki::rcs_update();
}
- else {
- require IkiWiki::Render;
- IkiWiki::refresh();
- IkiWiki::saveindex();
- }
+ require IkiWiki::Render;
+ IkiWiki::refresh();
+ IkiWiki::saveindex();
+
# Need to set cookie in same http response that does the
# redir.
eval q{use CGI::Cookie};