use_pagespec: do not fail with error when unable to match, unless it fails

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d949566d834fb1cfcc053bd48ae91398f2571e80..c735b26c80e2800955e79730260d4e4cd1ce0b13 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -13,28 +13,35 @@ use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
            %pagestate %wikistate %renderedfiles %oldrenderedfiles
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
            %pagestate %wikistate %renderedfiles %oldrenderedfiles

-           %pagesources %destsources %depends %hooks %forcerebuild
-           $gettext_obj %loaded_plugins};
+           %pagesources %destsources %depends %depends_simple %hooks
+           %forcerebuild %loaded_plugins};

 
 use Exporter q{import};
 
 use Exporter q{import};

-our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
-                 bestlink htmllink readfile writefile pagetype srcfile pagename
-                 displaytime will_render gettext urlto targetpage
+our @EXPORT = qw(hook debug error template htmlpage deptype use_pagespec
+                 add_depends pagespec_match pagespec_match_list bestlink
+                htmllink readfile writefile pagetype srcfile pagename
+                displaytime will_render gettext urlto targetpage

                 add_underlay pagetitle titlepage linkpage newpagefile
                 add_underlay pagetitle titlepage linkpage newpagefile

-                inject
+                inject add_link

                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
                  %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='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
+
+# Page dependency types.
+our $DEPEND_CONTENT=1;
+our $DEPEND_PRESENCE=2;
+our $DEPEND_LINKS=4;

 
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
 memoize("pagespec_translate");
 memoize("file_pruned");
 
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
 memoize("pagespec_translate");
 memoize("file_pruned");

+memoize("template_file");

 
 

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

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


@@ -100,7 +107,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,
        },


@@ -149,6 +156,13 @@ sub getsetup () { #{{{
                safe => 0, # path
                rebuild => 1,
        },
                safe => 0, # path
                rebuild => 1,
        },

+       templatedirs => {
+               type => "internal",
+               default => [],
+               description => "additional directories containing template files",
+               safe => 0,
+               rebuild => 0,
+       },

        underlaydir => {
                type => "string",
                default => "$installdir/share/ikiwiki/basewiki",
        underlaydir => {
                type => "string",
                default => "$installdir/share/ikiwiki/basewiki",


@@ -157,6 +171,13 @@ sub getsetup () { #{{{
                safe => 0, # path
                rebuild => 0,
        },
                safe => 0, # path
                rebuild => 0,
        },

+       underlaydirbase => {
+               type => "internal",
+               default => "$installdir/share/ikiwiki",
+               description => "parent directory containing additional underlays",
+               safe => 0,
+               rebuild => 0,
+       },

        wrappers => {
                type => "internal",
                default => [],
        wrappers => {
                type => "internal",
                default => [],


@@ -174,7 +195,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 +215,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,


@@ -213,6 +234,13 @@ sub getsetup () { #{{{
                safe => 1,
                rebuild => 1,
        },
                safe => 1,
                rebuild => 1,
        },

+       discussionpage => {
+               type => "string",
+               default => gettext("Discussion"),
+               description => "name of Discussion pages",
+               safe => 1,
+               rebuild => 1,
+       },

        sslcookie => {
                type => "boolean",
                default => 0,
        sslcookie => {
                type => "boolean",
                default => 0,


@@ -277,13 +305,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 => "",


@@ -314,8 +349,8 @@ sub getsetup () { #{{{
                default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
                default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,

-                       qr/(^|\/)_MTN\//,
-                       qr/\.dpkg-tmp$/],
+                       qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
+                       qr/(^|\/)CVS\//, qr/\.dpkg-tmp$/],

                description => "regexps of source files to ignore",
                safe => 0,
                rebuild => 1,
                description => "regexps of source files to ignore",
                safe => 0,
                rebuild => 1,


@@ -335,7 +370,7 @@ sub getsetup () { #{{{
        },
        web_commit_regexp => {
                type => "internal",
        },
        web_commit_regexp => {
                type => "internal",

-               default => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
+               default => qr/^web commit (by (.*?(?=: |$))|from ([0-9a-fA-F:.]+[0-9a-fA-F])):?(.*)/,

                description => "regexp to parse web commits from logs",
                safe => 0,
                rebuild => 0,
                description => "regexp to parse web commits from logs",
                safe => 0,
                rebuild => 0,


@@ -424,9 +459,9 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
                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) {


@@ -434,9 +469,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};


@@ -445,7 +480,7 @@ sub checkconfig () { #{{{
        if (defined $config{locale}) {
                if (POSIX::setlocale(&POSIX::LC_ALL, $config{locale})) {
                        $ENV{LANG}=$config{locale};
        if (defined $config{locale}) {
                if (POSIX::setlocale(&POSIX::LC_ALL, $config{locale})) {
                        $ENV{LANG}=$config{locale};

-                       $gettext_obj=undef;
+                       define_gettext();

                }
        }
                
                }
        }
                


@@ -483,9 +518,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}) {


@@ -503,9 +538,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});
        }


@@ -515,26 +550,26 @@ sub loadplugins () { #{{{
        }
        
        if ($config{rcs}) {
        }
        
        if ($config{rcs}) {

-               if (exists $IkiWiki::hooks{rcs}) {
+               if (exists $hooks{rcs}) {

                        error(gettext("cannot use multiple rcs plugins"));
                }
                loadplugin($config{rcs});
        }
                        error(gettext("cannot use multiple rcs plugins"));
                }
                loadplugin($config{rcs});
        }

