move contrib/po to po/discussion

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 0002371c1373d504686ceea1b3ab756e2319ebae..9d5ebc34daaeb6aa942f41b1424ece4ba00c9036 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,31 +5,31 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use Encode;
 use warnings;
 use strict;
 use Encode;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use URI;
 
 my %knownfeeds;
 my %page_numfeeds;
 my @inline;
 use URI;
 
 my %knownfeeds;
 my %page_numfeeds;
 my @inline;

+my $nested=0;

 
 

-sub import { #{{{
+sub import {

        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "getopt", id => "inline", call => \&getopt);

+       hook(type => "getsetup", id => "inline", call => \&getsetup);

        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
        hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
        hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);

-       hook(type => "format", id => "inline", call => \&format);
+       hook(type => "format", id => "inline", call => \&format, first => 1);

        # Hook to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.
        # Hook to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.

-       hook(type => "change", id => "inline", 
-               call => \&IkiWiki::pingurl);
-
-} # }}}
+       hook(type => "change", id => "inline", call => \&IkiWiki::pingurl);
+}

 
 

-sub getopt () { #{{{
+sub getopt () {

        eval q{use Getopt::Long};
        error($@) if $@;
        Getopt::Long::Configure('pass_through');
        eval q{use Getopt::Long};
        error($@) if $@;
        Getopt::Long::Configure('pass_through');


@@ -38,10 +38,56 @@ sub getopt () { #{{{
                "atom!" => \$config{atom},
                "allowrss!" => \$config{allowrss},
                "allowatom!" => \$config{allowatom},
                "atom!" => \$config{atom},
                "allowrss!" => \$config{allowrss},
                "allowatom!" => \$config{allowatom},

+               "pingurl=s" => sub {
+                       push @{$config{pingurl}}, $_[1];
+               },      

        );
 }
 
        );
 }
 

-sub checkconfig () { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+               rss => {
+                       type => "boolean",
+                       example => 0,
+                       description => "enable rss feeds by default?",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               atom => {
+                       type => "boolean",
+                       example => 0,
+                       description => "enable atom feeds by default?",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               allowrss => {
+                       type => "boolean",
+                       example => 0,
+                       description => "allow rss feeds to be used?",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               allowatom => {
+                       type => "boolean",
+                       example => 0,
+                       description => "allow atom feeds to be used?",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               pingurl => {
+                       type => "string",
+                       example => "http://rpc.technorati.com/rpc/ping",
+                       description => "urls to ping (using XML-RPC) on feed update",
+                       safe => 1,
+                       rebuild => 0,
+               },
+}
+
+sub checkconfig () {

        if (($config{rss} || $config{atom}) && ! length $config{url}) {
                error(gettext("Must specify url to wiki with --url when using --rss or --atom"));
        }
        if (($config{rss} || $config{atom}) && ! length $config{url}) {
                error(gettext("Must specify url to wiki with --url when using --rss or --atom"));
        }


@@ -51,35 +97,46 @@ sub checkconfig () { #{{{
        if ($config{atom}) {
                push @{$config{wiki_file_prune_regexps}}, qr/\.atom$/;
        }
        if ($config{atom}) {
                push @{$config{wiki_file_prune_regexps}}, qr/\.atom$/;
        }

-} #}}}
+       if (! exists $config{pingurl}) {
+               $config{pingurl}=[];
+       }
+}

 
 

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

         my %params=@_;
 
        # Fill in the inline content generated earlier. This is actually an
        # optimisation.
         my %params=@_;
 
        # Fill in the inline content generated earlier. This is actually an
        # optimisation.

-       $params{content}=~s!<div class="inline" id="([^"]+)"></div>!$inline[$1]!g;
+       $params{content}=~s{<div class="inline" id="([^"]+)"></div>}{
+               delete @inline[$1,]
+       }eg;

        return $params{content};
        return $params{content};

