when autogenerating a dir naem, include "feed/" in it

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 08126c4e6f6f6a399de8b2346626ed908d3a5734..7bb71a436783fe3ca57515fab67e42e39170622a 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -21,6 +21,7 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
 package IkiWiki;
 
 my %toping;

+my $processing_inline=0;

 
 sub preprocess_inline (@) { #{{{
        my %params=@_;
 
 sub preprocess_inline (@) { #{{{
        my %params=@_;


@@ -35,6 +36,12 @@ sub preprocess_inline (@) { #{{{
                $params{show}=10;
        }
 
                $params{show}=10;
        }
 

+       # Avoid nested inlines, to avoid loops etc.
+       if ($processing_inline) {
+               return "";
+       }
+       $processing_inline=1;
+

        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};


@@ -51,7 +58,7 @@ sub preprocess_inline (@) { #{{{
 
        my $ret="";
        
 
        my $ret="";
        

-       if (exists $params{rootpage}) {
+       if (exists $params{rootpage} && $config{cgiurl}) {

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


@@ -77,10 +84,17 @@ sub preprocess_inline (@) { #{{{
        
        foreach my $page (@list) {
                $template->param(pagelink => htmllink($params{page}, $params{page}, $page));
        
        foreach my $page (@list) {
                $template->param(pagelink => htmllink($params{page}, $params{page}, $page));

-               $template->param(content => get_inline_content($params{page}, $page))
+               $template->param(content => get_inline_content($page, $params{page}))

                        if $params{archive} eq "no";
                $template->param(ctime => displaytime($pagectime{$page}));
                        if $params{archive} eq "no";
                $template->param(ctime => displaytime($pagectime{$page}));

+
+               run_hooks(pagetemplate => sub {
+                       shift->(page => $page, destpage => $params{page},
+                               template => $template,);
+               });
+

                $ret.=$template->output;
                $ret.=$template->output;

+               $template->clear_params;

        }
        
        # TODO: should really add this to renderedfiles and call
        }
        
        # TODO: should really add this to renderedfiles and call


@@ -92,17 +106,19 @@ sub preprocess_inline (@) { #{{{
                $toping{$params{page}}=1 unless $config{rebuild};
        }
        
                $toping{$params{page}}=1 unless $config{rebuild};
        }
        

+       $processing_inline=0;
+

        return $ret;
 } #}}}
 
 sub get_inline_content ($$) { #{{{
        return $ret;
 } #}}}
 
 sub get_inline_content ($$) { #{{{

-       my $parentpage=shift;

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

+       my $destpage=shift;

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

-               return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
+               return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));

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


@@ -140,7 +156,8 @@ sub genrss ($@) { #{{{
        
        my $url="$config{url}/".htmlpage($page);
        
        
        my $url="$config{url}/".htmlpage($page);
        

-       my $template=template("rsspage.tmpl", blind_cache => 1);
+       my $template=template("rsspage.tmpl", blind_cache => 1,
+               die_on_bad_params => 0);

        
        my @items;
        foreach my $p (@pages) {
        
        my @items;
        foreach my $p (@pages) {


@@ -148,7 +165,8 @@ sub genrss ($@) { #{{{
                        itemtitle => pagetitle(basename($p)),
                        itemurl => "$config{url}/$renderedfiles{$p}",
                        itempubdate => date_822($pagectime{$p}),
                        itemtitle => pagetitle(basename($p)),
                        itemurl => "$config{url}/$renderedfiles{$p}",
                        itempubdate => date_822($pagectime{$p}),

-                       itemcontent => absolute_urls(get_inline_content($page, $p), $url),
+                       itemcontent => absolute_urls(get_inline_content($p, $page), $url),
+                       page => $p, # used by category adding code in tag plugin

                } if exists $renderedfiles{$p};
        }
 
                } if exists $renderedfiles{$p};
        }
 


@@ -158,6 +176,11 @@ sub genrss ($@) { #{{{
                items => \@items,
        );
        
                items => \@items,
        );
        

+       run_hooks(pagetemplate => sub {
+               shift->(page => $page, destpage => $page,
+                       template => $template);
+       });
+       

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