-       if (! exists $IkiWiki::hooks{rcs}) {
+       if (! exists $hooks{rcs}) {

                loadplugin("norcs");
        }
 
        run_hooks(getopt => sub { shift->() });
        if (grep /^-/, @ARGV) {
                loadplugin("norcs");
        }
 
        run_hooks(getopt => sub { shift->() });
        if (grep /^-/, @ARGV) {

-               print STDERR "Unknown option: $_\n"
+               print STDERR "Unknown option (or missing parameter): $_\n"

                        foreach grep /^-/, @ARGV;
                usage();
        }
 
        return 1;
                        foreach grep /^-/, @ARGV;
                usage();
        }
 
        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}};


@@ -560,9 +595,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};


@@ -570,15 +605,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}) {


@@ -598,56 +633,71 @@ 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 isinternal ($) {

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

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

        
        

-       if ($page =~ /\.([^.]+)$/) {
+       if ($file =~ /\.([^.]+)$/) {

                return $1 if exists $hooks{htmlize}{$1};
        }
                return $1 if exists $hooks{htmlize}{$1};
        }

+       my $base=basename($file);
+       if (exists $hooks{htmlize}{$base} &&
+           $hooks{htmlize}{$base}{noextension}) {
+               return $base;
+       }

        return;
        return;

-} #}}}
+}

 
 

-sub isinternal ($) { #{{{
-       my $page=shift;
-       return exists $pagesources{$page} &&
-               $pagesources{$page} =~ /\._([^.]+)$/;
-} #}}}
+my %pagename_cache;

 
 

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

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

+       if (exists $pagename_cache{$file}) {
+               return $pagename_cache{$file};
+       }
+

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

-       $page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{keepextension};
+       $page=~s/\Q.$type\E*$//
+               if defined $type && !$hooks{htmlize}{$type}{keepextension}
+                       && !$hooks{htmlize}{$type}{noextension};

        if ($config{indexpages} && $page=~/(.*)\/index$/) {
                $page=$1;
        }
        if ($config{indexpages} && $page=~/(.*)\/index$/) {
                $page=$1;
        }

+
+       $pagename_cache{$file} = $page;

        return $page;
        return $page;

-} #}}}
+}

 
 

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

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


@@ -657,27 +707,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;
 


@@ -687,17 +741,17 @@ 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 !~ /^\//) {

-               $dir="$config{underlaydir}/../$dir";
+               $dir="$config{underlaydirbase}/$dir";

        }
 
        if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {
        }
 
        if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {


@@ -705,9 +759,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;


@@ -721,11 +775,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;
        


@@ -749,9 +807,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;


@@ -779,10 +837,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;


@@ -806,9 +864,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;
        


@@ -844,15 +902,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;
 


@@ -864,31 +922,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;


@@ -897,9 +955,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)


