size limits

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 4fc37110b95940a1340d721b6a6e93e17813f0d1..990836f8e461226442933064d2d62defb457e27d 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -15,10 +15,11 @@ memoize("pagespec_translate");
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
             %renderedfiles %pagesources %depends %hooks %forcerebuild};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
             %renderedfiles %pagesources %depends %hooks %forcerebuild};
 

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

 sub defaultconfig () { #{{{
        wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$)},
        wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,
 sub defaultconfig () { #{{{
        wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$)},
        wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,

-       wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]*)\]\]/,

        wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
        verbose => 0,
        syslog => 0,
        wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
        verbose => 0,
        syslog => 0,


@@ -45,14 +46,15 @@ sub defaultconfig () { #{{{
        srcdir => undef,
        destdir => undef,
        pingurl => [],
        srcdir => undef,
        destdir => undef,
        pingurl => [],

-       templatedir => "/usr/share/ikiwiki/templates",
-       underlaydir => "/usr/share/ikiwiki/basewiki",
+       templatedir => "$installdir/share/ikiwiki/templates",
+       underlaydir => "$installdir/share/ikiwiki/basewiki",

        setup => undef,
        adminuser => undef,
        adminemail => undef,
        plugin => [qw{mdwn inline htmlscrubber}],
        timeformat => '%c',
        locale => undef,
        setup => undef,
        adminuser => undef,
        adminemail => undef,
        plugin => [qw{mdwn inline htmlscrubber}],
        timeformat => '%c',
        locale => undef,

+       sslcookie => 0,

 } #}}}
    
 sub checkconfig () { #{{{
 } #}}}
    
 sub checkconfig () { #{{{


@@ -304,14 +306,14 @@ sub cgiurl (@) { #{{{
        return $config{cgiurl}."?".join("&", map "$_=$params{$_}", keys %params);
 } #}}}
 
        return $config{cgiurl}."?".join("&", map "$_=$params{$_}", keys %params);
 } #}}}
 

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

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

-       return "$config{url}/style.css" if ! defined $page;
+       return "$config{url}/" if ! defined $page;

        
        $page=~s/[^\/]+$//;
        $page=~s/[^\/]+\//..\//g;
        
        $page=~s/[^\/]+$//;
        $page=~s/[^\/]+\//..\//g;

-       return $page."style.css";
+       return $page;

 } #}}}
 
 sub abs2rel ($$) { #{{{
 } #}}}
 
 sub abs2rel ($$) { #{{{


@@ -345,7 +347,8 @@ sub htmllink ($$$;$$$) { #{{{
 
        $linktext=pagetitle(basename($link)) unless defined $linktext;
        
 
        $linktext=pagetitle(basename($link)) unless defined $linktext;
        

-       return $linktext if length $bestlink && $page eq $bestlink;
+       return "<span class=\"selflink\">$linktext</span>"
+               if length $bestlink && $page eq $bestlink;

        
        # 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
        
        # 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


@@ -475,8 +478,7 @@ sub misctemplate ($$) { #{{{
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                pagebody => $pagebody,
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                pagebody => $pagebody,

-               styleurl => styleurl(),
-               baseurl => "$config{url}/",
+               baseurl => baseurl(),

        );
        return $template->output;
 }#}}}
        );
        return $template->output;
 }#}}}


@@ -545,6 +547,8 @@ sub pagespec_merge ($$) { #{{{
        my $a=shift;
        my $b=shift;
 
        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);
         # Support for old-style GlobLists.
         if (is_globlist($a)) {
                 $a=globlist_to_pagespec($a);