-} #}}}
+}

 
 

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

        my $q=shift;
        my $session=shift;
 
        if ($q->param('do') eq 'blog') {
        my $q=shift;
        my $session=shift;
 
        if ($q->param('do') eq 'blog') {

-               my $page=decode_utf8($q->param('title'));
-               $page=~s/\///g; # no slashes in blog posts
+               my $page=titlepage(decode_utf8($q->param('title')));
+               $page=~s/(\/)/"__".ord($1)."__"/eg; # don't create subdirs

                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
                my $add="";
                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
                my $add="";

-               while (exists $IkiWiki::pagecase{lc($from."/".IkiWiki::titlepage($page).$add)}) {
+               while (exists $IkiWiki::pagecase{lc($from."/".$page.$add)}) {

                        $add=1 unless length $add;
                        $add++;
                }
                $q->param('page', $page.$add);
                # now go create the page
                $q->param('do', 'create');
                        $add=1 unless length $add;
                        $add++;
                }
                $q->param('page', $page.$add);
                # now go create the page
                $q->param('do', 'create');

-               IkiWiki::cgi_editpage($q, $session);
+               # make sure the editpage plugin in loaded
+               if (IkiWiki->can("cgi_editpage")) {
+                       IkiWiki::cgi_editpage($q, $session);
+               }
+               else {
+                       error(gettext("page editing not allowed"));
+               }

                exit;
        }
 }
                exit;
        }
 }


@@ -91,16 +148,11 @@ package IkiWiki;
 my %toping;
 my %feedlinks;
 
 my %toping;
 my %feedlinks;
 

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

        my %params=@_;
        
        if (! exists $params{pages}) {
        my %params=@_;
        
        if (! exists $params{pages}) {

-               return "";
+               error gettext("missing pages parameter");

        }
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});
        }
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});


@@ -108,14 +160,19 @@ sub preprocess_inline (@) { #{{{
        my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
        my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
        my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
        my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
        my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
        my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;

+       my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1;

        my $feedonly=yesno($params{feedonly});
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }
        my $feedonly=yesno($params{feedonly});
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }

+       if (! exists $params{feedshow} && exists $params{show}) {
+               $params{feedshow}=$params{show};
+       }

        my $desc;
        if (exists $params{description}) {
                $desc = $params{description} 
        my $desc;
        if (exists $params{description}) {
                $desc = $params{description} 

-       } else {
+       }
+       else {

                $desc = $config{wikiname};
        }
        my $actions=yesno($params{actions});
                $desc = $config{wikiname};
        }
        my $actions=yesno($params{actions});


@@ -126,16 +183,19 @@ sub preprocess_inline (@) { #{{{
                $params{template} = $archive ? "archivepage" : "inlinepage";
        }
 
                $params{template} = $archive ? "archivepage" : "inlinepage";
        }
 

