Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index e459637b8664853171480989d32280c5bdb04659..e536f4e23370773aebd296e290d0c84b2ded83ae 100644 (file)
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -5,7 +5,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
 use strict;
 use IkiWiki 2.00;
 

-my $percentage_pattern = qr/[0-9]+\%/; # pattern to validate percentages
+my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages

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


@@ -29,6 +29,11 @@ sub preprocess (@) { #{{{
        if (defined $params{percent}) {
                $fill = $params{percent};
                ($fill) = $fill =~ m/($percentage_pattern)/; # fill is untainted now
        if (defined $params{percent}) {
                $fill = $params{percent};
                ($fill) = $fill =~ m/($percentage_pattern)/; # fill is untainted now

+               $fill=~s/%$//;
+               if (! defined $fill || ! length $fill || $fill > 100 || $fill < 0) {
+                       error(sprintf(gettext("illegal percent value %s"), $params{percent}));
+               }
+               $fill.="%";

        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {
                add_depends($params{page}, $params{totalpages});
        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {
                add_depends($params{page}, $params{totalpages});


@@ -51,7 +56,7 @@ sub preprocess (@) { #{{{
                }
        }
        else {
                }
        }
        else {

-               error("need either `percent` or `totalpages` and `donepages` parameters");
+               error(gettext("need either `percent` or `totalpages` and `donepages` parameters"));

        }
 
        return <<EODIV
        }
 
        return <<EODIV