use warnings;
use strict;
use IkiWiki;
+use URI;
sub import { #{{{
IkiWiki::hook(type => "preprocess", id => "inline",
package IkiWiki;
my %toping;
-my $processing_inline=0;
+
+sub yesno ($) { #{{{
+ my $val=shift;
+ return (defined $val && lc($val) eq "yes");
+} #}}}
sub preprocess_inline (@) { #{{{
my %params=@_;
-
+
if (! exists $params{pages}) {
return "";
}
- if (! exists $params{archive}) {
- $params{archive}="no";
- }
- if (! exists $params{show} && $params{archive} eq "no") {
+ my $raw=yesno($params{raw});
+ my $archive=yesno($params{archive});
+ my $rss=exists $params{rss} ? yesno($params{rss}) : 1;
+ if (! exists $params{show} && ! $archive) {
$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) {
}
$ret.=$formtemplate->output;
}
- elsif ($config{rss} && $params{rss} eq "yes") {
+ elsif ($config{rss} && $rss) {
# Add a rss link button.
my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
$linktemplate->param(rssurl => rsspage(basename($params{page})));
}
my $template=template(
- (($params{archive} eq "no")
- ? "inlinepage.tmpl"
- : "inlinepagetitle.tmpl"),
+ ($archive ? "inlinepagetitle.tmpl" : "inlinepage.tmpl"),
blind_cache => 1,
- );
+ ) unless $raw;
foreach my $page (@list) {
- # 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}));
-
- run_hooks(pagetemplate => sub {
- shift->(page => $page, destpage => $params{page},
- template => $template,);
- });
-
- $ret.=$template->output;
- $template->clear_params;
+ if (! $raw) {
+ # Get the content before populating the template,
+ # since getting the content uses the same template
+ # if inlines are nested.
+ # TODO: if $archive=1, the only reason to do this
+ # is to let the meta plugin get page title info; so stop
+ # calling this next line then once the meta plugin can
+ # store that accross runs (also tags plugin).
+ my $content=get_inline_content($page, $params{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 => $content);
+ $template->param(ctime => displaytime($pagectime{$page}));
+
+ run_hooks(pagetemplate => sub {
+ shift->(page => $page, destpage => $params{page},
+ template => $template,);
+ });
+
+ $ret.=$template->output;
+ $template->clear_params;
+ }
+ else {
+ my $file=$pagesources{$page};
+ my $type=pagetype($file);
+ if (defined $type) {
+ $ret.="\n".
+ linkify($page, $params{page},
+ preprocess($page, $params{page},
+ filter($page,
+ readfile(srcfile($file)))));
+ }
+ }
}
# TODO: should really add this to renderedfiles and call
# check_overwrite, but currently renderedfiles
# only supports listing one file per page.
- if ($config{rss} && $params{rss} eq "yes") {
+ if ($config{rss} && $rss) {
writefile(rsspage($params{page}), $config{destdir},
genrss($params{page}, @list));
$toping{$params{page}}=1 unless $config{rebuild};
}
- $processing_inline=0;
-
return $ret;
} #}}}
my $file=$pagesources{$page};
my $type=pagetype($file);
if (defined $type) {
- return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));
+ return htmlize($type,
+ linkify($page, $destpage,
+ preprocess($page, $destpage,
+ filter($page,
+ readfile(srcfile($file))))));
}
else {
return "";
my $time=shift;
eval q{use POSIX};
- return POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+ 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 absolute_urls ($$) { #{{{
my $page=shift;
my @pages=@_;
- my $url="$config{url}/".htmlpage($page);
+ my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
- my $itemtemplate=template("rssitem.tmpl", blind_cache => 1,
- die_on_bad_params => 0);
+ my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
my $content="";
foreach my $p (@pages) {
next unless exists $renderedfiles{$p};
+ my $u=URI->new(encode_utf8("$config{url}/$renderedfiles{$p}"));
+
$itemtemplate->param(
title => pagetitle(basename($p)),
- url => "$config{url}/$renderedfiles{$p}",
- permalink => "$config{url}/$renderedfiles{$p}",
+ url => $u,
+ permalink => $u,
pubdate => date_822($pagectime{$p}),
content => absolute_urls(get_inline_content($p, $page), $url),
);
}
my $r=$res->value;
if (! exists $r->{flerror} || $r->{flerror}) {
- debug("Ping rejected: ".$r->{message});
+ debug("Ping rejected: ".(exists $r->{message} ? $r->{message} : "[unknown reason]"));
}
}
}
sipb-www / ikiwiki.git / blobdiff