web commit by joey: revert

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 960d26de93f94e4e95a44098b2b616a3b089f5a2..a2af406a93a692bdc5743b31e95248804521907f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -9,6 +9,43 @@ use HTML::Template;
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
 
+sub defaultconfig () { #{{{
+       wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$|\.rss$)},
+       wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,
+       wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]*)\]\]/,
+       wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
+       verbose => 0,
+       wikiname => "wiki",
+       default_pageext => ".mdwn",
+       cgi => 0,
+       rcs => 'svn',
+       notify => 0,
+       url => '',
+       cgiurl => '',
+       historyurl => '',
+       diffurl => '',
+       anonok => 0,
+       rss => 0,
+       discussion => 1,
+       rebuild => 0,
+       refresh => 0,
+       getctime => 0,
+       wrapper => undef,
+       wrappermode => undef,
+       svnrepo => undef,
+       svnpath => "trunk",
+       srcdir => undef,
+       destdir => undef,
+       pingurl => [],
+       templatedir => "/usr/share/ikiwiki/templates",
+       underlaydir => "/usr/share/ikiwiki/basewiki",
+       setup => undef,
+       adminuser => undef,
+       adminemail => undef,
+       plugin => [qw{inline htmlscrubber}],
+       timeformat => '%c',
+} #}}}
+           
 sub checkconfig () { #{{{
        if ($config{cgi} && ! length $config{url}) {
                error("Must specify url to wiki with --url when using --cgi\n");
@@ -127,7 +164,12 @@ sub readfile ($;$) { #{{{
        
        local $/=undef;
        open (IN, $file) || error("failed to read $file: $!");
-       binmode(IN) if $binary;
+       if (! $binary) {
+               binmode(IN, ":utf8");
+       }
+       else {
+               binmode(IN);
+       }
        my $ret=<IN>;
        close IN;
        return $ret;
@@ -159,7 +201,12 @@ sub writefile ($$$;$) { #{{{
        }
        
        open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
-       binmode(OUT) if $binary;
+       if (! $binary) {
+               binmode(OUT, ":utf8");
+       }
+       else {
+               binmode(OUT);
+       }
        print OUT $content;
        close OUT;
 } #}}}
@@ -225,8 +272,9 @@ sub styleurl (;$) { #{{{
        return $page."style.css";
 } #}}}
 
-sub htmllink ($$;$$$) { #{{{
-       my $page=shift;
+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 $noimageinline=shift; # don't turn links into inline html images
        my $forcesubpage=shift; # force a link to a subpage
@@ -234,10 +282,10 @@ sub htmllink ($$;$$$) { #{{{
 
        my $bestlink;
        if (! $forcesubpage) {
-               $bestlink=bestlink($page, $link);
+               $bestlink=bestlink($lpage, $link);
        }
        else {
-               $bestlink="$page/".lc($link);
+               $bestlink="$lpage/".lc($link);
        }
 
        $linktext=pagetitle(basename($link)) unless defined $linktext;
@@ -246,14 +294,13 @@ sub htmllink ($$;$$$) { #{{{
        
        # TODO BUG: %renderedfiles may not have it, if the linked to page
        # was also added and isn't yet rendered! Note that this bug is
-       # masked by the bug mentioned below that makes all new files
-       # be rendered twice.
+       # masked by the bug that makes all new files be rendered twice.
        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                $bestlink=htmlpage($bestlink);
        }
        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                return "<span><a href=\"".
-                       cgiurl(do => "create", page => $link, from =>$page).
+                       cgiurl(do => "create", page => $link, from => $page).
                        "\">?</a>$linktext</span>"
        }
        
@@ -365,13 +412,27 @@ sub glob_match ($$) { #{{{
        my $page=shift;
        my $glob=shift;
 
-       # turn glob into safe regexp
-       $glob=quotemeta($glob);
-       $glob=~s/\\\*/.*/g;
-       $glob=~s/\\\?/./g;
-       $glob=~s!\\/!/!g;
-       
-       $page=~/^$glob$/i;
+       if ($glob =~ /^link\((.+)\)$/) {
+               my $rev = $links{$page} or return undef;
+               foreach my $p (@$rev) {
+                       return 1 if lc $p eq $1;
+               }
+               return 0;
+       } elsif ($glob =~ /^backlink\((.+)\)$/) {
+               my $rev = $links{$1} or return undef;
+               foreach my $p (@$rev) {
+                       return 1 if lc $p eq $page;
+               }
+               return 0;
+       } else {
+               # turn glob into safe regexp
+               $glob=quotemeta($glob);
+               $glob=~s/\\\*/.*/g;
+               $glob=~s/\\\?/./g;
+               $glob=~s!\\/!/!g;
+               
+               return $page=~/^$glob$/i;
+       }
 } #}}}
 
 sub globlist_match ($$) { #{{{