trail: Allow unescaped punctuation in pagenames

[git.ikiwiki.info.git] / IkiWiki / Plugin / poll.pm

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 27df104ab6b05da2208b7d2d7155f49946ab4845..5a09e20879c46604350cd3f2e239c854ea594651 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -23,12 +23,14 @@ sub getsetup () {
 
 my %pagenum;
 sub preprocess (@) {
-       my %params=(open => "yes", total => "yes", percent => "yes", @_);
+       my %params=(open => "yes", total => "yes", percent => "yes",
+               expandable => "no", @_);
 
        my $open=IkiWiki::yesno($params{open});
        my $showtotal=IkiWiki::yesno($params{total});
        my $showpercent=IkiWiki::yesno($params{percent});
-       $pagenum{$params{page}}++;
+       my $expandable=IkiWiki::yesno($params{expandable});
+       my $num=++$pagenum{$params{page}}{$params{destpage}};
 
        my %choices;
        my @choices;
@@ -64,9 +66,15 @@ 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";
+                       if (defined $params{postlink}) {
+                               $ret.="<input type=\"hidden\" name=\"postlink\" value=\"".linkpage($params{postlink})."\" />\n";
+                       }
+                       if (defined $params{posttrail}) {
+                               $ret.="<input type=\"hidden\" name=\"posttrail\" value=\"".linkpage($params{posttrail})."\" />\n";
+                       }
                        $ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";
                }
                $ret.="</p>\n<hr class=poll align=left width=\"$percent%\"/>\n";
@@ -74,6 +82,19 @@ 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";
        }
@@ -84,8 +105,8 @@ sub sessioncgi ($$) {
        my $cgi=shift;
        my $session=shift;
        if (defined $cgi->param('do') && $cgi->param('do') eq "poll") {
-               my $choice=decode_utf8($cgi->param('choice'));
-               if (! defined $choice) {
+               my $choice=decode_utf8(scalar $cgi->param('choice'));
+               if (! defined $choice || not length $choice) {
                        error("no choice specified");
                }
                my $num=$cgi->param('num');
@@ -97,13 +118,25 @@ sub sessioncgi ($$) {
                        error("bad page name");
                }
 
+               my $postvote=urlto($page);
+               if (defined $cgi->param('postlink') && length $cgi->param('postlink')) {
+                       $postvote=urlto(bestlink($page, $cgi->param('postlink')));
+               }
+               elsif (defined $cgi->param('posttrail') && length $cgi->param('posttrail')) {
+                       my $trailname=bestlink($page, $cgi->param('posttrail'));
+                       my $trailnext=$pagestate{$page}{trail}{item}{$trailname}[1];
+                       if (defined $trailnext) {
+                               $postvote=urlto($trailnext);
+                       }
+               }
+
                # Did they vote before? If so, let them change their vote,
                # and check for dups.
                my $choice_param="poll_choice_${page}_$num";
                my $oldchoice=$session->param($choice_param);
                if (defined $oldchoice && $oldchoice eq $choice) {
                        # Same vote; no-op.
-                       IkiWiki::redirect($cgi, urlto($page, undef));
+                       IkiWiki::redirect($cgi, $postvote);
                        exit;
                }
 
@@ -118,7 +151,14 @@ sub sessioncgi ($$) {
                        my $params=shift;
                        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;
                                }
@@ -127,7 +167,7 @@ sub sessioncgi ($$) {
                };
                $content =~ s{(\\?)\[\[\Q$prefix\E\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg;
 
-               # Store their vote, update the page, and redirect to it.
+               # Store their vote, update the page, and redirect.
                writefile($pagesources{$page}, $config{srcdir}, $content);
                $session->param($choice_param, $choice);
                IkiWiki::cgi_savesession($session);
@@ -152,8 +192,7 @@ sub sessioncgi ($$) {
                eval q{use CGI::Cookie};
                error($@) if $@;
                my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id);
-               print $cgi->redirect(-cookie => $cookie,
-                       -url => urlto($page, undef));
+               print $cgi->redirect(-cookie => $cookie, -url => $postvote);
                exit;
        }
 }