-       my @list;
-       foreach my $page (keys %pagesources) {
-               next if $page eq $params{page};
-               if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       push @list, $page;
-               }
-       }
+       my @list=pagespec_match_list(
+               [ grep { $_ ne $params{page} } keys %pagesources ],
+               $params{pages}, location => $params{page});

 
        if (exists $params{sort} && $params{sort} eq 'title') {
 
        if (exists $params{sort} && $params{sort} eq 'title') {

-               @list=sort @list;
+               @list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;
+       }
+       elsif (exists $params{sort} && $params{sort} eq 'title_natural') {
+               eval q{use Sort::Naturally};
+               if ($@) {
+                       error(gettext("Sort::Naturally needed for title_natural sort"));
+               }
+               @list=sort { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) } @list;

        }
        elsif (exists $params{sort} && $params{sort} eq 'mtime') {
                @list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;
        }
        elsif (exists $params{sort} && $params{sort} eq 'mtime') {
                @list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;


@@ -144,7 +204,7 @@ sub preprocess_inline (@) { #{{{
                @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
        }
        else {
                @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
        }
        else {

-               return sprintf(gettext("unknown sort type %s"), $params{sort});
+               error sprintf(gettext("unknown sort type %s"), $params{sort});

        }
 
        if (yesno($params{reverse})) {
        }
 
        if (yesno($params{reverse})) {


@@ -155,6 +215,17 @@ sub preprocess_inline (@) { #{{{
                @list=@list[$params{skip} .. scalar @list - 1];
        }
        
                @list=@list[$params{skip} .. scalar @list - 1];
        }
        

+       my @feedlist;
+       if ($feeds) {
+               if (exists $params{feedshow} &&
+                   $params{feedshow} && @list > $params{feedshow}) {
+                       @feedlist=@list[0..$params{feedshow} - 1];
+               }
+               else {
+                       @feedlist=@list;
+               }
+       }
+       

        if ($params{show} && @list > $params{show}) {
                @list=@list[0..$params{show} - 1];
        }
        if ($params{show} && @list > $params{show}) {
                @list=@list[0..$params{show} - 1];
        }


@@ -163,39 +234,71 @@ sub preprocess_inline (@) { #{{{
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.

-       add_depends($params{page}, join(" or ", @list));
-
-       my $feednum="";
-
-       my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
-       if (exists $knownfeeds{$feedid}) {
-               $feednum=$knownfeeds{$feedid};
+       add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
+       
+       if ($feeds && exists $params{feedpages}) {
+               @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;

        }
        }

-       else {
-               if (exists $page_numfeeds{$params{destpage}}) {
-                       if ($feeds) {
-                               $feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+
+       my ($feedbase, $feednum);
+       if ($feeds) {
+               # Ensure that multiple feeds on a page go to unique files.
+               
+               # Feedfile can lead to conflicts if usedirs is not enabled,
+               # so avoid supporting it in that case.
+               delete $params{feedfile} if ! $config{usedirs};
+               # Tight limits on legal feedfiles, to avoid security issues
+               # and conflicts.
+               if (defined $params{feedfile}) {
+                       if ($params{feedfile} =~ /\// ||
+                           $params{feedfile} !~ /$config{wiki_file_regexp}/) {
+                               error("illegal feedfile");

                        }
                        }

+                       $params{feedfile}=possibly_foolish_untaint($params{feedfile});
+               }
+               $feedbase=targetpage($params{destpage}, "", $params{feedfile});
+
+               my $feedid=join("\0", $feedbase, map { $_."\0".$params{$_} } sort keys %params);
+               if (exists $knownfeeds{$feedid}) {
+                       $feednum=$knownfeeds{$feedid};

                }
                else {
                }
                else {

-                       $feednum=$knownfeeds{$feedid}="";
-                       if ($feeds) {
-                               $page_numfeeds{$params{destpage}}=1;
+                       if (exists $page_numfeeds{$params{destpage}}{$feedbase}) {
+                               if ($feeds) {
+                                       $feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}}{$feedbase};
+                               }
+                       }
+                       else {
+                               $feednum=$knownfeeds{$feedid}="";
+                               if ($feeds) {
+                                       $page_numfeeds{$params{destpage}}{$feedbase}=1;
+                               }

                        }
                }
        }
 
                        }
                }
        }
 

-       my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
-       my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;
+       my $rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $rss;
+       my $atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $atom;
+

        my $ret="";
 
        my $ret="";
 

-       if ($config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
-                       (exists $params{postform} && yesno($params{postform})))) {
+       if (length $config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
+           (exists $params{postform} && yesno($params{postform}))) &&
+           IkiWiki->can("cgi_editpage")) {

                # Add a blog post form, with feed buttons.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                $formtemplate->param(cgiurl => $config{cgiurl});
                # Add a blog post form, with feed buttons.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                $formtemplate->param(cgiurl => $config{cgiurl});

-               $formtemplate->param(rootpage => 
-                       exists $params{rootpage} ? $params{rootpage} : $params{page});
+               my $rootpage;
+               if (exists $params{rootpage}) {
+                       $rootpage=bestlink($params{page}, $params{rootpage});
+                       if (!length $rootpage) {
+                               $rootpage=$params{rootpage};
+                       }
+               }
+               else {
+                       $rootpage=$params{page};
+               }
+               $formtemplate->param(rootpage => $rootpage);

                $formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
                $formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
                if (exists $params{postformtext}) {
                $formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
                $formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
                if (exists $params{postformtext}) {


@@ -207,8 +310,12 @@ sub preprocess_inline (@) { #{{{
                                gettext("Add a new post titled:"));
                }
                $ret.=$formtemplate->output;
                                gettext("Add a new post titled:"));
                }
                $ret.=$formtemplate->output;

+               
+               # The post form includes the feed buttons, so
+               # emptyfeeds cannot be hidden.
+               $emptyfeeds=1;

        }
        }

-       elsif ($feeds && !$params{preview}) {
+       elsif ($feeds && !$params{preview} && ($emptyfeeds || @feedlist)) {

                # Add feed buttons.
                my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => $rssurl) if $rss;
                # Add feed buttons.
                my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => $rssurl) if $rss;


