Do not allow the about: URI scheme

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

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 86ed4c840d6757226821411b34d8fffa0d78926e..41ebd74a00763f2bff17e952c2d72047061d7216 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,11 +3,11 @@ package IkiWiki::Plugin::poll;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "preprocess", id => "poll", call => \&preprocess);
 
 sub import { #{{{
        hook(type => "preprocess", id => "poll", call => \&preprocess);

-       hook(type => "cgi", id => "poll", call => \&cgi);
+       hook(type => "sessioncgi", id => "poll", call => \&sessioncgi);

 } # }}}
 
 sub yesno ($) { #{{{
 } # }}}
 
 sub yesno ($) { #{{{


@@ -74,8 +74,9 @@ sub preprocess (@) { #{{{
        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") {
                my $choice=$cgi->param('choice');
                if (! defined $choice) {
        if (defined $cgi->param('do') && $cgi->param('do') eq "poll") {
                my $choice=$cgi->param('choice');
                if (! defined $choice) {


@@ -92,7 +93,6 @@ sub cgi ($) { #{{{
 
                # 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) {
                my $choice_param="poll_choice_${page}_$num";
                my $oldchoice=$session->param($choice_param);
                if (defined $oldchoice && $oldchoice eq $choice) {