(no commit message)

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2205ebffc48cda2f9ccd6fab71dec170765fa880..c00aed299c8fa2cd27508f2ded85a9f000da7930 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -49,6 +49,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "core",

                },
                rss => {
                        type => "boolean",
                },
                rss => {
                        type => "boolean",


@@ -151,7 +152,7 @@ my %feedlinks;
 sub preprocess_inline (@) {
        my %params=@_;
        
 sub preprocess_inline (@) {
        my %params=@_;
        

-       if (! exists $params{pages}) {
+       if (! exists $params{pages} && ! exists $params{pagenames}) {

                error gettext("missing pages parameter");
        }
        my $raw=yesno($params{raw});
                error gettext("missing pages parameter");
        }
        my $raw=yesno($params{raw});


@@ -159,7 +160,7 @@ sub preprocess_inline (@) {
        my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
        my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
        my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
        my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
        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 $feeds=! $nested && (exists $params{feeds} ? yesno($params{feeds}) : !$quick && ! $raw);

        my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1;
        my $feedonly=yesno($params{feedonly});
        if (! exists $params{show} && ! $archive) {
        my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1;
        my $feedonly=yesno($params{feedonly});
        if (! exists $params{show} && ! $archive) {


@@ -184,32 +185,49 @@ sub preprocess_inline (@) {
        }
 
        my @list;
        }
 
        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;
+
+       if (exists $params{pagenames}) {
+               foreach my $p (qw(sort pages)) {
+                       if (exists $params{$p}) {
+                               error sprintf(gettext("the %s and %s parameters cannot be used together"),
+                                       "pagenames", $p);
+                       }

                }
                }

-       }

 
 

-       if (exists $params{sort} && $params{sort} eq 'title') {
-               @list=sort { pagetitle(basename($a)) cmp 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 'age') {
-               @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+               @list = map { bestlink($params{page}, $_) }
+                       split ' ', $params{pagenames};
+
+               if (yesno($params{reverse})) {
+                       @list=reverse(@list);
+               }
+
+               foreach my $p (@list) {
+                       add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
+               }

        }
        else {
        }
        else {

-               error sprintf(gettext("unknown sort type %s"), $params{sort});
-       }
+               my $num=0;
+               if ($params{show}) {
+                       $num=$params{show};
+               }
+               if ($params{feedshow} && $num < $params{feedshow} && $num > 0) {
+                       $num=$params{feedshow};
+               }
+               if ($params{skip} && $num) {
+                       $num+=$params{skip};
+               }

 
 

-       if (yesno($params{reverse})) {
-               @list=reverse(@list);
+               @list = pagespec_match_list($params{page}, $params{pages},
+                       deptype => deptype($quick ? "presence" : "content"),
+                       filter => sub { $_[0] eq $params{page} },
+                       sort => exists $params{sort} ? $params{sort} : "age",
+                       reverse => yesno($params{reverse}),
+                       ($num ? (num => $num) : ()),
+               );

        }
 
        if (exists $params{skip}) {
        }
 
        if (exists $params{skip}) {

-               @list=@list[$params{skip} .. scalar @list - 1];
+               @list=@list[$params{skip} .. $#list];

        }
        
        my @feedlist;
        }
        
        my @feedlist;


@@ -227,14 +245,12 @@ sub preprocess_inline (@) {
                @list=@list[0..$params{show} - 1];
        }
 
                @list=@list[0..$params{show} - 1];
        }
 

-       add_depends($params{page}, $params{pages});
-       # 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 >= $#feedlist ? @list : @feedlist));
-       

        if ($feeds && exists $params{feedpages}) {
        if ($feeds && exists $params{feedpages}) {

-               @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
+               @feedlist = pagespec_match_list(
+                       $params{page}, "($params{pages}) and ($params{feedpages})",
+                       deptype => deptype($quick ? "presence" : "content"),
+                       list => \@feedlist,
+               );

        }
 
        my ($feedbase, $feednum);
        }
 
        my ($feedbase, $feednum);


@@ -274,8 +290,8 @@ sub preprocess_inline (@) {
                }
        }
 
                }
        }
 

-       my $rssurl=basename($feedbase."rss".$feednum) if $feeds && $rss;
-       my $atomurl=basename($feedbase."atom".$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="";
 


@@ -283,19 +299,9 @@ sub preprocess_inline (@) {
            (exists $params{postform} && yesno($params{postform}))) &&
            IkiWiki->can("cgi_editpage")) {
                # Add a blog post form, with feed buttons.
            (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);
+               my $formtemplate=template_depends("blogpost.tmpl", $params{page}, blind_cache => 1);

                $formtemplate->param(cgiurl => $config{cgiurl});
                $formtemplate->param(cgiurl => $config{cgiurl});

-               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(rootpage => rootpage(%params));

                $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}) {


@@ -314,59 +320,69 @@ sub preprocess_inline (@) {
        }
        elsif ($feeds && !$params{preview} && ($emptyfeeds || @feedlist)) {
                # Add feed buttons.
        }
        elsif ($feeds && !$params{preview} && ($emptyfeeds || @feedlist)) {
                # Add feed buttons.

-               my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
+               my $linktemplate=template_depends("feedlink.tmpl", $params{page}, blind_cache => 1);

                $linktemplate->param(rssurl => $rssurl) if $rss;
                $linktemplate->param(atomurl => $atomurl) if $atom;
                $ret.=$linktemplate->output;
        }
        
        if (! $feedonly) {
                $linktemplate->param(rssurl => $rssurl) if $rss;
                $linktemplate->param(atomurl => $atomurl) if $atom;
                $ret.=$linktemplate->output;
        }
        
        if (! $feedonly) {

-               require HTML::Template;
-               my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
-               if (! @params) {
-                       error sprintf(gettext("nonexistant template %s"), $params{template});
+               my $template;
+               if (! $raw) {
+                       # cannot use wiki pages as templates; template not sanitized due to
+                       # format hook hack
+                       eval {
+                               $template=template_depends($params{template}.".tmpl", $params{page},
+                                       blind_cache => 1);
+                       };
+                       if ($@) {
+                               error sprintf(gettext("failed to process template %s"), $params{template}.".tmpl").": $@";
+                       }

                }
                }

-               my $template=HTML::Template->new(@params) unless $raw;
+               my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));

        
                foreach my $page (@list) {
                        my $file = $pagesources{$page};
                        my $type = pagetype($file);
        
                foreach my $page (@list) {
                        my $file = $pagesources{$page};
                        my $type = pagetype($file);

-                       if (! $raw || ($raw && ! defined $type)) {
-                               unless ($archive && $quick) {
+                       if (! $raw) {
+                               if ($needcontent) {

                                        # Get the content before populating the
                                        # template, since getting the content uses
                                        # the same template if inlines are nested.
                                        my $content=get_inline_content($page, $params{destpage});
                                        $template->param(content => $content);
                                }
                                        # Get the content before populating the
                                        # template, since getting the content uses
                                        # the same template if inlines are nested.
                                        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(inlinepage => $page);
                                $template->param(title => pagetitle(basename($page)));

-                               $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+                               $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}, 1));

                                $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(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(html5 => $config{html5});

        
                                if ($actions) {
                                        my $file = $pagesources{$page};
                                        my $type = pagetype($file);
                                        if ($config{discussion}) {
        
                                if ($actions) {
                                        my $file = $pagesources{$page};
                                        my $type = pagetype($file);
                                        if ($config{discussion}) {

-                                               my $discussionlink=gettext("discussion");
-                                               if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+                                               if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&

                                                    (length $config{cgiurl} ||
                                                    (length $config{cgiurl} ||

-                                                    exists $links{$page."/".$discussionlink})) {
+                                                    exists $pagesources{$page."/".lc($config{discussionpage})})) {

                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                                        $params{destpage},
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                                        $params{destpage},

-                                                                       gettext("Discussion"),
+                                                                       $config{discussionpage},

                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
                                                }
                                        }
                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
                                                }
                                        }

-                                       if (length $config{cgiurl} && defined $type) {
+                                       if (length $config{cgiurl} &&
+                                           defined $type &&
+                                           IkiWiki->can("cgi_editpage")) {

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

+

                                        }
                                }
        
                                        }
                                }
        


@@ -386,6 +402,10 @@ sub preprocess_inline (@) {
                                              filter($page, $params{destpage},
                                              readfile(srcfile($file)))));
                                }
                                              filter($page, $params{destpage},
                                              readfile(srcfile($file)))));
                                }

