X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c269d5c789471c4dfc881943271e72ba77f3caf3..0b977fa22cabf8e1050857412123015c07c30c19:/IkiWiki/Plugin/poll.pm

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 56034b60a..63c93c62d 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::poll;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "preprocess", id => "poll", call => \&preprocess);
@@ -45,7 +45,8 @@ sub preprocess (@) { #{{{
 	my $ret="";
 	foreach my $choice (@choices) {
 		if ($open && exists $config{cgiurl}) {
-			$ret.="<form action=\"$config{cgiurl}\">\n";
+			# use POST to avoid robots
+			$ret.="<form method=\"POST\" action=\"$config{cgiurl}\">\n";
 		}
 		my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0;
 		$ret.="<p>\n";
@@ -60,7 +61,7 @@ sub preprocess (@) { #{{{
 			$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=\"vote\" />\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}) {
@@ -68,7 +69,7 @@ sub preprocess (@) { #{{{
 		}
 	}
 	if ($showtotal) {
-		$ret.="<span>Total votes: $total</span>\n";
+		$ret.="<span>".gettext("Total votes:")." $total</span>\n";
 	}
 	return "<div class=poll>$ret</div>";
 } # }}}
@@ -124,17 +125,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};