@@ -910,15 +968,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;


@@ -929,25 +987,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;


@@ -967,9 +1025,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;


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

-} #}}}
+}

 
 

-sub userlink ($) { #{{{
+sub openiduser ($) {
+       my $user=shift;
+
+       if ($user =~ m!^https?://! &&
+           eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
+               my $display;
+
+               if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) {
+                       # this works in at least 2.x
+                       $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user);
+               }
+               else {
+                       # this only works in 1.x
+                       my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
+                       $display=$oid->display;
+               }
+
+               # Convert "user.somehost.com" to "user [somehost.com]"
+               # (also "user.somehost.co.uk")
+               if ($display !~ /\[/) {
+                       $display=~s/^([-a-zA-Z0-9]+?)\.([-.a-zA-Z0-9]+\.[a-z]+)$/$1 [$2]/;
+               }
+               # Convert "http://somehost.com/user" to "user [somehost.com]".
+               # (also "https://somehost.com/user/")
+               if ($display !~ /\[/) {
+                       $display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/;
+               }
+               $display=~s!^https?://!!; # make sure this is removed
+               eval q{use CGI 'escapeHTML'};
+               error($@) if $@;
+               return escapeHTML($display);
+       }
+       return;
+}
+
+sub userlink ($) {

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


@@ -1049,9 +1142,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;


@@ -1086,9 +1179,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;


@@ -1102,11 +1195,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;


@@ -1184,9 +1277,10 @@ sub preprocess ($$$;$$) { #{{{
                                        );
                                };
                                if ($@) {
                                        );
                                };
                                if ($@) {

-                                       chomp $@;
+                                       my $error=$@;
+                                       chomp $error;

                                        $ret="[[!$command <span class=\"error\">".
                                        $ret="[[!$command <span class=\"error\">".

-                                               gettext("Error").": $@"."</span>]]";
+                                               gettext("Error").": $error"."</span>]]";

                                }
                        }
                        else {
                                }
                        }
                        else {


@@ -1224,7 +1318,7 @@ sub preprocess ($$$;$$) { #{{{
                                                |
                                                "[^"]+"         # single-quoted value
                                                |
                                                |
                                                "[^"]+"         # single-quoted value
                                                |

-                                               [^\s\]]+        # unquoted value
+                                               [^"\s\]]+       # unquoted value

                                        )
                                        \s*                     # whitespace or end
                                                                # of directive
                                        )
                                        \s*                     # whitespace or end
                                                                # of directive


@@ -1247,7 +1341,7 @@ sub preprocess ($$$;$$) { #{{{
                                                |
                                                "[^"]+"         # single-quoted value
                                                |
                                                |
                                                "[^"]+"         # single-quoted value
                                                |

-                                               [^\s\]]+        # unquoted value
+                                               [^"\s\]]+       # unquoted value

                                        )
                                        \s*                     # whitespace or end
                                                                # of directive
                                        )
                                        \s*                     # whitespace or end
                                                                # of directive


@@ -1259,9 +1353,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;


@@ -1272,15 +1366,79 @@ 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>";