+                               else {
+                                       $ret.="\n".
+                                             readfile(srcfile($file));
+                               }

                        }
                }
        }
                        }
                }
        }


@@ -414,6 +434,8 @@ sub preprocess_inline (@) {
                }
        }
        
                }
        }
        

+       clear_inline_content_cache();
+

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


@@ -428,43 +450,57 @@ sub pagetemplate_inline (@) {
                if exists $feedlinks{$page} && $template->query(name => "feedlinks");
 }
 
                if exists $feedlinks{$page} && $template->query(name => "feedlinks");
 }
 

+{
+my %inline_content;
+my $cached_destpage="";
+

 sub get_inline_content ($$) {
        my $page=shift;
        my $destpage=shift;
        
 sub get_inline_content ($$) {
        my $page=shift;
        my $destpage=shift;
        

+       if (exists $inline_content{$page} && $cached_destpage eq $destpage) {
+               return $inline_content{$page};
+       }
+

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

+       my $ret="";

        if (defined $type) {
                $nested++;
        if (defined $type) {
                $nested++;

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

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

-               return $ret;
+               if (isinternal($page)) {
+                       # make inlined text of internal pages searchable
+                       run_hooks(indexhtml => sub {
+                               shift->(page => $page, destpage => $page,
+                                       content => $ret);
+                       });
+               }

        }
        }

-       else {
-               return "";
+       
+       if ($cached_destpage ne $destpage) {
+               clear_inline_content_cache();
+               $cached_destpage=$destpage;

        }
        }

+       return $inline_content{$page}=$ret;

 }
 
 }
 

-sub date_822 ($) {
-       my $time=shift;
+sub clear_inline_content_cache () {
+       %inline_content=();
+}

 
 

-       my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
-       POSIX::setlocale(&POSIX::LC_TIME, "C");
-       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_822 ($) {

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

-       my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
+       my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));

        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
 }
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
 }


