Merge branch 'master' into pedigree

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7e64518b313c4c73445974bf45c875739a483464..80e31711062694fb9494306e5900df4ca54f8b2f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 package IkiWiki;
 #!/usr/bin/perl
 
 package IkiWiki;

+

 use warnings;
 use strict;
 use Encode;
 use warnings;
 use strict;
 use Encode;


@@ -88,6 +89,7 @@ sub defaultconfig () { #{{{
        account_creation_password => "",
        prefix_directives => 0,
        hardlink => 0,
        account_creation_password => "",
        prefix_directives => 0,
        hardlink => 0,

+       cgi_disable_uploads => 1,

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


@@ -187,11 +189,6 @@ sub loadplugin ($) { #{{{
 sub error ($;$) { #{{{
        my $message=shift;
        my $cleaner=shift;
 sub error ($;$) { #{{{
        my $message=shift;
        my $cleaner=shift;

-       if ($config{cgi}) {
-               print "Content-type: text/html\n\n";
-               print misctemplate(gettext("Error"),
-                       "<p>".gettext("Error").": $message</p>");
-       }

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


@@ -335,7 +332,7 @@ sub readfile ($;$$) { #{{{
        return $ret;
 } #}}}
 
        return $ret;
 } #}}}
 

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

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


@@ -359,7 +356,7 @@ sub prep_writefile ($$) {
        }
 
        return 1;
        }
 
        return 1;

-}
+} #}}}

 
 sub writefile ($$$;$$) { #{{{
        my $file=shift; # can include subdirs
 
 sub writefile ($$$;$$) { #{{{
        my $file=shift; # can include subdirs


@@ -531,13 +528,18 @@ sub displaytime ($;$) { #{{{
        return decode_utf8(POSIX::strftime($format, localtime($time)));
 } #}}}
 
        return decode_utf8(POSIX::strftime($format, localtime($time)));
 } #}}}
 

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

        my $url=shift;
 
        if ($config{usedirs}) {
                $url =~ s!/index.$config{htmlext}$!/!;
        }
        my $url=shift;
 
        if ($config{usedirs}) {
                $url =~ s!/index.$config{htmlext}$!/!;
        }

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

 
        return $url;
 } #}}}
 
        return $url;
 } #}}}


