* pagespec_match() has changed to take named parameters, to better allow

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

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 35418a3ba448aee3dd8191ab3e7f3ece876d0b9b..29223ace24ef419bfb23bdd468a061bdebfdac19 100644 (file)
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -3,12 +3,9 @@ package IkiWiki::Plugin::conditional;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use UNIVERSAL;
 
-# Globals used to pass information into the PageSpec functions.
-our ($sourcepage, $destpage);
-
 sub import { #{{{
        hook(type => "preprocess", id => "if", call => \&preprocess_if);
 } # }}}
@@ -17,31 +14,32 @@ sub preprocess_if (@) { #{{{
        my %params=@_;
 
        if (! exists $params{test} || ! exists $params{then}) {
-               return "[[if requires \"test\" and \"then\" parameters]]";
+               return "[[if ".gettext('"test" and "then" parameters are required')."]]";
        }
 
        my $result=0;
-       $sourcepage=$params{page};
-       $destpage=$params{destpage};
        # 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)\((.*)\)$/) {
-               $result=eval "IkiWiki::PageSpec::match_$1(undef, ".
-                       IkiWiki::safequote($2).")";
+               $result=pagespec_match($params{page}, $params{test},
+                               location => $params{page},
+                               sourcepage => $params{page},
+                               destpage => $params{destpage});
        }
        else {
                add_depends($params{page}, $params{test});
 
                foreach my $page (keys %pagesources) {
-                       if (pagespec_match($page, $params{test}, $params{page})) {
+                       if (pagespec_match($page, $params{test}, 
+                                       location => $params{page},
+                                       sourcepage => $params{page},
+                                       destpage => $params{destpage})) {
                                $result=1;
                                last;
                        }
                }
        }
-       $sourcepage="";
-       $destpage="";
 
        my $ret;
        if ($result) {
@@ -53,12 +51,13 @@ sub preprocess_if (@) { #{{{
        else {
                $ret="";
        }
-       return IkiWiki::preprocess($params{page}, $params{destpage}, $ret);
+       return IkiWiki::preprocess($params{page}, $params{destpage}, 
+               IkiWiki::filter($params{page}, $ret));
 } # }}}
 
 package IkiWiki::PageSpec;
 
-sub match_enabled ($$) { #{{{
+sub match_enabled ($$;@) { #{{{
        shift;
        my $plugin=shift;
        
@@ -66,24 +65,31 @@ sub match_enabled ($$) { #{{{
        return UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import");
 } #}}}
 
-sub match_sourcepage ($$) { #{{{
+sub match_sourcepage ($$;@) { #{{{
        shift;
        my $glob=shift;
-       
-       return match_glob($IkiWiki::Plugin::conditional::sourcepage, $glob,
-               $IkiWiki::Plugin::conditional::sourcepage);
+       my %params=@_;
+
+       return unless exists $params{sourcepage};
+       return match_glob($params{sourcepage}, $glob, @_);
 } #}}}
 
-sub match_destpage ($$) { #{{{
+sub match_destpage ($$;@) { #{{{
        shift;
        my $glob=shift;
+       my %params=@_;
        
-       return match_glob($IkiWiki::Plugin::conditional::destpage, $glob,
-               $IkiWiki::Plugin::conditional::sourcepage);
+       return unless exists $params{destpage};
+       return match_glob($params{destpage}, $glob, @_);
 } #}}}
 
-sub match_included ($$) { #{{{
-       return $IkiWiki::Plugin::conditional::sourcepage ne $IkiWiki::Plugin::conditional::destpage;
+sub match_included ($$;$) { #{{{
+       shift;
+       shift;
+       my %params=@_;
+
+       return unless exists $params{sourcepage} && exists $params{destpage};
+       return $params{sourcepage} ne $params{destpage};
 } #}}}
 
 1