cherry-pick uri security fix

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

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index a7ed6590e52c26a6ab28b037c30e441dd73597f5..57db010544b52d436e7dac2ed42e34ef80445360 100644 (file)
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -13,15 +13,19 @@ sub import { #{{{
 sub preprocess_if (@) { #{{{
        my %params=@_;
 
 sub preprocess_if (@) { #{{{
        my %params=@_;
 

-       if (! exists $params{test} || ! exists $params{then}) {
-               return "[[if ".gettext('"test" and "then" parameters are required')."]]";
+       foreach my $param (qw{test then}) {
+               if (! exists $params{$param}) {
+                       return "[[if ".sprintf(gettext('%s parameter is required'), $param)."]]";
+               }

        }
 
        my $result=0;
        }
 
        my $result=0;

-       # An optimisation to avoid needless looping over every page
-       # and adding of dependencies for simple uses of some of the
-       # tests.
-       if ($params{test} =~ /^(enabled|sourcepage|destpage)\((.*)\)$/) {
+       if ((exists $params{all} && lc $params{all} eq "no") ||
+               # An optimisation to avoid needless looping over every page
+               # and adding of dependencies for simple uses of some of the
+               # tests.
+               $params{test} =~ /^\s*\!?\s*(enabled|sourcepage|destpage|included)\((.*)\)\s*$/) {
+               add_depends($params{page}, "$params{test} and $params{page}");

                $result=pagespec_match($params{page}, $params{test},
                                location => $params{page},
                                sourcepage => $params{page},
                $result=pagespec_match($params{page}, $params{test},
                                location => $params{page},
                                sourcepage => $params{page},


@@ -52,7 +56,7 @@ sub preprocess_if (@) { #{{{
                $ret="";
        }
        return IkiWiki::preprocess($params{page}, $params{destpage}, 
                $ret="";
        }
        return IkiWiki::preprocess($params{page}, $params{destpage}, 

-               IkiWiki::filter($params{page}, $ret));
+               IkiWiki::filter($params{page}, $params{destpage}, $ret));

 } # }}}
 
 package IkiWiki::PageSpec;
 } # }}}
 
 package IkiWiki::PageSpec;


@@ -98,7 +102,7 @@ sub match_destpage ($$;@) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub match_included ($$;$) { #{{{
+sub match_included ($$;@) { #{{{

        shift;
        shift;
        my %params=@_;
        shift;
        shift;
        my %params=@_;