X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e7ddbb822ac6251bc2204b86495d86f631937d1f..07a1796d3bf52bca9a325cf517f742ff44b49921:/IkiWiki/Plugin/poll.pm

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index e92d0292f..63c93c62d 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,8 +3,7 @@ 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);
@@ -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,27 +44,32 @@ sub preprocess (@) { #{{{
 
 	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}) {
-			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.="<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}) {
+			$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>";
 } # }}}
@@ -94,6 +98,7 @@ sub cgi ($) { #{{{
 		if (defined $oldchoice && $oldchoice eq $choice) {
 			# Same vote; no-op.
 			IkiWiki::redirect($cgi, "$config{url}/".htmlpage($page));
+			exit;
 		}
 
 		my $content=readfile(srcfile($pagesources{$page}));
@@ -104,28 +109,13 @@ sub cgi ($) { #{{{
 			my $escape=shift;
 			my $params=shift;
 			return "\\[[poll $params]]" if $escape;
-			return $params unless --$num == 0;
-			my @bits=split(' ', $params);
-			my @ret;
-			while (@bits) {
-				my $n=shift @bits;
-				if ($n=~/=/) {
-					# val=param setting
-					push @ret, $n;
-					next;
-				}
-				my $c=shift @bits;
-				$c=~s/^"(.*)"/$1/g;
-				next unless defined $n && defined $c;
-				if ($c eq $choice) {
-					$n++;
+			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;
 				}
-				if (defined $oldchoice && $c eq $oldchoice) {
-					$n--;
-				}
-				push @ret, $n, "\"$c\"";
 			}
-			return "[[poll ".join(" ", @ret)."]]";
+			return "[[poll $params]]";
 		};
 		$content =~ s{(\\?)\[\[poll\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg;
 
@@ -135,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};