document writefile symlink checks

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e0454963dd6bb2a2ef98815be1fb25fa30157185..66fea4369b1326903f0bce26ed019a288e12788e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -24,9 +24,9 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                 inject
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
                 inject
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);

-our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
+our $VERSION = 3.00; # plugin interface version, next is ikiwiki version

 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE

-my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
+our $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE

 
 # Optimisation.
 use Memoize;
 
 # Optimisation.
 use Memoize;


@@ -34,7 +34,7 @@ memoize("abs2rel");
 memoize("pagespec_translate");
 memoize("file_pruned");
 
 memoize("pagespec_translate");
 memoize("file_pruned");
 

-sub getsetup () { #{{{
+sub getsetup () {

        wikiname => {
                type => "string",
                default => "wiki",
        wikiname => {
                type => "string",
                default => "wiki",


@@ -100,7 +100,7 @@ sub getsetup () { #{{{
                type => "string",
                default => '',
                example => "/var/www/wiki/ikiwiki.cgi",
                type => "string",
                default => '',
                example => "/var/www/wiki/ikiwiki.cgi",

-               description => "cgi wrapper to generate",
+               description => "filename of cgi wrapper to generate",

                safe => 0, # file
                rebuild => 0,
        },
                safe => 0, # file
                rebuild => 0,
        },


@@ -120,7 +120,7 @@ sub getsetup () { #{{{
        },
        default_plugins => {
                type => "internal",
        },
        default_plugins => {
                type => "internal",

-               default => [qw{mdwn link inline htmlscrubber passwordauth
+               default => [qw{mdwn link inline meta htmlscrubber passwordauth

                                openid signinedit lockedit conditional
                                recentchanges parentlinks editpage}],
                description => "plugins to enable by default",
                                openid signinedit lockedit conditional
                                recentchanges parentlinks editpage}],
                description => "plugins to enable by default",


@@ -174,7 +174,7 @@ sub getsetup () { #{{{
        verbose => {
                type => "boolean",
                example => 1,
        verbose => {
                type => "boolean",
                example => 1,

-               description => "display verbose messages when building?",
+               description => "display verbose messages?",

                safe => 1,
                rebuild => 0,
        },
                safe => 1,
                rebuild => 0,
        },


@@ -194,7 +194,7 @@ sub getsetup () { #{{{
        },
        prefix_directives => {
                type => "boolean",
        },
        prefix_directives => {
                type => "boolean",

-               default => 0,
+               default => 1,

                description => "use '!'-prefixed preprocessor directives?",
                safe => 0, # changing requires manual transition
                rebuild => 1,
                description => "use '!'-prefixed preprocessor directives?",
                safe => 0, # changing requires manual transition
                rebuild => 1,


@@ -277,13 +277,20 @@ sub getsetup () { #{{{
        },
        umask => {
                type => "integer",
        },
        umask => {
                type => "integer",

-               description => "",

                example => "022",
                description => "force ikiwiki to use a particular umask",
                advanced => 1,
                safe => 0, # paranoia
                rebuild => 0,
        },
                example => "022",
                description => "force ikiwiki to use a particular umask",
                advanced => 1,
                safe => 0, # paranoia
                rebuild => 0,
        },

+       wrappergroup => {
+               type => "string",
+               example => "ikiwiki",
+               description => "group for wrappers to run in",
+               advanced => 1,
+               safe => 0, # paranoia
+               rebuild => 0,
+       },

        libdir => {
                type => "string",
                default => "",
        libdir => {
                type => "string",
                default => "",


@@ -382,6 +389,13 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },

+       test_receive => {
+               type => "internal",
+               default => 0,
+               description => "running in receive test mode",
+               safe => 0,
+               rebuild => 0,
+       },

        getctime => {
                type => "internal",
                default => 0,
        getctime => {
                type => "internal",
                default => 0,


@@ -396,6 +410,13 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },

+       wikistatedir => {
+               type => "internal",
+               default => undef,
+               description => "path to the .ikiwiki directory holding ikiwiki state",
+               safe => 0,
+               rebuild => 0,
+       },

        setupfile => {
                type => "internal",
                default => undef,
        setupfile => {
                type => "internal",
                default => undef,


@@ -404,15 +425,15 @@ sub getsetup () { #{{{
                rebuild => 0,
        },
        allow_symlinks_before_srcdir => {
                rebuild => 0,
        },
        allow_symlinks_before_srcdir => {

-               type => "string",
+               type => "boolean",

                default => 0,
                description => "allow symlinks in the path leading to the srcdir (potentially insecure)",
                safe => 0,
                rebuild => 0,
        },
                default => 0,
                description => "allow symlinks in the path leading to the srcdir (potentially insecure)",
                safe => 0,
                rebuild => 0,
        },

-} #}}}
+}

 
 

-sub defaultconfig () { #{{{
+sub defaultconfig () {

        my %s=getsetup();
        my @ret;
        foreach my $key (keys %s) {
        my %s=getsetup();
        my @ret;
        foreach my $key (keys %s) {


@@ -420,9 +441,9 @@ sub defaultconfig () { #{{{
        }
        use Data::Dumper;
        return @ret;
        }
        use Data::Dumper;
        return @ret;

-} #}}}
+}

 
 

-sub checkconfig () { #{{{
+sub checkconfig () {

        # locale stuff; avoid LC_ALL since it overrides everything
        if (defined $ENV{LC_ALL}) {
                $ENV{LANG} = $ENV{LC_ALL};
        # locale stuff; avoid LC_ALL since it overrides everything
        if (defined $ENV{LC_ALL}) {
                $ENV{LANG} = $ENV{LC_ALL};


@@ -460,7 +481,7 @@ sub checkconfig () { #{{{
        }
        
        $config{wikistatedir}="$config{srcdir}/.ikiwiki"
        }
        
        $config{wikistatedir}="$config{srcdir}/.ikiwiki"

-               unless exists $config{wikistatedir};
+               unless exists $config{wikistatedir} && defined $config{wikistatedir};

 
        if (defined $config{umask}) {
                umask(possibly_foolish_untaint($config{umask}));
 
        if (defined $config{umask}) {
                umask(possibly_foolish_untaint($config{umask}));


@@ -469,9 +490,9 @@ sub checkconfig () { #{{{
        run_hooks(checkconfig => sub { shift->() });
 
        return 1;
        run_hooks(checkconfig => sub { shift->() });
 
        return 1;

-} #}}}
+}

 
 

-sub listplugins () { #{{{
+sub listplugins () {

        my %ret;
 
        foreach my $dir (@INC, $config{libdir}) {
        my %ret;
 
        foreach my $dir (@INC, $config{libdir}) {


@@ -489,9 +510,9 @@ sub listplugins () { #{{{
        }
 
        return keys %ret;
        }
 
        return keys %ret;

-} #}}}
+}

 
 

-sub loadplugins () { #{{{
+sub loadplugins () {

        if (defined $config{libdir} && length $config{libdir}) {
                unshift @INC, possibly_foolish_untaint($config{libdir});
        }
        if (defined $config{libdir} && length $config{libdir}) {
                unshift @INC, possibly_foolish_untaint($config{libdir});
        }


@@ -518,9 +539,9 @@ sub loadplugins () { #{{{
        }
 
        return 1;
        }
 
        return 1;

-} #}}}
+}

 
 

-sub loadplugin ($) { #{{{
+sub loadplugin ($) {

        my $plugin=shift;
 
        return if grep { $_ eq $plugin} @{$config{disable_plugins}};
        my $plugin=shift;
 
        return if grep { $_ eq $plugin} @{$config{disable_plugins}};


@@ -546,9 +567,9 @@ sub loadplugin ($) { #{{{
        }
        $loaded_plugins{$plugin}=1;
        return 1;
        }
        $loaded_plugins{$plugin}=1;
        return 1;

-} #}}}
+}

 
 

-sub error ($;$) { #{{{
+sub error ($;$) {

        my $message=shift;
        my $cleaner=shift;
        log_message('err' => $message) if $config{syslog};
        my $message=shift;
        my $cleaner=shift;
        log_message('err' => $message) if $config{syslog};


@@ -556,15 +577,15 @@ sub error ($;$) { #{{{
                $cleaner->();
        }
        die $message."\n";
                $cleaner->();
        }
        die $message."\n";

-} #}}}
+}

 
 

-sub debug ($) { #{{{
+sub debug ($) {

        return unless $config{verbose};
        return log_message(debug => @_);
        return unless $config{verbose};
        return log_message(debug => @_);

-} #}}}
+}

 
 my $log_open=0;
 
 my $log_open=0;

-sub log_message ($$) { #{{{
+sub log_message ($$) {

        my $type=shift;
 
        if ($config{syslog}) {
        my $type=shift;
 
        if ($config{syslog}) {


@@ -584,44 +605,44 @@ sub log_message ($$) { #{{{
        else {
                return print STDERR "@_\n";
        }
        else {
                return print STDERR "@_\n";
        }

-} #}}}
+}

 
 

-sub possibly_foolish_untaint ($) { #{{{
+sub possibly_foolish_untaint ($) {

        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/s;
        return $untainted;
        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/s;
        return $untainted;

-} #}}}
+}

 
 

-sub basename ($) { #{{{
+sub basename ($) {

        my $file=shift;
 
        $file=~s!.*/+!!;
        return $file;
        my $file=shift;
 
        $file=~s!.*/+!!;
        return $file;

-} #}}}
+}

 
 

-sub dirname ($) { #{{{
+sub dirname ($) {

        my $file=shift;
 
        $file=~s!/*[^/]+$!!;
        return $file;
        my $file=shift;
 
        $file=~s!/*[^/]+$!!;
        return $file;

-} #}}}
+}

 
 

-sub pagetype ($) { #{{{
+sub pagetype ($) {

        my $page=shift;
        
        if ($page =~ /\.([^.]+)$/) {
                return $1 if exists $hooks{htmlize}{$1};
        }
        return;
        my $page=shift;
        
        if ($page =~ /\.([^.]+)$/) {
                return $1 if exists $hooks{htmlize}{$1};
        }
        return;

-} #}}}
+}

 
 

-sub isinternal ($) { #{{{
+sub isinternal ($) {

        my $page=shift;
        return exists $pagesources{$page} &&
                $pagesources{$page} =~ /\._([^.]+)$/;
        my $page=shift;
        return exists $pagesources{$page} &&
                $pagesources{$page} =~ /\._([^.]+)$/;

-} #}}}
+}

 
 

-sub pagename ($) { #{{{
+sub pagename ($) {

        my $file=shift;
 
        my $type=pagetype($file);
        my $file=shift;
 
        my $type=pagetype($file);


@@ -631,9 +652,9 @@ sub pagename ($) { #{{{
                $page=$1;
        }
        return $page;
                $page=$1;
        }
        return $page;

-} #}}}
+}

 
 

-sub newpagefile ($$) { #{{{
+sub newpagefile ($$) {

        my $page=shift;
        my $type=shift;
 
        my $page=shift;
        my $type=shift;
 


@@ -643,27 +664,31 @@ sub newpagefile ($$) { #{{{
        else {
                return $page."/index.".$type;
        }
        else {
                return $page."/index.".$type;
        }

-} #}}}
+}

 
 

-sub targetpage ($$) { #{{{
+sub targetpage ($$;$) {

        my $page=shift;
        my $ext=shift;
        my $page=shift;
        my $ext=shift;

+       my $filename=shift;

        
        

-       if (! $config{usedirs} || $page eq 'index') {
+       if (defined $filename) {
+               return $page."/".$filename.".".$ext;
+       }
+       elsif (! $config{usedirs} || $page eq 'index') {

                return $page.".".$ext;
        }
        else {
                return $page."/index.".$ext;
        }
                return $page.".".$ext;
        }
        else {
                return $page."/index.".$ext;
        }

-} #}}}
+}

 
 

-sub htmlpage ($) { #{{{
+sub htmlpage ($) {

        my $page=shift;
        
        return targetpage($page, $config{htmlext});
        my $page=shift;
        
        return targetpage($page, $config{htmlext});

-} #}}}
+}

 
 

-sub srcfile_stat { #{{{
+sub srcfile_stat {

        my $file=shift;
        my $nothrow=shift;
 
        my $file=shift;
        my $nothrow=shift;
 


@@ -673,13 +698,13 @@ sub srcfile_stat { #{{{
        }
        error("internal error: $file cannot be found in $config{srcdir} or underlay") unless $nothrow;
        return;
        }
        error("internal error: $file cannot be found in $config{srcdir} or underlay") unless $nothrow;
        return;

-} #}}}
+}

 
 

-sub srcfile ($;$) { #{{{
+sub srcfile ($;$) {

        return (srcfile_stat(@_))[0];
        return (srcfile_stat(@_))[0];

-} #}}}
+}

 
 

-sub add_underlay ($) { #{{{
+sub add_underlay ($) {

        my $dir=shift;
 
        if ($dir !~ /^\//) {
        my $dir=shift;
 
        if ($dir !~ /^\//) {


@@ -691,9 +716,9 @@ sub add_underlay ($) { #{{{
        }
 
        return 1;
        }
 
        return 1;

-} #}}}
+}

 
 

-sub readfile ($;$$) { #{{{
+sub readfile ($;$$) {

        my $file=shift;
        my $binary=shift;
        my $wantfd=shift;
        my $file=shift;
        my $binary=shift;
        my $wantfd=shift;


@@ -707,11 +732,15 @@ sub readfile ($;$$) { #{{{
        binmode($in) if ($binary);
        return \*$in if $wantfd;
        my $ret=<$in>;
        binmode($in) if ($binary);
        return \*$in if $wantfd;
        my $ret=<$in>;

+       # check for invalid utf-8, and toss it back to avoid crashes
+       if (! utf8::valid($ret)) {
+               $ret=encode_utf8($ret);
+       }

        close $in || error("failed to read $file: $!");
        return $ret;
        close $in || error("failed to read $file: $!");
        return $ret;

-} #}}}
+}

 
 

-sub prep_writefile ($$) { #{{{
+sub prep_writefile ($$) {

        my $file=shift;
        my $destdir=shift;
        
        my $file=shift;
        my $destdir=shift;
        


@@ -735,9 +764,9 @@ sub prep_writefile ($$) { #{{{
        }
 
        return 1;
        }
 
        return 1;

-} #}}}
+}

 
 

-sub writefile ($$$;$$) { #{{{
+sub writefile ($$$;$$) {

        my $file=shift; # can include subdirs
        my $destdir=shift; # directory to put file in
        my $content=shift;
        my $file=shift; # can include subdirs
        my $destdir=shift; # directory to put file in
        my $content=shift;


@@ -765,10 +794,10 @@ sub writefile ($$$;$$) { #{{{
                error("failed renaming $newfile to $destdir/$file: $!", $cleanup);
 
        return 1;
                error("failed renaming $newfile to $destdir/$file: $!", $cleanup);
 
        return 1;

-} #}}}
+}

 
 my %cleared;
 
 my %cleared;

-sub will_render ($$;$) { #{{{
+sub will_render ($$;$) {

        my $page=shift;
        my $dest=shift;
        my $clear=shift;
        my $page=shift;
        my $dest=shift;
        my $clear=shift;


@@ -792,9 +821,9 @@ sub will_render ($$;$) { #{{{
        $destsources{$dest}=$page;
 
        return 1;
        $destsources{$dest}=$page;
 
        return 1;

-} #}}}
+}

 
 

-sub bestlink ($$) { #{{{
+sub bestlink ($$) {

        my $page=shift;
        my $link=shift;
        
        my $page=shift;
        my $link=shift;
        


@@ -830,15 +859,15 @@ sub bestlink ($$) { #{{{
 
        #print STDERR "warning: page $page, broken link: $link\n";
        return "";
 
        #print STDERR "warning: page $page, broken link: $link\n";
        return "";

-} #}}}
+}

 
 

-sub isinlinableimage ($) { #{{{
+sub isinlinableimage ($) {

        my $file=shift;
        
        return $file =~ /\.(png|gif|jpg|jpeg)$/i;
        my $file=shift;
        
        return $file =~ /\.(png|gif|jpg|jpeg)$/i;

-} #}}}
+}

 
 

-sub pagetitle ($;$) { #{{{
+sub pagetitle ($;$) {

        my $page=shift;
        my $unescaped=shift;
 
        my $page=shift;
        my $unescaped=shift;
 


@@ -850,31 +879,31 @@ sub pagetitle ($;$) { #{{{
        }
 
        return $page;
        }
 
        return $page;

-} #}}}
+}

 
 

-sub titlepage ($) { #{{{
+sub titlepage ($) {

        my $title=shift;
        # support use w/o %config set
        my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
        $title=~s/([^$chars]|_)/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $title;
        my $title=shift;
        # support use w/o %config set
        my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
        $title=~s/([^$chars]|_)/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $title;

-} #}}}
+}

 
 

-sub linkpage ($) { #{{{
+sub linkpage ($) {

        my $link=shift;
        my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
        $link=~s/([^$chars])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $link;
        my $link=shift;
        my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
        $link=~s/([^$chars])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $link;

-} #}}}
+}

 
 

-sub cgiurl (@) { #{{{
+sub cgiurl (@) {

        my %params=@_;
 
        return $config{cgiurl}."?".
                join("&amp;", map $_."=".uri_escape_utf8($params{$_}), keys %params);
        my %params=@_;
 
        return $config{cgiurl}."?".
                join("&amp;", map $_."=".uri_escape_utf8($params{$_}), keys %params);

-} #}}}
+}

 
 

-sub baseurl (;$) { #{{{
+sub baseurl (;$) {

        my $page=shift;
 
        return "$config{url}/" if ! defined $page;
        my $page=shift;
 
        return "$config{url}/" if ! defined $page;


@@ -883,9 +912,9 @@ sub baseurl (;$) { #{{{
        $page=~s/[^\/]+$//;
        $page=~s/[^\/]+\//..\//g;
        return $page;
        $page=~s/[^\/]+$//;
        $page=~s/[^\/]+\//..\//g;
        return $page;

-} #}}}
+}

 
 

-sub abs2rel ($$) { #{{{
+sub abs2rel ($$) {

        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are
        # absolute! (Debian bug #376658; fixed in debian unstable now)
        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are
        # absolute! (Debian bug #376658; fixed in debian unstable now)


@@ -896,15 +925,15 @@ sub abs2rel ($$) { #{{{
        my $ret=File::Spec->abs2rel($path, $base);
        $ret=~s/^// if defined $ret;
        return $ret;
        my $ret=File::Spec->abs2rel($path, $base);
        $ret=~s/^// if defined $ret;
        return $ret;

-} #}}}
+}

 
 

-sub displaytime ($;$) { #{{{
+sub displaytime ($;$) {

        # Plugins can override this function to mark up the time to
        # display.
        return '<span class="date">'.formattime(@_).'</span>';
        # Plugins can override this function to mark up the time to
        # display.
        return '<span class="date">'.formattime(@_).'</span>';

-} #}}}
+}

 
 

-sub formattime ($;$) { #{{{
+sub formattime ($;$) {

        # Plugins can override this function to format the time.
        my $time=shift;
        my $format=shift;
        # Plugins can override this function to format the time.
        my $time=shift;
        my $format=shift;


@@ -915,25 +944,25 @@ sub formattime ($;$) { #{{{
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8
        return decode_utf8(POSIX::strftime($format, localtime($time)));
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8
        return decode_utf8(POSIX::strftime($format, localtime($time)));

-} #}}}
+}

 
 

-sub beautify_urlpath ($) { #{{{
+sub beautify_urlpath ($) {

        my $url=shift;
 
        my $url=shift;
 

-       if ($config{usedirs}) {
-               $url =~ s!/index.$config{htmlext}$!/!;
+       # Ensure url is not an empty link, and if necessary,
+       # add ./ to avoid colon confusion.
+       if ($url !~ /^\// && $url !~ /^\.\.?\//) {
+               $url="./$url";

        }
 
        }
 

-       # Ensure url is not an empty link, and
-       # if it's relative, make that explicit to avoid colon confusion.
-       if ($url !~ /^\//) {
-               $url="./$url";
+       if ($config{usedirs}) {
+               $url =~ s!/index.$config{htmlext}$!/!;

        }
 
        return $url;
        }
 
        return $url;

-} #}}}
+}

 
 

-sub urlto ($$;$) { #{{{
+sub urlto ($$;$) {

        my $to=shift;
        my $from=shift;
        my $absolute=shift;
        my $to=shift;
        my $from=shift;
        my $absolute=shift;


@@ -953,9 +982,9 @@ sub urlto ($$;$) { #{{{
        my $link = abs2rel($to, dirname(htmlpage($from)));
 
        return beautify_urlpath($link);
        my $link = abs2rel($to, dirname(htmlpage($from)));
 
        return beautify_urlpath($link);

-} #}}}
+}

 
 

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

        my $lpage=shift; # the page doing the linking
        my $page=shift; # the page that will contain the link (different for inline)
        my $link=shift;
        my $lpage=shift; # the page doing the linking
        my $page=shift; # the page that will contain the link (different for inline)
        my $link=shift;


@@ -1018,9 +1047,9 @@ sub htmllink ($$$;@) { #{{{
        }
 
        return "<a href=\"$bestlink\"@attrs>$linktext</a>";
        }
 
        return "<a href=\"$bestlink\"@attrs>$linktext</a>";

-} #}}}
+}

 
 

-sub userlink ($) { #{{{
+sub userlink ($) {

        my $user=shift;
 
        my $oiduser=eval { openiduser($user) };
        my $user=shift;
 
        my $oiduser=eval { openiduser($user) };


@@ -1035,9 +1064,9 @@ sub userlink ($) { #{{{
                        length $config{userdir} ? $config{userdir}."/".$user : $user
                ), noimageinline => 1);
        }
                        length $config{userdir} ? $config{userdir}."/".$user : $user
                ), noimageinline => 1);
        }

-} #}}}
+}

 
 

-sub htmlize ($$$$) { #{{{
+sub htmlize ($$$$) {

        my $page=shift;
        my $destpage=shift;
        my $type=shift;
        my $page=shift;
        my $destpage=shift;
        my $type=shift;


@@ -1072,9 +1101,9 @@ sub htmlize ($$$$) { #{{{
        }
 
        return $content;
        }
 
        return $content;

-} #}}}
+}

 
 

-sub linkify ($$$) { #{{{
+sub linkify ($$$) {

        my $page=shift;
        my $destpage=shift;
        my $content=shift;
        my $page=shift;
        my $destpage=shift;
        my $content=shift;


@@ -1088,11 +1117,11 @@ sub linkify ($$$) { #{{{
        });
        
        return $content;
        });
        
        return $content;

-} #}}}
+}

 
 our %preprocessing;
 our $preprocess_preview=0;
 
 our %preprocessing;
 our $preprocess_preview=0;

-sub preprocess ($$$;$$) { #{{{
+sub preprocess ($$$;$$) {

        my $page=shift; # the page the data comes from
        my $destpage=shift; # the page the data will appear in (different for inline)
        my $content=shift;
        my $page=shift; # the page the data comes from
        my $destpage=shift; # the page the data will appear in (different for inline)
        my $content=shift;


@@ -1245,9 +1274,9 @@ sub preprocess ($$$;$$) { #{{{
 
        $content =~ s{$regex}{$handle->($1, $2, $3, $4)}eg;
        return $content;
 
        $content =~ s{$regex}{$handle->($1, $2, $3, $4)}eg;
        return $content;

-} #}}}
+}

 
 

-sub filter ($$$) { #{{{
+sub filter ($$$) {

        my $page=shift;
        my $destpage=shift;
        my $content=shift;
        my $page=shift;
        my $destpage=shift;
        my $content=shift;


@@ -1258,16 +1287,15 @@ sub filter ($$$) { #{{{
        });
 
        return $content;
        });
 
        return $content;

-} #}}}
+}

 
 

-sub indexlink () { #{{{
+sub indexlink () {

        return "<a href=\"$config{url}\">$config{wikiname}</a>";
        return "<a href=\"$config{url}\">$config{wikiname}</a>";

-} #}}}
+}

 
 my $wikilock;
 
 
 my $wikilock;
 

-sub lockwiki (;$) { #{{{
-       my $wait=@_ ? shift : 1;
+sub lockwiki () {

        # Take an exclusive lock on the wiki to prevent multiple concurrent
        # run issues. The lock will be dropped on program exit.
        if (! -d $config{wikistatedir}) {
        # Take an exclusive lock on the wiki to prevent multiple concurrent
        # run issues. The lock will be dropped on program exit.
        if (! -d $config{wikistatedir}) {


@@ -1275,32 +1303,21 @@ sub lockwiki (;$) { #{{{
        }
        open($wikilock, '>', "$config{wikistatedir}/lockfile") ||
                error ("cannot write to $config{wikistatedir}/lockfile: $!");
        }
        open($wikilock, '>', "$config{wikistatedir}/lockfile") ||
                error ("cannot write to $config{wikistatedir}/lockfile: $!");

-       if (! flock($wikilock, 2 | 4)) { # LOCK_EX | LOCK_NB
-               if ($wait) {
-                       debug("wiki seems to be locked, waiting for lock");
-                       my $wait=600; # arbitrary, but don't hang forever to 
-                                     # prevent process pileup
-                       for (1..$wait) {
-                               return if flock($wikilock, 2 | 4);
-                               sleep 1;
-                       }
-                       error("wiki is locked; waited $wait seconds without lock being freed (possible stuck process or stale lock?)");
-               }
-               else {
-                       return 0;
-               }
+       if (! flock($wikilock, 2)) { # LOCK_EX
+               error("failed to get lock");

        }
        return 1;
        }
        return 1;

-} #}}}
+}

 
 

-sub unlockwiki () { #{{{
+sub unlockwiki () {
+       POSIX::close($ENV{IKIWIKI_CGILOCK_FD}) if exists $ENV{IKIWIKI_CGILOCK_FD};

        return close($wikilock) if $wikilock;
        return;
        return close($wikilock) if $wikilock;
        return;

-} #}}}
+}

 
 my $commitlock;
 
 
 my $commitlock;
 

-sub commit_hook_enabled () { #{{{
+sub commit_hook_enabled () {

        open($commitlock, '+>', "$config{wikistatedir}/commitlock") ||
                error("cannot write to $config{wikistatedir}/commitlock: $!");
        if (! flock($commitlock, 1 | 4)) { # LOCK_SH | LOCK_NB to test
        open($commitlock, '+>', "$config{wikistatedir}/commitlock") ||
                error("cannot write to $config{wikistatedir}/commitlock: $!");
        if (! flock($commitlock, 1 | 4)) { # LOCK_SH | LOCK_NB to test


@@ -1309,23 +1326,23 @@ sub commit_hook_enabled () { #{{{
        }
        close($commitlock) || error("failed closing commitlock: $!");
        return 1;
        }
        close($commitlock) || error("failed closing commitlock: $!");
        return 1;

-} #}}}
+}

 
 

-sub disable_commit_hook () { #{{{
+sub disable_commit_hook () {

        open($commitlock, '>', "$config{wikistatedir}/commitlock") ||
                error("cannot write to $config{wikistatedir}/commitlock: $!");
        if (! flock($commitlock, 2)) { # LOCK_EX
                error("failed to get commit lock");
        }
        return 1;
        open($commitlock, '>', "$config{wikistatedir}/commitlock") ||
                error("cannot write to $config{wikistatedir}/commitlock: $!");
        if (! flock($commitlock, 2)) { # LOCK_EX
                error("failed to get commit lock");
        }
        return 1;

-} #}}}
+}

 
 

-sub enable_commit_hook () { #{{{
+sub enable_commit_hook () {

        return close($commitlock) if $commitlock;
        return;
        return close($commitlock) if $commitlock;
        return;

-} #}}}
+}

 
 

-sub loadindex () { #{{{
+sub loadindex () {

        %oldrenderedfiles=%pagectime=();
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=
        %oldrenderedfiles=%pagectime=();
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=


@@ -1385,9 +1402,9 @@ sub loadindex () { #{{{
                $destsources{$_}=$page foreach @{$renderedfiles{$page}};
        }
        return close($in);
                $destsources{$_}=$page foreach @{$renderedfiles{$page}};
        }
        return close($in);

-} #}}}
+}

 
 

-sub saveindex () { #{{{
+sub saveindex () {

        run_hooks(savestate => sub { shift->() });
 
        my %hookids;
        run_hooks(savestate => sub { shift->() });
 
        my %hookids;


@@ -1443,18 +1460,18 @@ sub saveindex () { #{{{
                error("failed renaming $newfile to $config{wikistatedir}/indexdb", $cleanup);
        
        return 1;
                error("failed renaming $newfile to $config{wikistatedir}/indexdb", $cleanup);
        
        return 1;

-} #}}}
+}

 
 

-sub template_file ($) { #{{{
+sub template_file ($) {

        my $template=shift;
 
        foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
                return "$dir/$template" if -e "$dir/$template";
        }
        return;
        my $template=shift;
 
        foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
                return "$dir/$template" if -e "$dir/$template";
        }
        return;

-} #}}}
+}

 
 

-sub template_params (@) { #{{{
+sub template_params (@) {

        my $filename=template_file(shift);
 
        if (! defined $filename) {
        my $filename=template_file(shift);
 
        if (! defined $filename) {


@@ -1473,14 +1490,14 @@ sub template_params (@) { #{{{
                @_
        );
        return wantarray ? @ret : {@ret};
                @_
        );
        return wantarray ? @ret : {@ret};

-} #}}}
+}

 
 

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

        require HTML::Template;
        return HTML::Template->new(template_params(@_));
        require HTML::Template;
        return HTML::Template->new(template_params(@_));

-} #}}}
+}

 
 

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

        my $title=shift;
        my $pagebody=shift;
        
        my $title=shift;
        my $pagebody=shift;
        


@@ -1497,9 +1514,9 @@ sub misctemplate ($$;@) { #{{{
                shift->(page => "", destpage => "", template => $template);
        });
        return $template->output;
                shift->(page => "", destpage => "", template => $template);
        });
        return $template->output;

-}#}}}
+}

 
 

-sub hook (@) { # {{{
+sub hook (@) {

        my %param=@_;
        
        if (! exists $param{type} || ! ref $param{call} || ! exists $param{id}) {
        my %param=@_;
        
        if (! exists $param{type} || ! ref $param{call} || ! exists $param{id}) {


@@ -1510,109 +1527,86 @@ sub hook (@) { # {{{
        
        $hooks{$param{type}}{$param{id}}=\%param;
        return 1;
        
        $hooks{$param{type}}{$param{id}}=\%param;
        return 1;

-} # }}}
+}

 
 

-sub run_hooks ($$) { # {{{
+sub run_hooks ($$) {

        # Calls the given sub for each hook of the given type,
        # passing it the hook function to call.
        my $type=shift;
        my $sub=shift;
 
        if (exists $hooks{$type}) {
        # Calls the given sub for each hook of the given type,
        # passing it the hook function to call.
        my $type=shift;
        my $sub=shift;
 
        if (exists $hooks{$type}) {

-               my @deferred;
+               my (@first, @middle, @last);

                foreach my $id (keys %{$hooks{$type}}) {
                foreach my $id (keys %{$hooks{$type}}) {

-                       if ($hooks{$type}{$id}{last}) {
-                               push @deferred, $id;
-                               next;
+                       if ($hooks{$type}{$id}{first}) {
+                               push @first, $id;
+                       }
+                       elsif ($hooks{$type}{$id}{last}) {
+                               push @last, $id;
+                       }
+                       else {
+                               push @middle, $id;

                        }
                        }

-                       $sub->($hooks{$type}{$id}{call});

                }
                }

-               foreach my $id (@deferred) {
+               foreach my $id (@first, @middle, @last) {

                        $sub->($hooks{$type}{$id}{call});
                }
        }
 
        return 1;
                        $sub->($hooks{$type}{$id}{call});
                }
        }
 
        return 1;

-} #}}}
+}

 
 

-sub rcs_update () { #{{{
+sub rcs_update () {

        $hooks{rcs}{rcs_update}{call}->(@_);
        $hooks{rcs}{rcs_update}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {

        $hooks{rcs}{rcs_prepedit}{call}->(@_);
        $hooks{rcs}{rcs_prepedit}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {

        $hooks{rcs}{rcs_commit}{call}->(@_);
        $hooks{rcs}{rcs_commit}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_commit_staged ($$$) { #{{{
+sub rcs_commit_staged ($$$) {

        $hooks{rcs}{rcs_commit_staged}{call}->(@_);
        $hooks{rcs}{rcs_commit_staged}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_add ($) { #{{{
+sub rcs_add ($) {

        $hooks{rcs}{rcs_add}{call}->(@_);
        $hooks{rcs}{rcs_add}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_remove ($) { #{{{
+sub rcs_remove ($) {

        $hooks{rcs}{rcs_remove}{call}->(@_);
        $hooks{rcs}{rcs_remove}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_rename ($$) { #{{{
+sub rcs_rename ($$) {

        $hooks{rcs}{rcs_rename}{call}->(@_);
        $hooks{rcs}{rcs_rename}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {

        $hooks{rcs}{rcs_recentchanges}{call}->(@_);
        $hooks{rcs}{rcs_recentchanges}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {

        $hooks{rcs}{rcs_diff}{call}->(@_);
        $hooks{rcs}{rcs_diff}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {

        $hooks{rcs}{rcs_getctime}{call}->(@_);
        $hooks{rcs}{rcs_getctime}{call}->(@_);

-} #}}}
+}

 
 

-sub globlist_to_pagespec ($) { #{{{
-       my @globlist=split(' ', shift);
+sub rcs_receive () {
+       $hooks{rcs}{rcs_receive}{call}->();
+}

 
 

-       my (@spec, @skip);
-       foreach my $glob (@globlist) {
-               if ($glob=~/^!(.*)/) {
-                       push @skip, $glob;
-               }
-               else {
-                       push @spec, $glob;
-               }
-       }
-
-       my $spec=join(' or ', @spec);
-       if (@skip) {
-               my $skip=join(' and ', @skip);
-               if (length $spec) {
-                       $spec="$skip and ($spec)";
-               }
-               else {
-                       $spec=$skip;
-               }
-       }
-       return $spec;
-} #}}}
-
-sub is_globlist ($) { #{{{
-       my $s=shift;
-       return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
-} #}}}
-
-sub safequote ($) { #{{{
+sub safequote ($) {

        my $s=shift;
        $s=~s/[{}]//g;
        return "q{$s}";
        my $s=shift;
        $s=~s/[{}]//g;
        return "q{$s}";

-} #}}}
+}

 
 

-sub add_depends ($$) { #{{{
+sub add_depends ($$) {

        my $page=shift;
        my $pagespec=shift;
        
        my $page=shift;
        my $pagespec=shift;
        


@@ -1626,9 +1620,9 @@ sub add_depends ($$) { #{{{
        }
 
        return 1;
        }
 
        return 1;

-} # }}}
+}

 
 

-sub file_pruned ($$) { #{{{
+sub file_pruned ($$) {

        require File::Spec;
        my $file=File::Spec->canonpath(shift);
        my $base=File::Spec->canonpath(shift);
        require File::Spec;
        my $file=File::Spec->canonpath(shift);
        my $base=File::Spec->canonpath(shift);


@@ -1636,9 +1630,9 @@ sub file_pruned ($$) { #{{{
 
        my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
        return $file =~ m/$regexp/ && $file ne $base;
 
        my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
        return $file =~ m/$regexp/ && $file ne $base;

-} #}}}
+}

 
 

-sub gettext { #{{{
+sub gettext {

        # Only use gettext in the rare cases it's needed.
        if ((exists $ENV{LANG} && length $ENV{LANG}) ||
            (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
        # Only use gettext in the rare cases it's needed.
        if ((exists $ENV{LANG} && length $ENV{LANG}) ||
            (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||


@@ -1659,15 +1653,15 @@ sub gettext { #{{{
        else {
                return shift;
        }
        else {
                return shift;
        }

-} #}}}
+}

 
 

-sub yesno ($) { #{{{
+sub yesno ($) {

        my $val=shift;
 
        my $val=shift;
 

-       return (defined $val && lc($val) eq gettext("yes"));
-} #}}}
+       return (defined $val && (lc($val) eq gettext("yes") || lc($val) eq "yes" || $val eq "1"));
+}

 
 

-sub inject { #{{{
+sub inject {

        # Injects a new function into the symbol table to replace an
        # exported function.
        my %params=@_;
        # Injects a new function into the symbol table to replace an
        # exported function.
        my %params=@_;


@@ -1690,33 +1684,19 @@ sub inject { #{{{
        }
        use strict;
        use warnings;
        }
        use strict;
        use warnings;

-} #}}}
+}

 
 

-sub pagespec_merge ($$) { #{{{
+sub pagespec_merge ($$) {

        my $a=shift;
        my $b=shift;
 
        return $a if $a eq $b;
        my $a=shift;
        my $b=shift;
 
        return $a if $a eq $b;

-
-        # Support for old-style GlobLists.
-        if (is_globlist($a)) {
-                $a=globlist_to_pagespec($a);
-        }
-        if (is_globlist($b)) {
-                $b=globlist_to_pagespec($b);
-        }
-

        return "($a) or ($b)";
        return "($a) or ($b)";

-} #}}}
+}

 
 

-sub pagespec_translate ($) { #{{{
+sub pagespec_translate ($) {

        my $spec=shift;
 
        my $spec=shift;
 

-       # Support for old-style GlobLists.
-       if (is_globlist($spec)) {
-               $spec=globlist_to_pagespec($spec);
-       }
-

        # Convert spec to perl code.
        my $code="";
        while ($spec=~m{
        # Convert spec to perl code.
        my $code="";
        while ($spec=~m{


@@ -1749,7 +1729,7 @@ sub pagespec_translate ($) { #{{{
                                $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
                        }
                        else {
                                $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
                        }
                        else {

-                               $code.=' 0';
+                               $code.="IkiWiki::FailReason->new(".safequote(qq{unknown function in pagespec "$word"}).")";

                        }
                }
                else {
                        }
                }
                else {


@@ -1758,14 +1738,14 @@ sub pagespec_translate ($) { #{{{
        }
 
        if (! length $code) {
        }
 
        if (! length $code) {

-               $code=0;
+               $code="IkiWiki::FailReason->new('empty pagespec')";

        }
 
        no warnings;
        return eval 'sub { my $page=shift; '.$code.' }';
        }
 
        no warnings;
        return eval 'sub { my $page=shift; '.$code.' }';

-} #}}}
+}

 
 

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

        my $page=shift;
        my $spec=shift;
        my @params=@_;
        my $page=shift;
        my $spec=shift;
        my @params=@_;


@@ -1776,69 +1756,76 @@ sub pagespec_match ($$;@) { #{{{
        }
 
        my $sub=pagespec_translate($spec);
        }
 
        my $sub=pagespec_translate($spec);

-       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
+       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"")
+               if $@ || ! defined $sub;

        return $sub->($page, @params);
        return $sub->($page, @params);

-} #}}}
+}

 
 

-sub pagespec_valid ($) { #{{{
+sub pagespec_valid ($) {

        my $spec=shift;
 
        my $sub=pagespec_translate($spec);
        return ! $@;
        my $spec=shift;
 
        my $sub=pagespec_translate($spec);
        return ! $@;

-} #}}}
+}

 
 

-sub glob2re ($) { #{{{
+sub glob2re ($) {

        my $re=quotemeta(shift);
        $re=~s/\\\*/.*/g;
        $re=~s/\\\?/./g;
        return $re;
        my $re=quotemeta(shift);
        $re=~s/\\\*/.*/g;
        $re=~s/\\\?/./g;
        return $re;

-} #}}}
+}

 
 package IkiWiki::FailReason;
 
 
 package IkiWiki::FailReason;
 

-use overload ( #{{{
+use overload (

        '""'    => sub { ${$_[0]} },
        '0+'    => sub { 0 },
        '!'     => sub { bless $_[0], 'IkiWiki::SuccessReason'},
        fallback => 1,
        '""'    => sub { ${$_[0]} },
        '0+'    => sub { 0 },
        '!'     => sub { bless $_[0], 'IkiWiki::SuccessReason'},
        fallback => 1,

-); #}}}
+);

 
 

-sub new { #{{{
+sub new {

        my $class = shift;
        my $value = shift;
        return bless \$value, $class;
        my $class = shift;
        my $value = shift;
        return bless \$value, $class;

-} #}}}
+}

 
 package IkiWiki::SuccessReason;
 
 
 package IkiWiki::SuccessReason;
 

-use overload ( #{{{
+use overload (

        '""'    => sub { ${$_[0]} },
        '0+'    => sub { 1 },
        '!'     => sub { bless $_[0], 'IkiWiki::FailReason'},
        fallback => 1,
        '""'    => sub { ${$_[0]} },
        '0+'    => sub { 1 },
        '!'     => sub { bless $_[0], 'IkiWiki::FailReason'},
        fallback => 1,

-); #}}}
+);

 
 

-sub new { #{{{
+sub new {

        my $class = shift;
        my $value = shift;
        return bless \$value, $class;
        my $class = shift;
        my $value = shift;
        return bless \$value, $class;

-}; #}}}
+};

 
 package IkiWiki::PageSpec;
 
 
 package IkiWiki::PageSpec;
 

-sub match_glob ($$;@) { #{{{
+sub derel ($$) {
+       my $path=shift;
+       my $from=shift;
+
+       if ($path =~ m!^\./!) {
+               $from=~s#/?[^/]+$## if defined $from;
+               $path=~s#^\./##;
+               $path="$from/$path" if length $from;
+       }
+
+       return $path;
+}
+
+sub match_glob ($$;@) {

        my $page=shift;
        my $glob=shift;
        my %params=@_;
        
        my $page=shift;
        my $glob=shift;
        my %params=@_;
        

-       my $from=exists $params{location} ? $params{location} : '';
-       
-       # relative matching
-       if ($glob =~ m!^\./!) {
-               $from=~s#/?[^/]+$##;
-               $glob=~s#^\./##;
-               $glob="$from/$glob" if length $from;
-       }
+       $glob=derel($glob, $params{location});

 
        my $regexp=IkiWiki::glob2re($glob);
        if ($page=~/^$regexp$/i) {
 
        my $regexp=IkiWiki::glob2re($glob);
        if ($page=~/^$regexp$/i) {


@@ -1852,26 +1839,20 @@ sub match_glob ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("$glob does not match $page");
        }
        else {
                return IkiWiki::FailReason->new("$glob does not match $page");
        }

-} #}}}
+}

 
 

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

        return match_glob($_[0], $_[1], @_, internal => 1)
        return match_glob($_[0], $_[1], @_, internal => 1)

-} #}}}
+}

 
 

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

        my $page=shift;
        my $link=lc(shift);
        my %params=@_;
 
        my $page=shift;
        my $link=lc(shift);
        my %params=@_;
 

+       $link=derel($link, $params{location});

        my $from=exists $params{location} ? $params{location} : '';
 
        my $from=exists $params{location} ? $params{location} : '';
 

-       # relative matching
-       if ($link =~ m!^\.! && defined $from) {
-               $from=~s#/?[^/]+$##;
-               $link=~s#^\./##;
-               $link="$from/$link" if length $from;
-       }
-

        my $links = $IkiWiki::links{$page};
        return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links};
        my $bestlink = IkiWiki::bestlink($from, $link);
        my $links = $IkiWiki::links{$page};
        return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links};
        my $bestlink = IkiWiki::bestlink($from, $link);


@@ -1883,18 +1864,25 @@ sub match_link ($$;@) { #{{{
                else {
                        return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
                                if match_glob($p, $link, %params);
                else {
                        return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
                                if match_glob($p, $link, %params);

+                       $p=~s/^\///;
+                       $link=~s/^\///;
+                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+                               if match_glob($p, $link, %params);

                }
        }
        return IkiWiki::FailReason->new("$page does not link to $link");
                }
        }
        return IkiWiki::FailReason->new("$page does not link to $link");

-} #}}}
+}

 
 

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

        return match_link($_[1], $_[0], @_);
        return match_link($_[1], $_[0], @_);

-} #}}}
+}

 
 

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

        my $page=shift;
        my $testpage=shift;
        my $page=shift;
        my $testpage=shift;

+       my %params=@_;
+       
+       $testpage=derel($testpage, $params{location});

 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {


@@ -1907,11 +1895,14 @@ sub match_created_before ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("$testpage has no ctime");
        }
        else {
                return IkiWiki::FailReason->new("$testpage has no ctime");
        }

-} #}}}
+}

 
 

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

        my $page=shift;
        my $testpage=shift;
        my $page=shift;
        my $testpage=shift;

+       my %params=@_;
+       
+       $testpage=derel($testpage, $params{location});

 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {


@@ -1924,36 +1915,36 @@ sub match_created_after ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("$testpage has no ctime");
        }
        else {
                return IkiWiki::FailReason->new("$testpage has no ctime");
        }

-} #}}}
+}

 
 

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

        if ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift) {
                return IkiWiki::SuccessReason->new('creation_day matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_day did not match');
        }
        if ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift) {
                return IkiWiki::SuccessReason->new('creation_day matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_day did not match');
        }

-} #}}}
+}

 
 

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

        if ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
                return IkiWiki::SuccessReason->new('creation_month matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_month did not match');
        }
        if ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
                return IkiWiki::SuccessReason->new('creation_month matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_month did not match');
        }

-} #}}}
+}

 
 

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

        if ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
                return IkiWiki::SuccessReason->new('creation_year matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_year did not match');
        }
        if ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
                return IkiWiki::SuccessReason->new('creation_year matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_year did not match');
        }

-} #}}}
+}

 
 

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

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


@@ -1971,9 +1962,9 @@ sub match_user ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("user is $params{user}, not $user");
        }
        else {
                return IkiWiki::FailReason->new("user is $params{user}, not $user");
        }

-} #}}}
+}

 
 

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

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


@@ -1991,9 +1982,9 @@ sub match_admin ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("user is not an admin");
        }
        else {
                return IkiWiki::FailReason->new("user is not an admin");
        }

-} #}}}
+}

 
 

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

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


@@ -2008,6 +1999,6 @@ sub match_ip ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
        }
        else {
                return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
        }

-} #}}}
+}

 
 1
 
 1