-} #}}}
+}
+
+sub check_canedit ($$$;$) {
+       my $page=shift;
+       my $q=shift;
+       my $session=shift;
+       my $nonfatal=shift;
+       
+       my $canedit;
+       run_hooks(canedit => sub {
+               return if defined $canedit;
+               my $ret=shift->($page, $q, $session);
+               if (defined $ret) {
+                       if ($ret eq "") {
+                               $canedit=1;
+                       }
+                       elsif (ref $ret eq 'CODE') {
+                               $ret->() unless $nonfatal;
+                               $canedit=0;
+                       }
+                       elsif (defined $ret) {
+                               error($ret) unless $nonfatal;
+                               $canedit=0;
+                       }
+               }
+       });
+       return defined $canedit ? $canedit : 1;
+}
+
+sub check_content (@) {
+       my %params=@_;
+       
+       return 1 if ! exists $hooks{checkcontent}; # optimisation
+
+       if (exists $pagesources{$params{page}}) {
+               my @diff;
+               my %old=map { $_ => 1 }
+                       split("\n", readfile(srcfile($pagesources{$params{page}})));
+               foreach my $line (split("\n", $params{content})) {
+                       push @diff, $line if ! exists $old{$_};
+               }
+               $params{diff}=join("\n", @diff);
+       }
+
+       my $ok;
+       run_hooks(checkcontent => sub {
+               return if defined $ok;
+               my $ret=shift->(%params);
+               if (defined $ret) {
+                       if ($ret eq "") {
+                               $ok=1;
+                       }
+                       elsif (ref $ret eq 'CODE') {
+                               $ret->() unless $params{nonfatal};
+                               $ok=0;
+                       }
+                       elsif (defined $ret) {
+                               error($ret) unless $params{nonfatal};
+                               $ok=0;
+                       }
+               }
+
+       });
+       return defined $ok ? $ok : 1;
+}

 
 my $wikilock;
 
 
 my $wikilock;
 

-sub lockwiki () { #{{{
+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}) {


@@ -1292,16 +1450,17 @@ sub lockwiki () { #{{{
                error("failed to get lock");
        }
        return 1;
                error("failed to get lock");
        }
        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


@@ -1310,27 +1469,28 @@ 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=

-               %destsources=%renderedfiles=%pagecase=%pagestate=();
+               %destsources=%renderedfiles=%pagecase=%pagestate=
+               %depends_simple=();

        }
        my $in;
        if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
        }
        my $in;
        if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {


@@ -1370,7 +1530,27 @@ sub loadindex () { #{{{
                                $links{$page}=$d->{links};
                                $oldlinks{$page}=[@{$d->{links}}];
                        }
                                $links{$page}=$d->{links};
                                $oldlinks{$page}=[@{$d->{links}}];
                        }