@@ -220,7 +327,7 @@ sub preprocess_inline (@) { #{{{
                require HTML::Template;
                my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
                if (! @params) {
                require HTML::Template;
                my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
                if (! @params) {

-                       return sprintf(gettext("nonexistant template %s"), $params{template});
+                       error sprintf(gettext("nonexistant template %s"), $params{template});

                }
                my $template=HTML::Template->new(@params) unless $raw;
        
                }
                my $template=HTML::Template->new(@params) unless $raw;
        


@@ -235,9 +342,11 @@ sub preprocess_inline (@) { #{{{
                                        my $content=get_inline_content($page, $params{destpage});
                                        $template->param(content => $content);
                                }
                                        my $content=get_inline_content($page, $params{destpage});
                                        $template->param(content => $content);
                                }

-                               $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
+                               $template->param(pageurl => urlto($page, $params{destpage}));
+                               $template->param(inlinepage => $page);

                                $template->param(title => pagetitle(basename($page)));
                                $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
                                $template->param(title => pagetitle(basename($page)));
                                $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));

+                               $template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));

                                $template->param(first => 1) if $page eq $list[0];
                                $template->param(last => 1) if $page eq $list[$#list];
        
                                $template->param(first => 1) if $page eq $list[0];
                                $template->param(last => 1) if $page eq $list[$#list];
        


@@ -245,7 +354,7 @@ sub preprocess_inline (@) { #{{{
                                        my $file = $pagesources{$page};
                                        my $type = pagetype($file);
                                        if ($config{discussion}) {
                                        my $file = $pagesources{$page};
                                        my $type = pagetype($file);
                                        if ($config{discussion}) {

-                                               my $discussionlink=gettext("discussion");
+                                               my $discussionlink=lc(gettext("Discussion"));

                                                if ($page !~ /.*\/\Q$discussionlink\E$/ &&
                                                    (length $config{cgiurl} ||
                                                     exists $links{$page."/".$discussionlink})) {
                                                if ($page !~ /.*\/\Q$discussionlink\E$/ &&
                                                    (length $config{cgiurl} ||
                                                     exists $links{$page."/".$discussionlink})) {


@@ -260,7 +369,7 @@ sub preprocess_inline (@) { #{{{
                                        }
                                        if (length $config{cgiurl} && defined $type) {
                                                $template->param(have_actions => 1);
                                        }
                                        if (length $config{cgiurl} && defined $type) {
                                                $template->param(have_actions => 1);

-                                               $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
+                                               $template->param(editurl => cgiurl(do => "edit", page => $page));

                                        }
                                }
        
                                        }
                                }
        


@@ -284,70 +393,66 @@ sub preprocess_inline (@) { #{{{
                }
        }
        
                }
        }
        

-       if ($feeds) {
-               if (exists $params{feedshow} && @list > $params{feedshow}) {
-                       @list=@list[0..$params{feedshow} - 1];
-               }
-               if (exists $params{feedpages}) {
-                       @list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list;
-               }
-       
+       if ($feeds && ($emptyfeeds || @feedlist)) {

                if ($rss) {
                if ($rss) {

-                       my $rssp=rsspage($params{destpage}).$feednum;
+                       my $rssp=$feedbase."rss".$feednum;

                        will_render($params{destpage}, $rssp);
                        if (! $params{preview}) {
                                writefile($rssp, $config{destdir},
                                        genfeed("rss",
                        will_render($params{destpage}, $rssp);
                        if (! $params{preview}) {
                                writefile($rssp, $config{destdir},
                                        genfeed("rss",

-                                               $config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @list));
+                                               $config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist));

                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $toping{$params{destpage}}=1 unless $config{rebuild};

-                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+                               $feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/rss+xml" title="$desc (RSS)" href="$rssurl" />};

                        }
                }
                if ($atom) {
                        }
                }
                if ($atom) {

-                       my $atomp=atompage($params{destpage}).$feednum;
+                       my $atomp=$feedbase."atom".$feednum;

                        will_render($params{destpage}, $atomp);
                        if (! $params{preview}) {
                                writefile($atomp, $config{destdir},
                        will_render($params{destpage}, $atomp);
                        if (! $params{preview}) {
                                writefile($atomp, $config{destdir},

-                                       genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @list));
+                                       genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist));

                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $toping{$params{destpage}}=1 unless $config{rebuild};

-                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+                               $feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/atom+xml" title="$desc (Atom)" href="$atomurl" />};

                        }
                }
        }
        
                        }
                }
        }
        

