X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f92505d78b82c6ac146e43054ebd12441575a602..7aa10a2952a0d0ee8543f575966f7e4a780c993c:/IkiWiki/Plugin/poll.pm

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 41ebd74a0..3bd4af206 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,26 +3,34 @@ package IkiWiki::Plugin::poll;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
+use Encode;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "poll", call => \&getsetup);
 	hook(type => "preprocess", id => "poll", call => \&preprocess);
 	hook(type => "sessioncgi", id => "poll", call => \&sessioncgi);
-} # }}}
+}
 
-sub yesno ($) { #{{{
-	my $val=shift;
-	return (defined $val && lc($val) eq "yes");
-} #}}}
+sub getsetup () {
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+			section => "widget",
+		},
+}
 
 my %pagenum;
-sub preprocess (@) { #{{{
-	my %params=(open => "yes", total => "yes", percent => "yes", @_);
+sub preprocess (@) {
+	my %params=(open => "yes", total => "yes", percent => "yes",
+		expandable => "no", @_);
 
-	my $open=yesno($params{open});
-	my $showtotal=yesno($params{total});
-	my $showpercent=yesno($params{percent});
-	$pagenum{$params{page}}++;
+	my $open=IkiWiki::yesno($params{open});
+	my $showtotal=IkiWiki::yesno($params{total});
+	my $showpercent=IkiWiki::yesno($params{percent});
+	my $expandable=IkiWiki::yesno($params{expandable});
+	my $num=++$pagenum{$params{page}}{$params{destpage}};
 
 	my %choices;
 	my @choices;
@@ -46,7 +54,7 @@ sub preprocess (@) { #{{{
 	foreach my $choice (@choices) {
 		if ($open && exists $config{cgiurl}) {
 			# use POST to avoid robots
-			$ret.="<form method=\"POST\" action=\"$config{cgiurl}\">\n";
+			$ret.="<form method=\"POST\" action=\"".IkiWiki::cgiurl()."\">\n";
 		}
 		my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0;
 		$ret.="<p>\n";
@@ -58,7 +66,7 @@ sub preprocess (@) { #{{{
 		}
 		if ($open && exists $config{cgiurl}) {
 			$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=\"num\" value=\"$num\" />\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";
@@ -68,18 +76,31 @@ sub preprocess (@) { #{{{
 			$ret.="</form>\n";
 		}
 	}
+	
+	if ($expandable && $open && exists $config{cgiurl}) {
+		$ret.="<p>\n";
+		$ret.="<form method=\"POST\" action=\"".IkiWiki::cgiurl()."\">\n";
+		$ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n";
+		$ret.="<input type=\"hidden\" name=\"num\" value=\"$num\" />\n";
+		$ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n";
+		$ret.=gettext("Write in").": <input name=\"choice\" size=50 />\n";
+		$ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";
+		$ret.="</form>\n";
+		$ret.="</p>\n";
+	}
+
 	if ($showtotal) {
 		$ret.="<span>".gettext("Total votes:")." $total</span>\n";
 	}
 	return "<div class=poll>$ret</div>";
-} # }}}
+}
 
-sub sessioncgi ($$) { #{{{
+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) {
+		my $choice=decode_utf8($cgi->param('choice'));
+		if (! defined $choice || not length $choice) {
 			error("no choice specified");
 		}
 		my $num=$cgi->param('num');
@@ -97,10 +118,12 @@ sub sessioncgi ($$) { #{{{
 		my $oldchoice=$session->param($choice_param);
 		if (defined $oldchoice && $oldchoice eq $choice) {
 			# Same vote; no-op.
-			IkiWiki::redirect($cgi, "$config{url}/".htmlpage($page));
+			IkiWiki::redirect($cgi, urlto($page));
 			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 +131,23 @@ sub sessioncgi ($$) { #{{{
 		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 ($params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se) {
+				}
+				elsif ($params=~/expandable=(\w+)/
+				    & &IkiWiki::yesno($1)) {
+					$choice=~s/["\]\n\r]//g;
+					$params.=" 1 \"$choice\""
+						if length $choice;
+				}
 				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);
@@ -126,9 +156,12 @@ sub sessioncgi ($$) { #{{{
 		$oldchoice=$session->param($choice_param);
 		if ($config{rcs}) {
 			IkiWiki::disable_commit_hook();
-			IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)",
-				IkiWiki::rcs_prepedit($pagesources{$page}),
-				$session->param("name"), $ENV{REMOTE_ADDR});
+			IkiWiki::rcs_commit(
+				file => $pagesources{$page},
+				message => "poll vote ($choice)",
+				token => IkiWiki::rcs_prepedit($pagesources{$page}),
+				session => $session,
+			);
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
@@ -142,9 +175,9 @@ sub sessioncgi ($$) { #{{{
 		error($@) if $@;
 		my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id);
 		print $cgi->redirect(-cookie => $cookie,
-			-url => "$config{url}/".htmlpage($page));
+			-url => urlto($page));
 		exit;
 	}
-} #}}}
+}
 
 1