X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/264a28a3b4684eef9a89b56a090b8728ec0e3bee..796f5749859a1fa48ad068b5f2ab9889e0ae88e8:/IkiWiki/Plugin/poll.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 654d46247..eb0e6ef04 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; +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 => "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; -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; @@ -45,7 +53,8 @@ sub preprocess (@) { #{{{ my $ret=""; foreach my $choice (@choices) { if ($open && exists $config{cgiurl}) { - $ret.="
\n"; + # use POST to avoid robots + $ret.="\n"; } my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0; $ret.="

\n"; @@ -57,27 +66,41 @@ sub preprocess (@) { #{{{ } if ($open && exists $config{cgiurl}) { $ret.="\n"; - $ret.="\n"; + $ret.="\n"; $ret.="\n"; $ret.="\n"; - $ret.="\n"; + $ret.="\n"; } $ret.="

\n
\n"; if ($open && exists $config{cgiurl}) { $ret.="
\n"; } } + + if ($expandable && $open && exists $config{cgiurl}) { + $ret.="

\n"; + $ret.="

\n"; + $ret.="\n"; + $ret.="\n"; + $ret.="\n"; + $ret.=gettext("Write in").": \n"; + $ret.="\n"; + $ret.="
\n"; + $ret.="

\n"; + } + if ($showtotal) { - $ret.="Total votes: $total\n"; + $ret.="".gettext("Total votes:")." $total\n"; } return "
$ret
"; -} # }}} +} -sub cgi ($) { #{{{ +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(scalar $cgi->param('choice')); + if (! defined $choice || not length $choice) { error("no choice specified"); } my $num=$cgi->param('num'); @@ -91,15 +114,16 @@ sub cgi ($) { #{{{ # 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. - 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. @@ -107,16 +131,23 @@ sub cgi ($) { #{{{ 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); @@ -124,26 +155,29 @@ 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 ($choice)", - 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); print $cgi->redirect(-cookie => $cookie, - -url => "$config{url}/".htmlpage($page)); + -url => urlto($page)); exit; } -} #}}} +} 1