-       return $ret if $raw;
+       return $ret if $raw || $nested;

        push @inline, $ret;
        return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
        push @inline, $ret;
        return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";

-} #}}}
+}

 
 

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

        my %params=@_;
        my $page=$params{page};
        my $template=$params{template};
 
        $template->param(feedlinks => $feedlinks{$page})
                if exists $feedlinks{$page} && $template->query(name => "feedlinks");
        my %params=@_;
        my $page=$params{page};
        my $template=$params{template};
 
        $template->param(feedlinks => $feedlinks{$page})
                if exists $feedlinks{$page} && $template->query(name => "feedlinks");

-} #}}}
+}

 
 

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

        my $page=shift;
        my $destpage=shift;
        
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {
        my $page=shift;
        my $destpage=shift;
        
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {

-               return htmlize($page, $type,
+               $nested++;
+               my $ret=htmlize($page, $destpage, $type,

                       linkify($page, $destpage,
                       preprocess($page, $destpage,
                       filter($page, $destpage,
                       readfile(srcfile($file))))));
                       linkify($page, $destpage,
                       preprocess($page, $destpage,
                       filter($page, $destpage,
                       readfile(srcfile($file))))));

+               $nested--;
+               return $ret;

        }
        else {
                return "";
        }
        }
        else {
                return "";
        }

-} #}}}
+}

 
 

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

        my $time=shift;
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        my $time=shift;
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);


@@ -355,9 +460,9 @@ sub date_822 ($) { #{{{
        my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
        my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;

-} #}}}
+}

 
 

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

        my $time=shift;
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        my $time=shift;
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);


@@ -365,44 +470,46 @@ sub date_3339 ($) { #{{{
        my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
        my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;

-} #}}}
+}

 
 

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

        # sucky sub because rss sucks
        my $content=shift;
        my $baseurl=shift;
 
        my $url=$baseurl;
        $url=~s/[^\/]+$//;
        # sucky sub because rss sucks
        my $content=shift;
        my $baseurl=shift;
 
        my $url=$baseurl;
        $url=~s/[^\/]+$//;

