]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/poll.pm
web commit by XTaran: Changed case of repo link since hgweb seems to be pickier about...
[git.ikiwiki.info.git] / IkiWiki / Plugin / poll.pm
index a3321a32e51d57d898facca21ce50f143ea028f6..6edf233b4f07e3b7b926a765970bdaed538b75b8 100644 (file)
@@ -3,11 +3,12 @@ package IkiWiki::Plugin::poll;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
+use Encode;
 
 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 ($) { #{{{
@@ -74,10 +75,11 @@ sub preprocess (@) { #{{{
        return "<div class=poll>$ret</div>";
 } # }}}
 
-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');
+               my $choice=decode_utf8($cgi->param('choice'));
                if (! defined $choice) {
                        error("no choice specified");
                }
@@ -92,7 +94,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) {
@@ -101,6 +102,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.
@@ -108,16 +111,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 >=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);
@@ -125,17 +128,17 @@ sub cgi ($) { #{{{
                IkiWiki::cgi_savesession($session);
                $oldchoice=$session->param($choice_param);
                if ($config{rcs}) {
-                       # prevent deadlock with post-commit hook
-                       IkiWiki::unlockwiki();
+                       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};