X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/26c2c63c97e6bfa704357503fdfd8d8834838851..b5e2afa94390dd3349fed81f72892da3beba56ed:/IkiWiki/Plugin/polygen.pm

diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index 2ed81c8e4..63f6bf5db 100644
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -11,8 +11,7 @@ use IkiWiki;
 use File::Find;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "polygen",
-		call => \&preprocess);
+	hook(type => "preprocess", id => "polygen", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -22,13 +21,15 @@ 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 "[[polygen not installed]]";
+		return "[[".gettext("polygen not installed")."]]";
 	}
 	find({wanted => sub {
 			if (substr($File::Find::name, -length($grammar)) eq $grammar) {
@@ -47,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;