-                       if (exists $d->{depends}) {
+                       if (ref $d->{depends_simple} eq 'ARRAY') {
+                               # old format
+                               $depends_simple{$page}={
+                                       map { $_ => 1 } @{$d->{depends_simple}}
+                               };
+                       }
+                       elsif (exists $d->{depends_simple}) {
+                               $depends_simple{$page}=$d->{depends_simple};
+                       }
+                       if (exists $d->{dependslist}) {
+                               # old format
+                               $depends{$page}={
+                                       map { $_ => $DEPEND_CONTENT }
+                                               @{$d->{dependslist}}
+                               };
+                       }
+                       elsif (exists $d->{depends} && ! ref $d->{depends}) {
+                               # old format
+                               $depends{$page}={$d->{depends} => $DEPEND_CONTENT };
+                       }
+                       elsif (exists $d->{depends}) {

                                $depends{$page}=$d->{depends};
                        }
                        if (exists $d->{state}) {
                                $depends{$page}=$d->{depends};
                        }
                        if (exists $d->{state}) {


@@ -1386,9 +1566,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;


@@ -1420,6 +1600,10 @@ sub saveindex () { #{{{
                        $index{page}{$src}{depends} = $depends{$page};
                }
 
                        $index{page}{$src}{depends} = $depends{$page};
                }
 

+               if (exists $depends_simple{$page}) {
+                       $index{page}{$src}{depends_simple} = $depends_simple{$page};
+               }
+

                if (exists $pagestate{$page}) {
                        foreach my $id (@hookids) {
                                foreach my $key (keys %{$pagestate{$page}{$id}}) {
                if (exists $pagestate{$page}) {
                        foreach my $id (@hookids) {
                                foreach my $key (keys %{$pagestate{$page}{$id}}) {


@@ -1444,18 +1628,19 @@ 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;
 
        my $template=shift;
 

-       foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
+       foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
+                        "$installdir/share/ikiwiki/templates") {

                return "$dir/$template" if -e "$dir/$template";
        }
        return;
                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) {


@@ -1474,14 +1659,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;
        


@@ -1498,9 +1683,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}) {


@@ -1511,129 +1696,211 @@ 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 rcs_receive () { #{{{
+sub rcs_receive () {

        $hooks{rcs}{rcs_receive}{call}->();
        $hooks{rcs}{rcs_receive}{call}->();

-} #}}}
+}

 
 

-sub globlist_to_pagespec ($) { #{{{
-       my @globlist=split(' ', shift);
+sub add_depends ($$;$) {
+       my $page=shift;
+       my $pagespec=shift;
+       my $deptype=shift || $DEPEND_CONTENT;
+
+       # Is the pagespec a simple page name?
+       if ($pagespec =~ /$config{wiki_file_regexp}/ &&
+           $pagespec !~ /[\s*?()!]/) {
+               $depends_simple{$page}{lc $pagespec} |= $deptype;
+               return 1;
+       }
+
+       # Analyse the pagespec, and match it against all pages
+       # to get a list of influences, and add explicit dependencies
+       # for those.
+       #my $sub=pagespec_translate($pagespec);
+       #return if $@;
+       #foreach my $p (keys %pagesources) {
+       #       my $r=$sub->($p, location => $page );
+       #       my %i=$r->influences;
+       #       foreach my $i (keys %i) {
+       #               $depends_simple{$page}{lc $i} |= $i{$i};
+       #       }
+       #}
+       print STDERR "warning: use of add_depends; influences not tracked\n";
+
+       $depends{$page}{$pagespec} |= $deptype;
+       return 1;
+}
+
+sub use_pagespec ($$;@) {
+       my $page=shift;
+       my $pagespec=shift;
+       my %params=@_;
+
+       my $sub=pagespec_translate($pagespec);
+       error "syntax error in pagespec \"$pagespec\""
+               if $@ || ! defined $sub;
+
+       my @candidates;
+       if (exists $params{limit}) {
+               @candidates=grep { $params{limit}->($_) } keys %pagesources;
+       }
+       else {
+               @candidates=keys %pagesources;
+       }

 
 

-       my (@spec, @skip);
-       foreach my $glob (@globlist) {
-               if ($glob=~/^!(.*)/) {
-                       push @skip, $glob;
+       if (defined $params{sort}) {
+               my $f;
+               if ($params{sort} eq 'title') {
+                       $f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
+               }
+               elsif ($params{sort} eq 'title_natural') {
+                       eval q{use Sort::Naturally};
+                       if ($@) {
+                               error(gettext("Sort::Naturally needed for title_natural sort"));
+                       }
+                       $f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) };
+                }
+               elsif ($params{sort} eq 'mtime') {
+                       $f=sub { $pagemtime{$b} <=> $pagemtime{$a} };
+               }
+               elsif ($params{sort} eq 'age') {
+                       $f=sub { $pagectime{$b} <=> $pagectime{$a} };

                }
                else {
                }
                else {

-                       push @spec, $glob;
+                       error sprintf(gettext("unknown sort type %s"), $params{sort});

                }
                }

+               @candidates = sort { &$f } @candidates;

        }
 
        }
 

-       my $spec=join(' or ', @spec);
-       if (@skip) {
-               my $skip=join(' and ', @skip);
-               if (length $spec) {
-                       $spec="$skip and ($spec)";
+       @candidates=reverse(@candidates) if $params{reverse};
+       
+       my @matches;
+       my $firstfail;
+       my $count=0;
+       foreach my $p (@candidates) {
+               my $r=$sub->($p, location => $page);
+               if ($r) {
+                       push @matches, [$p, $r];
+                       last if defined $params{num} && ++$count == $params{num};

                }
                }

-               else {
-                       $spec=$skip;
+               elsif (! defined $firstfail) {
+                       $firstfail=$r;

                }
        }
                }
        }

-       return $spec;
-} #}}}
-
-sub is_globlist ($) { #{{{
-       my $s=shift;
-       return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
-} #}}}
-
-sub safequote ($) { #{{{
-       my $s=shift;
-       $s=~s/[{}]//g;
-       return "q{$s}";
-} #}}}
-
-sub add_depends ($$) { #{{{
-       my $page=shift;
-       my $pagespec=shift;

        
        

-       return unless pagespec_valid($pagespec);
+       $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);

 
 

-       if (! exists $depends{$page}) {
-               $depends{$page}=$pagespec;
+       my @ret;
+       if (@matches) {
+               # Add all influences from successful matches.
+               foreach my $m (@matches) {
+                       push @ret, $m->[0];
+                       my %i=$m->[1]->influences;
+                       foreach my $i (keys %i) {
+                               $depends_simple{$page}{lc $i} |= $i{$i};
+                       }
+               }

        }
        }

-       else {
-               $depends{$page}=pagespec_merge($depends{$page}, $pagespec);
+       elsif (defined $firstfail) {
+               # Add influences from one failure. (Which one should not
+               # matter; all should have the same influences.)
+               my %i=$firstfail->influences;
+               foreach my $i (keys %i) {
+                       $depends_simple{$page}{lc $i} |= $i{$i};
+               }
+
+               error(sprintf(gettext("cannot match pages: %s"), $firstfail))
+                       if $firstfail->isa("IkiWiki::ErrorReason");

        }
 
        }
 

-       return 1;
-} # }}}
+       return @ret;
+}

 
 

-sub file_pruned ($$) { #{{{
+sub deptype (@) {
+       my $deptype=0;
+       foreach my $type (@_) {
+               if ($type eq 'presence') {
+                       $deptype |= $DEPEND_PRESENCE;
+               }
+               elsif ($type eq 'links') { 
+                       $deptype |= $DEPEND_LINKS;
+               }
+               elsif ($type eq 'content') {
+                       $deptype |= $DEPEND_CONTENT;
+               }
+       }
+       return $deptype;
+}
+
+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);


@@ -1641,38 +1908,46 @@ 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 { #{{{
-       # Only use gettext in the rare cases it's needed.
+sub define_gettext () {
+       # If translation is needed, redefine the gettext function to do it.
+       # Otherwise, it becomes a quick no-op.
+       no warnings 'redefine';

        if ((exists $ENV{LANG} && length $ENV{LANG}) ||
            (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
            (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) {
        if ((exists $ENV{LANG} && length $ENV{LANG}) ||
            (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
            (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) {

-               if (! $gettext_obj) {
-                       $gettext_obj=eval q{
+               *gettext=sub {
+                       my $gettext_obj=eval q{

                                use Locale::gettext q{textdomain};
                                Locale::gettext->domain('ikiwiki')
                        };
                                use Locale::gettext q{textdomain};
                                Locale::gettext->domain('ikiwiki')
                        };

-                       if ($@) {
-                               print STDERR "$@";
-                               $gettext_obj=undef;
+
+                       if ($gettext_obj) {
+                               $gettext_obj->get(shift);
+                       }
+                       else {

                                return shift;
                        }
                                return shift;
                        }

-               }
-               return $gettext_obj->get(shift);
+               };

        }
        else {
        }
        else {

-               return shift;
+               *gettext=sub { return shift };

        }
        }

-} #}}}
+}

 
 

-sub yesno ($) { #{{{
+sub gettext {
+       define_gettext();
+       gettext(@_);
+}
+
+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=@_;


@@ -1695,35 +1970,22 @@ sub inject { #{{{
        }
        use strict;
        use warnings;
        }
        use strict;
        use warnings;

-} #}}}
-
-sub pagespec_merge ($$) { #{{{
-       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);
-        }
+sub add_link ($$) {
+       my $page=shift;
+       my $link=shift;

 
 

-       return "($a) or ($b)";
-} #}}}
+       push @{$links{$page}}, $link
+               unless grep { $_ eq $link } @{$links{$page}};
+}

 
 

-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="";
        # Convert spec to perl code.
        my $code="";

+       my @data;

        while ($spec=~m{
                \s*             # ignore whitespace
                (               # 1: match a single word
        while ($spec=~m{
                \s*             # ignore whitespace
                (               # 1: match a single word


@@ -1738,39 +2000,42 @@ sub pagespec_translate ($) { #{{{
                        [^\s()]+        # any other text
                )
                \s*             # ignore whitespace
                        [^\s()]+        # any other text
                )
                \s*             # ignore whitespace

-       }igx) {
+       }gx) {

                my $word=$1;
                if (lc $word eq 'and') {
                my $word=$1;
                if (lc $word eq 'and') {

-                       $code.=' &&';
+                       $code.=' &';

                }
                elsif (lc $word eq 'or') {
                }
                elsif (lc $word eq 'or') {

-                       $code.=' ||';
+                       $code.=' |';

                }
                elsif ($word eq "(" || $word eq ")" || $word eq "!") {
                        $code.=' '.$word;
                }
                elsif ($word =~ /^(\w+)\((.*)\)$/) {
                        if (exists $IkiWiki::PageSpec::{"match_$1"}) {
                }
                elsif ($word eq "(" || $word eq ")" || $word eq "!") {
                        $code.=' '.$word;
                }
                elsif ($word =~ /^(\w+)\((.*)\)$/) {
                        if (exists $IkiWiki::PageSpec::{"match_$1"}) {

-                               $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
+                               push @data, $2;
+                               $code.="IkiWiki::PageSpec::match_$1(\$page, \$data[$#data], \@_)";

                        }
                        else {
                        }
                        else {

-                               $code.=' 0';
+                               push @data, qq{unknown function in pagespec "$word"};
+                               $code.="IkiWiki::ErrorReason->new(\$data[$#data])";

                        }
                }
                else {
                        }
                }
                else {

-                       $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@_)";
+                       push @data, $word;
+                       $code.=" IkiWiki::PageSpec::match_glob(\$page, \$data[$#data], \@_)";

                }
        }
 
        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=@_;


@@ -1781,69 +2046,122 @@ 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::ErrorReason->new("syntax error in pagespec \"$spec\"")
+               if $@ || ! defined $sub;

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

-} #}}}
+}
+
+sub pagespec_match_list ($$;@) {
+       my $pages=shift;
+       my $spec=shift;
+       my @params=@_;
+
+       my $sub=pagespec_translate($spec);
+       error "syntax error in pagespec \"$spec\""
+               if $@ || ! defined $sub;
+       
+       my @ret;
+       my $r;
+       foreach my $page (@$pages) {
+               $r=$sub->($page, @params);
+               push @ret, $page if $r;
+       }
+
+       if (! @ret && defined $r && $r->isa("IkiWiki::ErrorReason")) {
+               error(sprintf(gettext("cannot match pages: %s"), $r));
+       }
+       else {
+               return @ret;
+       }
+}

 
 

-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 ( #{{{
-       '""'    => sub { ${$_[0]} },
+use overload (
+       '""'    => sub { $_[0][0] },

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

+       '&'     => sub { $_[0]->merge_influences($_[1]); $_[0] },
+       '|'     => sub { $_[1]->merge_influences($_[0]); $_[1] },

        fallback => 1,
        fallback => 1,

-); #}}}
+);

 
 

-sub new { #{{{
-       my $class = shift;
-       my $value = shift;
-       return bless \$value, $class;
-} #}}}
+our @ISA = 'IkiWiki::SuccessReason';

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

-use overload ( #{{{
-       '""'    => sub { ${$_[0]} },
+use overload (
+       '""'    => sub { $_[0][0] },

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

+       '&'     => sub { $_[1]->merge_influences($_[0]); $_[1] },
+       '|'     => sub { $_[0]->merge_influences($_[1]); $_[0] },

        fallback => 1,
        fallback => 1,

-); #}}}
+);

 
 

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

        my $class = shift;
        my $value = shift;
        my $class = shift;
        my $value = shift;

-       return bless \$value, $class;
-}; #}}}
+       return bless [$value, {@_}], $class;
+}
+
+sub influences {
+       my $this=shift;
+       if (! @_) {
+               return %{$this->[1]};
+       }
+       else {
+               $this->[1]={@_};
+       }
+}
+
+sub merge_influences {
+       my $this=shift;
+       my $other=shift;
+       foreach my $influence (keys %{$other->[1]}) {
+               $this->[1]{$influence} |= $other->[1]{$influence};
+       }
+}
+
+package IkiWiki::ErrorReason;
+
+our @ISA = 'IkiWiki::FailReason';

 
 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) {


@@ -1857,118 +2175,121 @@ 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};
        my $links = $IkiWiki::links{$page};

