Improve error message when postsignin (probably from openid) fails due to

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

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index d598c32089b69db93e522660eede73a25eddd9e7..a3321a32e51d57d898facca21ce50f143ea028f6 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -4,7 +4,6 @@ package IkiWiki::Plugin::poll;
 use warnings;
 use strict;
 use IkiWiki;
-use URI;
 
 sub import { #{{{
        hook(type => "preprocess", id => "poll", call => \&preprocess);
@@ -22,7 +21,7 @@ sub preprocess (@) { #{{{
 
        my $open=yesno($params{open});
        my $showtotal=yesno($params{total});
-       my $percent=yesno($params{percent});
+       my $showpercent=yesno($params{percent});
        $pagenum{$params{page}}++;
 
        my %choices;
@@ -45,27 +44,32 @@ sub preprocess (@) { #{{{
 
        my $ret="";
        foreach my $choice (@choices) {
+               if ($open && exists $config{cgiurl}) {
+                       # use POST to avoid robots
+                       $ret.="<form method=\"POST\" action=\"$config{cgiurl}\">\n";
+               }
                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 {
-                       $ret.="$choice ($choices{$choice}) ";
+                       $ret.="$choice ($choices{$choice})\n";
+               }
+               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=\"page\" value=\"$params{page}\" />\n";
+                       $ret.="<input type=\"hidden\" name=\"choice\" value=\"$choice\" />\n";
+                       $ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";
                }
+               $ret.="</p>\n<hr class=poll align=left width=\"$percent%\"/>\n";
                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.="</form>\n";
                }
-               $ret.="<br />\n<hr class=poll align=left width=\"$percent%\"/>\n";
        }
        if ($showtotal) {
-               $ret.="<span>Total votes: $total</span>\n";
+               $ret.="<span>".gettext("Total votes:")." $total</span>\n";
        }
        return "<div class=poll>$ret</div>";
 } # }}}
@@ -108,7 +112,7 @@ sub cgi ($) { #{{{
                        if (--$num == 0) {
                                $params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se;
                                if (defined $oldchoice) {
-                                       $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1 >=0 ? $2-1 : 0))." \"$oldchoice\"".$3/se;
+                                       $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1 >=0 ? $2-1 : 0)." \"$oldchoice\"".$3/se;
                                }
                        }
                        return "[[poll $params]]";
@@ -123,7 +127,7 @@ sub cgi ($) { #{{{
                if ($config{rcs}) {
                        # prevent deadlock with post-commit hook
                        IkiWiki::unlockwiki();
-                       IkiWiki::rcs_commit($pagesources{$page}, "poll vote",
+                       IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)",
                                IkiWiki::rcs_prepedit($pagesources{$page}),
                                $session->param("name"), $ENV{REMOTE_ADDR});
                }