(no commit message)

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

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 34c9e8a9f2dc0fc4a87a8d6a25d57b5de831e90b..5a09e20879c46604350cd3f2e239c854ea594651 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,27 +3,34 @@ package IkiWiki::Plugin::poll;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
-use URI;
+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 => "preprocess", id => "poll", call => \&preprocess);

-       hook(type => "cgi", id => "poll", call => \&cgi);
-} # }}}
+       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;
 
 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 $percent=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;
 
        my %choices;
        my @choices;


@@ -45,36 +52,61 @@ sub preprocess (@) { #{{{
 
        my $ret="";
        foreach my $choice (@choices) {
 
        my $ret="";
        foreach my $choice (@choices) {

+               if ($open && exists $config{cgiurl}) {
+                       # use POST to avoid robots
+                       $ret.="<form method=\"POST\" action=\"".IkiWiki::cgiurl()."\">\n";
+               }

                my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0;
                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 {
                }
                else {

-                       $ret.="$choice ($choices{$choice}) ";
+                       $ret.="$choice ($choices{$choice})\n";

                }
                if ($open && exists $config{cgiurl}) {
                }
                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=\"$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.="<br />\n<hr class=poll align=left width=\"$percent%\"/>\n";
+               $ret.="</p>\n<hr class=poll align=left width=\"$percent%\"/>\n";
+               if ($open && exists $config{cgiurl}) {
+                       $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) {
        if ($showtotal) {

-               $ret.="<span>Total votes: $total</span>\n";
+               $ret.="<span>".gettext("Total votes:")." $total</span>\n";

        }
        return "<div class=poll>$ret</div>";
        }
        return "<div class=poll>$ret</div>";

-} # }}}
+}

 
 

-sub cgi ($) { #{{{
+sub sessioncgi ($$) {

        my $cgi=shift;
        my $cgi=shift;

+       my $session=shift;

        if (defined $cgi->param('do') && $cgi->param('do') eq "poll") {
        if (defined $cgi->param('do') && $cgi->param('do') eq "poll") {

-               my $choice=$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');
                        error("no choice specified");
                }
                my $num=$cgi->param('num');


@@ -86,17 +118,30 @@ sub cgi ($) { #{{{
                        error("bad page name");
                }
 
                        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.
                # 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) {
                        # Same vote; no-op.
                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, "$config{url}/".htmlpage($page));
+                       IkiWiki::redirect($cgi, $postvote);

                        exit;
                }
 
                        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.
                my $content=readfile(srcfile($pagesources{$page}));
                # Now parse the content, find the right poll,
                # and find the choice within it, and increment its number.


@@ -104,43 +149,52 @@ sub cgi ($) { #{{{
                my $edit=sub {
                        my $escape=shift;
                        my $params=shift;
                my $edit=sub {
                        my $escape=shift;
                        my $params=shift;

-                       return "\\[[poll $params]]" if $escape;
+                       return "\\[[$prefix $params]]" if $escape;

                        if (--$num == 0) {
                        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;
                                }
                        }
                                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.
+               # Store their vote, update the page, and redirect.

                writefile($pagesources{$page}, $config{srcdir}, $content);
                $session->param($choice_param, $choice);
                IkiWiki::cgi_savesession($session);
                $oldchoice=$session->param($choice_param);
                if ($config{rcs}) {
                writefile($pagesources{$page}, $config{srcdir}, $content);
                $session->param($choice_param, $choice);
                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::rcs_prepedit($pagesources{$page}),
-                               $session->param("name"), $ENV{REMOTE_ADDR});
-               }
-               else {
-                       require IkiWiki::Render;
-                       IkiWiki::refresh();
-                       IkiWiki::saveindex();
+                       IkiWiki::disable_commit_hook();
+                       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();

                }
                }

+               require IkiWiki::Render;
+               IkiWiki::refresh();
+               IkiWiki::saveindex();
+

                # Need to set cookie in same http response that does the
                # redir.
                eval q{use CGI::Cookie};
                error($@) if $@;
                my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id);
                # Need to set cookie in same http response that does the
                # redir.
                eval q{use CGI::Cookie};
                error($@) if $@;
                my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id);

-               print $cgi->redirect(-cookie => $cookie,
-                       -url => "$config{url}/".htmlpage($page));
+               print $cgi->redirect(-cookie => $cookie, -url => $postvote);

                exit;
        }
                exit;
        }

-} #}}}
+}

 
 1
 
 1