-       return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links};
+       return IkiWiki::FailReason->new("$page has no links")
+               unless $links && @{$links};

        my $bestlink = IkiWiki::bestlink($from, $link);
        foreach my $p (@{$links}) {
                if (length $bestlink) {
        my $bestlink = IkiWiki::bestlink($from, $link);
        foreach my $p (@{$links}) {
                if (length $bestlink) {

-                       return IkiWiki::SuccessReason->new("$page links to $link")
+                       return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS)

                                if $bestlink eq IkiWiki::bestlink($page, $p);
                }
                else {
                                if $bestlink eq IkiWiki::bestlink($page, $p);
                }
                else {

-                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS)

                                if match_glob($p, $link, %params);
                                if match_glob($p, $link, %params);

-                       $p=~s/^\///;
+                       my ($p_rel)=$p=~/^\/?(.*)/;

                        $link=~s/^\///;
                        $link=~s/^\///;

-                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
-                               if match_glob($p, $link, %params);
+                       return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS)
+                               if match_glob($p_rel, $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 ($$;@) { #{{{
-       return match_link($_[1], $_[0], @_);
-} #}}}
+sub match_backlink ($$;@) {
+       my $ret=match_link($_[1], $_[0], @_);
+       $ret->influences($_[1] => $IkiWiki::DEPEND_LINKS);
+       return $ret;
+}

 
 

-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}) {

-                       return IkiWiki::SuccessReason->new("$page created before $testpage");
+                       return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);

                }
                else {
                }
                else {

-                       return IkiWiki::FailReason->new("$page not created before $testpage");
+                       return IkiWiki::FailReason->new("$page not created before $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);

                }
        }
        else {
                }
        }
        else {

-               return IkiWiki::FailReason->new("$testpage has no ctime");
+               return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage => $IkiWiki::DEPEND_PRESENCE);

        }
        }

