X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/912521ef0711204965aa2319d41c7741bd3f4f4c..862ca19eb1aee87e4ac05e8a5a9b326dd32dfe5d:/IkiWiki/Plugin/poll.pm

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index a3321a32e..82e862c59 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,11 +3,11 @@ package IkiWiki::Plugin::poll;
 
 use warnings;
 use strict;
-use IkiWiki;
+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 ($) { #{{{
@@ -74,8 +74,9 @@ 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');
 		if (! defined $choice) {
@@ -92,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) {
@@ -101,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.
@@ -108,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 >=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 +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::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};