-       
-       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
-       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)([^"]+)"/$1 href="$url$2"/mig;
-       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)([^"]+)"/$1 src="$url$2"/mig;
-       return $content;
-} #}}}

 
 

-sub rsspage ($) { #{{{
-       return targetpage(shift, "rss");
-} #}}}
+        # what is the non path part of the url?
+        my $top_uri = URI->new($url);
+        $top_uri->path_query(""); # reset the path
+        my $urltop = $top_uri->as_string;

 
 

-sub atompage ($) { #{{{
-       return targetpage(shift, "atom");
-} #}}}
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
+        # relative to another wiki page
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)([^\/][^"]*)"/$1 href="$url$2"/mig;
+       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)([^\/][^"]*)"/$1 src="$url$2"/mig;
+        # relative to the top of the site
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)(\/[^"]*)"/$1 href="$urltop$2"/mig;
+       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)(\/[^"]*)"/$1 src="$urltop$2"/mig;
+       return $content;
+}

 
 

-sub genfeed ($$$$@) { #{{{
+sub genfeed ($$$$$@) {

        my $feedtype=shift;
        my $feedurl=shift;
        my $feeddesc=shift;
        my $feedtype=shift;
        my $feedurl=shift;
        my $feeddesc=shift;

+       my $guid=shift;

        my $page=shift;
        my @pages=@_;
        
        my $page=shift;
        my @pages=@_;
        

-       my $url=URI->new(encode_utf8($config{url}."/".urlto($page,"")));
+       my $url=URI->new(encode_utf8(urlto($page,"",1)));

        
        my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1);
        my $content="";
        my $lasttime = 0;
        foreach my $p (@pages) {
        
        my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1);
        my $content="";
        my $lasttime = 0;
        foreach my $p (@pages) {

-               my $u=URI->new(encode_utf8($config{url}."/".urlto($p, "")));
+               my $u=URI->new(encode_utf8(urlto($p, "", 1)));

                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
                $itemtemplate->param(
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
                $itemtemplate->param(


@@ -415,6 +522,17 @@ sub genfeed ($$$$@) { #{{{
                        mdate_3339 => date_3339($pagemtime{$p}),
                );
 
                        mdate_3339 => date_3339($pagemtime{$p}),
                );
 

+               if (exists $pagestate{$p}) {
+                       if (exists $pagestate{$p}{meta}{guid}) {
+                               $itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
+                       }
+
+                       if (exists $pagestate{$p}{meta}{updated}) {
+                               $itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
+                               $itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
+                       }
+               }
+

                if ($itemtemplate->query(name => "enclosure")) {
                        my $file=$pagesources{$p};
                        my $type=pagetype($file);
                if ($itemtemplate->query(name => "enclosure")) {
                        my $file=$pagesources{$p};
                        my $type=pagetype($file);


@@ -422,7 +540,7 @@ sub genfeed ($$$$@) { #{{{
                                $itemtemplate->param(content => $pcontent);
                        }
                        else {
                                $itemtemplate->param(content => $pcontent);
                        }
                        else {

-                               my ($a, $b, $c, $d, $e, $f, $g, $size) = stat(srcfile($file));
+                               my $size=(srcfile_stat($file))[8];

                                my $mime="unknown";
                                eval q{use File::MimeInfo};
                                if (! $@) {
                                my $mime="unknown";
                                eval q{use File::MimeInfo};
                                if (! $@) {


@@ -457,6 +575,7 @@ sub genfeed ($$$$@) { #{{{
                pageurl => $url,
                content => $content,
                feeddesc => $feeddesc,
                pageurl => $url,
                content => $content,
                feeddesc => $feeddesc,

+               guid => $guid,

                feeddate => date_3339($lasttime),
                feedurl => $feedurl,
                version => $IkiWiki::version,
                feeddate => date_3339($lasttime),
                feedurl => $feedurl,
                version => $IkiWiki::version,


@@ -467,9 +586,9 @@ sub genfeed ($$$$@) { #{{{
        });
        
        return $template->output;
        });
        
        return $template->output;

-} #}}}
+}

 
 

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

        return unless @{$config{pingurl}} && %toping;
 
        eval q{require RPC::XML::Client};
        return unless @{$config{pingurl}} && %toping;
 
        eval q{require RPC::XML::Client};


@@ -482,7 +601,7 @@ sub pingurl (@) { #{{{
        defined(my $pid = fork) or error("Can't fork: $!");
        return if $pid;
        chdir '/';
        defined(my $pid = fork) or error("Can't fork: $!");
        return if $pid;
        chdir '/';

-       setsid() or error("Can't start a new session: $!");
+       POSIX::setsid() or error("Can't start a new session: $!");

        open STDIN, '/dev/null';
        open STDOUT, '>/dev/null';
        open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");
        open STDIN, '/dev/null';
        open STDOUT, '>/dev/null';
        open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");


@@ -492,7 +611,7 @@ sub pingurl (@) { #{{{
 
        foreach my $page (keys %toping) {
                my $title=pagetitle(basename($page), 0);
 
        foreach my $page (keys %toping) {
                my $title=pagetitle(basename($page), 0);

-               my $url="$config{url}/".urlto($page, "");
+               my $url=urlto($page, "", 1);

                foreach my $pingurl (@{$config{pingurl}}) {
                        debug("Pinging $pingurl for $page");
                        eval {
                foreach my $pingurl (@{$config{pingurl}}) {
                        debug("Pinging $pingurl for $page");
                        eval {


@@ -501,20 +620,20 @@ sub pingurl (@) { #{{{
                                        $title, $url);
                                my $res = $client->send_request($req);
                                if (! ref $res) {
                                        $title, $url);
                                my $res = $client->send_request($req);
                                if (! ref $res) {

-                                       debug("Did not receive response to ping");
+                                       error("Did not receive response to ping");

                                }
                                my $r=$res->value;
                                if (! exists $r->{flerror} || $r->{flerror}) {
                                }
                                my $r=$res->value;
                                if (! exists $r->{flerror} || $r->{flerror}) {

-                                       debug("Ping rejected: ".(exists $r->{message} ? $r->{message} : "[unknown reason]"));
+                                       error("Ping rejected: ".(exists $r->{message} ? $r->{message} : "[unknown reason]"));

                                }
                        };
                        if ($@) {
                                }
                        };
                        if ($@) {

-                               debug "Ping failed: $@";
+                               error "Ping failed: $@";

                        }
                }
        }
 
        exit 0; # daemon done
                        }
                }
        }
 
        exit 0; # daemon done

-} #}}}
+}

 
 1
 
 1