-} #}}}
+}

 
 

-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}) {

-                       return IkiWiki::SuccessReason->new("$page created after $testpage");
+                       return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);

                }
                else {
                }
                else {

-                       return IkiWiki::FailReason->new("$page not created after $testpage");
+                       return IkiWiki::FailReason->new("$page not created after $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);

                }
        }
        else {
                }
        }
        else {

-               return IkiWiki::FailReason->new("$testpage has no ctime");
+               return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage => $IkiWiki::DEPEND_PRESENCE);

        }
        }

-} #}}}
+}

 
 

-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=@_;
        
        if (! exists $params{user}) {
        shift;
        my $user=shift;
        my %params=@_;
        
        if (! exists $params{user}) {

-               return IkiWiki::FailReason->new("no user specified");
+               return IkiWiki::ErrorReason->new("no user specified");

        }
 
        if (defined $params{user} && lc $params{user} eq lc $user) {
        }
 
        if (defined $params{user} && lc $params{user} eq lc $user) {


@@ -1980,15 +2301,15 @@ 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=@_;
        
        if (! exists $params{user}) {
        shift;
        shift;
        my %params=@_;
        
        if (! exists $params{user}) {

-               return IkiWiki::FailReason->new("no user specified");
+               return IkiWiki::ErrorReason->new("no user specified");

        }
 
        if (defined $params{user} && IkiWiki::is_admin($params{user})) {
        }
 
        if (defined $params{user} && IkiWiki::is_admin($params{user})) {


@@ -2000,15 +2321,15 @@ 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=@_;
        
        if (! exists $params{ip}) {
        shift;
        my $ip=shift;
        my %params=@_;
        
        if (! exists $params{ip}) {

-               return IkiWiki::FailReason->new("no IP specified");
+               return IkiWiki::ErrorReason->new("no IP specified");

        }
 
        if (defined $params{ip} && lc $params{ip} eq lc $ip) {
        }
 
        if (defined $params{ip} && lc $params{ip} eq lc $ip) {


@@ -2017,6 +2338,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