@@ -547,7 +549,7 @@ sub urlto ($$) { #{{{
        my $from=shift;
 
        if (! length $to) {
        my $from=shift;
 
        if (! length $to) {

-               return beautify_url(baseurl($from));
+               return beautify_urlpath(baseurl($from)."index.$config{htmlext}");

        }
 
        if (! $destsources{$to}) {
        }
 
        if (! $destsources{$to}) {


@@ -556,7 +558,7 @@ sub urlto ($$) { #{{{
 
        my $link = abs2rel($to, dirname(htmlpage($from)));
 
 
        my $link = abs2rel($to, dirname(htmlpage($from)));
 

-       return beautify_url($link);
+       return beautify_urlpath($link);

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


@@ -595,15 +597,15 @@ sub htmllink ($$$;@) { #{{{
                        return "<span class=\"createlink\"><a href=\"".
                                cgiurl(
                                        do => "create",
                        return "<span class=\"createlink\"><a href=\"".
                                cgiurl(
                                        do => "create",

-                                       page => pagetitle(lc($link), 1),
+                                       page => lc($link),

                                        from => $lpage
                                ).
                                        from => $lpage
                                ).

-                               "\">?</a>$linktext</span>"
+                               "\" rel=\"nofollow\">?</a>$linktext</span>"

                }
        }
        
        $bestlink=abs2rel($bestlink, dirname(htmlpage($page)));
                }
        }
        
        $bestlink=abs2rel($bestlink, dirname(htmlpage($page)));

-       $bestlink=beautify_url($bestlink);
+       $bestlink=beautify_urlpath($bestlink);

        
        if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
                return "<img src=\"$bestlink\" alt=\"$linktext\" />";
        
        if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
                return "<img src=\"$bestlink\" alt=\"$linktext\" />";


@@ -641,8 +643,9 @@ sub userlink ($) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

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

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

+       my $destpage=shift;

        my $type=shift;
        my $content=shift;
        
        my $type=shift;
        my $content=shift;
        


@@ -661,6 +664,7 @@ sub htmlize ($$$) { #{{{
        run_hooks(sanitize => sub {
                $content=shift->(
                        page => $page,
        run_hooks(sanitize => sub {
                $content=shift->(
                        page => $page,

+                       destpage => $destpage,

                        content => $content,
                );
        });
                        content => $content,
                );
        });


@@ -692,7 +696,7 @@ sub linkify ($$$) { #{{{
        return $content;
 } #}}}
 
        return $content;
 } #}}}
 

-my %preprocessing;
+our %preprocessing;

 our $preprocess_preview=0;
 sub preprocess ($$$;$$) { #{{{
        my $page=shift; # the page the data comes from
 our $preprocess_preview=0;
 sub preprocess ($$$;$$) { #{{{
        my $page=shift; # the page the data comes from


@@ -764,21 +768,30 @@ sub preprocess ($$$;$$) { #{{{
                        }
                        my $ret;
                        if (! $scan) {
                        }
                        my $ret;
                        if (! $scan) {

-                               $ret=$hooks{preprocess}{$command}{call}->(
-                                       @params,
-                                       page => $page,
-                                       destpage => $destpage,
-                                       preview => $preprocess_preview,
-                               );
+                               $ret=eval {
+                                       $hooks{preprocess}{$command}{call}->(
+                                               @params,
+                                               page => $page,
+                                               destpage => $destpage,
+                                               preview => $preprocess_preview,
+                                       );
+                               };
+                               if ($@) {
+                                       chomp $@;
+                                       $ret="[[!$command <span class=\"error\">".
+                                               gettext("Error").": $@"."</span>]]";
+                               }

                        }
                        else {
                                # use void context during scan pass
                        }
                        else {
                                # use void context during scan pass

-                               $hooks{preprocess}{$command}{call}->(
-                                       @params,
-                                       page => $page,
-                                       destpage => $destpage,
-                                       preview => $preprocess_preview,
-                               );
+                               eval {
+                                       $hooks{preprocess}{$command}{call}->(
+                                               @params,
+                                               page => $page,
+                                               destpage => $destpage,
+                                               preview => $preprocess_preview,
+                                       );
+                               };

                                $ret="";
                        }
                        $preprocessing{$page}--;
                                $ret="";
                        }
                        $preprocessing{$page}--;


@@ -1193,6 +1206,12 @@ sub gettext { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub yesno ($) { #{{{
+       my $val=shift;
+
+       return (defined $val && lc($val) eq gettext("yes"));
+} #}}}
+

 sub pagespec_merge ($$) { #{{{
        my $a=shift;
        my $b=shift;
 sub pagespec_merge ($$) { #{{{
        my $a=shift;
        my $b=shift;


@@ -1262,6 +1281,7 @@ sub pagespec_translate ($) { #{{{
                $code=0;
        }
 
                $code=0;
        }
 

+       no warnings;

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


@@ -1276,7 +1296,7 @@ sub pagespec_match ($$;@) { #{{{
        }
 
        my $sub=pagespec_translate($spec);
        }
 
        my $sub=pagespec_translate($spec);

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

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


@@ -1286,6 +1306,13 @@ sub pagespec_valid ($) { #{{{
        my $sub=pagespec_translate($spec);
        return ! $@;
 } #}}}
        my $sub=pagespec_translate($spec);
        return ! $@;
 } #}}}

+       
+sub glob2re ($) { #{{{
+       my $re=quotemeta(shift);
+       $re=~s/\\\*/.*/g;
+       $re=~s/\\\?/./g;
+       return $re;
+} #}}}

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


@@ -1333,12 +1360,8 @@ sub match_glob ($$;@) { #{{{
                $glob="$from/$glob" if length $from;
        }
 
                $glob="$from/$glob" if length $from;
        }
 

-       # turn glob into safe regexp
-       $glob=quotemeta($glob);
-       $glob=~s/\\\*/.*/g;
-       $glob=~s/\\\?/./g;
-
-       if ($page=~/^$glob$/i) {
+       my $regexp=IkiWiki::glob2re($glob);
+       if ($page=~/^$regexp$/i) {

                if (! IkiWiki::isinternal($page) || $params{internal}) {
                        return IkiWiki::SuccessReason->new("$glob matches $page");
                }
                if (! IkiWiki::isinternal($page) || $params{internal}) {
                        return IkiWiki::SuccessReason->new("$glob matches $page");
                }