@@ -502,7 +538,7 @@ sub genfeed ($$$$$@) {
        
        my $url=URI->new(encode_utf8(urlto($page,"",1)));
        
        
        my $url=URI->new(encode_utf8(urlto($page,"",1)));
        

-       my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1);
+       my $itemtemplate=template_depends($feedtype."item.tmpl", $page, blind_cache => 1);

        my $content="";
        my $lasttime = 0;
        foreach my $p (@pages) {
        my $content="";
        my $lasttime = 0;
        foreach my $p (@pages) {


@@ -521,7 +557,8 @@ sub genfeed ($$$$$@) {
 
                if (exists $pagestate{$p}) {
                        if (exists $pagestate{$p}{meta}{guid}) {
 
                if (exists $pagestate{$p}) {
                        if (exists $pagestate{$p}{meta}{guid}) {

-                               $itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
+                               eval q{use HTML::Entities};
+                               $itemtemplate->param(guid => HTML::Entities::encode_numeric($pagestate{$p}{meta}{guid}));

                        }
 
                        if (exists $pagestate{$p}{meta}{updated}) {
                        }
 
                        if (exists $pagestate{$p}{meta}{updated}) {


@@ -565,7 +602,7 @@ sub genfeed ($$$$$@) {
                $lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;
        }
 
                $lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;
        }
 

-       my $template=template($feedtype."page.tmpl", blind_cache => 1);
+       my $template=template_depends($feedtype."page.tmpl", $page, blind_cache => 1);

        $template->param(
                title => $page ne "index" ? pagetitle($page) : $config{wikiname},
                wikiname => $config{wikiname},
        $template->param(
                title => $page ne "index" ? pagetitle($page) : $config{wikiname},
                wikiname => $config{wikiname},


@@ -633,4 +670,21 @@ sub pingurl (@) {
        exit 0; # daemon done
 }
 
        exit 0; # daemon done
 }
 

+
+sub rootpage (@) {
+       my %params=@_;
+
+       my $rootpage;
+       if (exists $params{rootpage}) {
+               $rootpage=bestlink($params{page}, $params{rootpage});
+               if (!length $rootpage) {
+                       $rootpage=$params{rootpage};
+               }
+       }
+       else {
+               $rootpage=$params{page};
+       }
+       return $rootpage;
+}
+

 1
 1