* Only try postsignin if no other action matched. Fixes a bug where the

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

diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index c148891672ebc54cfc6196b1143d26725c95974e..5208a44ec5c9a342ff798a3ec8401f240f8562ba 100644 (file)
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -7,12 +7,11 @@ package IkiWiki::Plugin::polygen;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use File::Find;
 
 sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "polygen",
-               call => \&preprocess);
+       hook(type => "preprocess", id => "polygen", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -22,11 +21,16 @@ sub preprocess (@) { #{{{
 
        # Sanitize parameters
        $grammar =~ IkiWiki::basename($grammar);
+       $grammar =~ s/[^A-Za-z0-9]//g;
        $grammar =~ s/\.grm$//;
        $grammar .= '.grm';
        $symbol =~ s/[^A-Za-z0-9]//g if defined $symbol;
+       $symbol = IkiWiki::possibly_foolish_untaint($symbol) if defined $symbol;
 
        my $grmfile = '/usr/share/polygen/ita/polygen.grm';
+       if (! -d '/usr/share/polygen') {
+               return "[[".gettext("polygen not installed")."]]";
+       }
        find({wanted => sub {
                        if (substr($File::Find::name, -length($grammar)) eq $grammar) {
                                $grmfile = IkiWiki::possibly_foolish_untaint($File::Find::name);
@@ -44,10 +48,10 @@ sub preprocess (@) { #{{{
        }
 
        if ($?) {
-               $res="[[polygen failed]]";
+               $res="[[".gettext("polygen failed")."]]";
        }
 
-       # Strip trainling spaces and newlines so that we flow well with the
+       # Strip trailing spaces and newlines so that we flow well with the
        # markdown text
        $res =~ s/\s*$//;
        return $res;