fix cgiurl check

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

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 58e2b04b954b80eca221f7d62e05027a8ffa0d01..6be52eaa6d43b6cc5052a657a0bf907a2d1c78f1 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}) {
+                       error 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;


@@ -62,8 +66,12 @@ sub match_enabled ($$;@) { #{{{
        my $plugin=shift;
        
        # test if the plugin is enabled
        my $plugin=shift;
        
        # test if the plugin is enabled

-       return 1 if UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import");
-       return IkiWiki::FailReason->new("$plugin is not enabled");
+       if (UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import")) {
+               return IkiWiki::SuccessReason->new("$plugin is enabled");
+       }
+       else {
+               return IkiWiki::FailReason->new("$plugin is not enabled");
+       }

 } #}}}
 
 sub match_sourcepage ($$;@) { #{{{
 } #}}}
 
 sub match_sourcepage ($$;@) { #{{{


@@ -72,8 +80,12 @@ sub match_sourcepage ($$;@) { #{{{
        my %params=@_;
 
        return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};
        my %params=@_;
 
        return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};

-       return 1 if match_glob($params{sourcepage}, $glob, @_);
-       return IkiWiki::FailReason->new("sourcepage does not match $glob");
+       if (match_glob($params{sourcepage}, $glob, @_)) {
+               return IkiWiki::SuccessReason->new("sourcepage matches $glob");
+       }
+       else {
+               return IkiWiki::FailReason->new("sourcepage does not match $glob");
+       }

 } #}}}
 
 sub match_destpage ($$;@) { #{{{
 } #}}}
 
 sub match_destpage ($$;@) { #{{{


@@ -82,18 +94,26 @@ sub match_destpage ($$;@) { #{{{
        my %params=@_;
        
        return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};
        my %params=@_;
        
        return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};

-       return 1 if match_glob($params{destpage}, $glob, @_);
-       return IkiWiki::FailReason->new("destpage does not match $glob");
+       if (match_glob($params{destpage}, $glob, @_)) {
+               return IkiWiki::SuccessReason->new("destpage matches $glob");
+       }
+       else {
+               return IkiWiki::FailReason->new("destpage does not match $glob");
+       }

 } #}}}
 
 } #}}}
 

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

        shift;
        shift;
        my %params=@_;
 
        return IkiWiki::FailReason->new("cannot match included") unless exists $params{sourcepage} && exists $params{destpage};
        shift;
        shift;
        my %params=@_;
 
        return IkiWiki::FailReason->new("cannot match included") unless exists $params{sourcepage} && exists $params{destpage};

-       return 1 if $params{sourcepage} ne $params{destpage};
-       return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
+       if ($params{sourcepage} ne $params{destpage}) {
+               return IkiWiki::SuccessReason->new("page $params{sourcepage} is included");
+       }
+       else {
+               return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
+       }

 } #}}}
 
 1
 } #}}}
 
 1