oops

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index fc9d5f01cc0044a0b728159fb68e0fb841d25734..d8f2ca0d8baf6b70dc1d560d20a977b7a719993a 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=@_;


@@ -34,11 +35,20 @@ sub preprocess_inline (@) { #{{{
        if (! exists $params{show} && $params{archive} eq "no") {
                $params{show}=10;
        }
        if (! exists $params{show} && $params{archive} eq "no") {
                $params{show}=10;
        }

+       if (! exists $params{rss}) {
+               $params{rss}="yes";
+       }
+
+       # 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};

-               if (globlist_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages})) {

                        push @list, $page;
                }
        }
                        push @list, $page;
                }
        }


@@ -51,7 +61,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});


@@ -61,7 +71,7 @@ sub preprocess_inline (@) { #{{{
                }
                $ret.=$formtemplate->output;
        }
                }
                $ret.=$formtemplate->output;
        }

-       elsif ($config{rss}) {
+       elsif ($config{rss} && $params{rss} eq "yes") {

                # Add a rss link button.
                my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => rsspage(basename($params{page})));
                # Add a rss link button.
                my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => rsspage(basename($params{page})));


@@ -76,33 +86,47 @@ sub preprocess_inline (@) { #{{{
        );
        
        foreach my $page (@list) {
        );
        
        foreach my $page (@list) {

-               $template->param(pagelink => htmllink($params{page}, $params{page}, $page));
-               $template->param(content => get_inline_content($params{page}, $page))
+               # Don't use htmllink because this way the title is separate
+               # and can be overridden by other plugins.
+               my $link=htmlpage(bestlink($params{page}, $page));
+               $link=abs2rel($link, dirname($params{page}));
+               $template->param(pageurl => $link);
+               $template->param(title => pagetitle(basename($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
        # check_overwrite, but currently renderedfiles
        # only supports listing one file per page.
        }
        
        # TODO: should really add this to renderedfiles and call
        # check_overwrite, but currently renderedfiles
        # only supports listing one file per page.

-       if ($config{rss}) {
+       if ($config{rss} && $params{rss} eq "yes") {

                writefile(rsspage($params{page}), $config{destdir},
                        genrss($params{page}, @list));
                writefile(rsspage($params{page}), $config{destdir},
                        genrss($params{page}, @list));

-               $toping{$params{page}}=1;
+               $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);
        
        my $file=$pagesources{$page};
        my $type=pagetype($file);

-       if ($type ne 'unknown') {
-               return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
+       if (defined $type) {
+               return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));

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


@@ -140,24 +164,39 @@ sub genrss ($@) { #{{{
        
        my $url="$config{url}/".htmlpage($page);
        
        
        my $url="$config{url}/".htmlpage($page);
        

-       my $template=template("rsspage.tmpl", blind_cache => 1);
-       
-       my @items;
+       my $itemtemplate=template("rssitem.tmpl", blind_cache => 1, 
+               die_on_bad_params => 0);
+       my $content="";

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

-               push @items, {
-                       itemtitle => pagetitle(basename($p)),
-                       itemurl => "$config{url}/$renderedfiles{$p}",
-                       itempubdate => date_822($pagectime{$p}),
-                       itemcontent => absolute_urls(get_inline_content($page, $p), $url),
-               } if exists $renderedfiles{$p};
+               next unless exists $renderedfiles{$p};
+
+               $itemtemplate->param(
+                       title => pagetitle(basename($p)),
+                       url => "$config{url}/$renderedfiles{$p}",
+                       pubdate => date_822($pagectime{$p}),
+                       content => absolute_urls(get_inline_content($p, $page), $url),
+               );
+               run_hooks(pagetemplate => sub {
+                       shift->(page => $p, destpage => $page,
+                               template => $itemtemplate);
+               });
+               $content.=$itemtemplate->output;
+               $itemtemplate->clear_params;

        }
 
        }
 

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

        $template->param(
                title => $config{wikiname},
        $template->param(
                title => $config{wikiname},

+               wikiname => $config{wikiname},

                pageurl => $url,
                pageurl => $url,

-               items => \@items,
+               content => $content,

        );
        
        );
        

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

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