use same logic as for regular discussion links

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

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 56034b60ad766654c599849c16c965e93f7162d8..a3321a32e51d57d898facca21ce50f143ea028f6 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -45,7 +45,8 @@ sub preprocess (@) { #{{{
        my $ret="";
        foreach my $choice (@choices) {
                if ($open && exists $config{cgiurl}) {
        my $ret="";
        foreach my $choice (@choices) {
                if ($open && exists $config{cgiurl}) {

-                       $ret.="<form action=\"$config{cgiurl}\">\n";
+                       # use POST to avoid robots
+                       $ret.="<form method=\"POST\" action=\"$config{cgiurl}\">\n";

                }
                my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0;
                $ret.="<p>\n";
                }
                my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0;
                $ret.="<p>\n";


@@ -60,7 +61,7 @@ sub preprocess (@) { #{{{
                        $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=\"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=\"vote\" />\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}) {
                }
                $ret.="</p>\n<hr class=poll align=left width=\"$percent%\"/>\n";
                if ($open && exists $config{cgiurl}) {


@@ -68,7 +69,7 @@ sub preprocess (@) { #{{{
                }
        }
        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>";
 } # }}}


@@ -126,7 +127,7 @@ sub cgi ($) { #{{{
                if ($config{rcs}) {
                        # prevent deadlock with post-commit hook
                        IkiWiki::unlockwiki();
                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});
                }
                                IkiWiki::rcs_prepedit($pagesources{$page}),
                                $session->param("name"), $ENV{REMOTE_ADDR});
                }