X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2c784773879b228b7dfec2c6d092c9e1e98ab97b..1bed8653606bdaa778e34fdf6b257b7e27f0598b:/IkiWiki/Plugin/meta.pm?ds=inline
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 134c0ce5d..987262a48 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -13,21 +13,26 @@ my %author;
my %authorurl;
my %license;
my %copyright;
-my %redirected;
sub import { #{{{
- hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
- hook(type => "filter", id => "meta", call => \&filter);
+ hook(type => "needsbuild", id => "meta", call => \&needsbuild);
+ hook(type => "preprocess", id => "meta", call => \&preprocess);
hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
} # }}}
-sub filter (@) { #{{{
- my %params=@_;
-
- $meta{$params{page}}='';
-
- return $params{content};
-} # }}}
+sub needsbuild (@) { #{{{
+ my $needsbuild=shift;
+ foreach my $page (keys %pagestate) {
+ if (exists $pagestate{$page}{meta}) {
+ if (grep { $_ eq $pagesources{$page} } @$needsbuild) {
+ # remove state, it will be re-added
+ # if the preprocessor directive is still
+ # there during the rebuild
+ delete $pagestate{$page}{meta};
+ }
+ }
+ }
+}
sub scrub ($) { #{{{
if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
@@ -39,9 +44,7 @@ sub scrub ($) { #{{{
} #}}}
sub preprocess (@) { #{{{
- if (! @_) {
- return "";
- }
+ return "" unless @_;
my %params=@_;
my $key=shift;
my $value=$params{$key};
@@ -53,55 +56,16 @@ sub preprocess (@) { #{{{
delete $params{preview};
eval q{use HTML::Entities};
- # Always dencode, even if encoding later, since it might not be
+ # Always decode, even if encoding later, since it might not be
# fully encoded.
$value=decode_entities($value);
- if ($key eq 'link') {
- if (%params) {
- $meta{$page}.=scrub("\n");
- }
- else {
- # hidden WikiLink
- push @{$links{$page}}, $value;
- }
- }
- elsif ($key eq 'redir') {
- $redirected{$page}=1;
- my $safe=0;
- if ($value =~ /^$config{wiki_link_regexp}$/) {
- my $link=bestlink($page, $value);
- if (! length $link) {
- return "[[meta ".gettext("redir page not found")."]]";
- }
- if ($redirected{$link}) {
- # TODO this is a cheap way of avoiding
- # redir cycles, but it is really too strict.
- return "[[meta ".gettext("redir to page that itself redirs is not allowed")."]]";
- }
- $value=urlto($link, $destpage);
- $safe=1;
- }
- else {
- $value=encode_entities($value);
- }
- my $delay=int(exists $params{delay} ? $params{delay} : 0);
- my $redir="";
- if (! $safe) {
- $redir=scrub($redir);
- }
- $meta{$page}.=$redir;
- }
- elsif ($key eq 'title') {
+ if ($key eq 'title') {
$title{$page}=HTML::Entities::encode_numeric($value);
}
elsif ($key eq 'permalink') {
$permalink{$page}=$value;
- $meta{$page}.=scrub("\n");
+ push @{$meta{$page}}, scrub('');
}
elsif ($key eq 'date') {
eval q{use Date::Parse};
@@ -119,30 +83,71 @@ sub preprocess (@) { #{{{
if (! length $stylesheet) {
return "[[meta ".gettext("stylesheet not found")."]]";
}
- $meta{$page}.='\n";
+ "\" type=\"text/css\" />";
}
elsif ($key eq 'openid') {
if (exists $params{server}) {
- $meta{$page}.='\n";
+ push @{$meta{$page}}, '';
}
- $meta{$page}.='\n";
+ push @{$meta{$page}}, '';
}
elsif ($key eq 'license') {
- $meta{$page}.="\n";
+ push @{$meta{$page}}, '';
$license{$page}=$value;
}
elsif ($key eq 'copyright') {
- $meta{$page}.="\n";
+ push @{$meta{$page}}, '';
$copyright{$page}=$value;
}
+ elsif ($key eq 'redir') {
+ return "" if $page ne $destpage;
+ my $safe=0;
+ if ($value !~ /^\w+:\/\//) {
+ my ($redir_page, $redir_anchor) = split /\#/, $value;
+
+ add_depends($page, $redir_page);
+ my $link=bestlink($page, $redir_page);
+ if (! length $link) {
+ return "[[meta ".gettext("redir page not found")."]]";
+ }
+
+ $value=urlto($link, $page);
+ $value.='#'.$redir_anchor if defined $redir_anchor;
+ $safe=1;
+
+ # redir cycle detection
+ $pagestate{$page}{meta}{redir}=$link;
+ my $at=$page;
+ my %seen;
+ while (exists $pagestate{$at}{meta}{redir}) {
+ if ($seen{$at}) {
+ return "[[meta ".gettext("redir cycle is not allowed")."]]";
+ }
+ $seen{$at}=1;
+ $at=$pagestate{$at}{meta}{redir};
+ }
+ }
+ else {
+ $value=encode_entities($value);
+ }
+ my $delay=int(exists $params{delay} ? $params{delay} : 0);
+ my $redir="";
+ if (! $safe) {
+ $redir=scrub($redir);
+ }
+ push @{$meta{$page}}, $redir;
+ }
+ elsif ($key eq 'link') {
+ return "[[meta ".gettext("link is no longer supported")."]]";
+ }
else {
- $meta{$page}.=scrub("\n");
+ push @{$meta{$page}}, scrub('');
if ($key eq 'author') {
$author{$page}=$value;
}
@@ -160,8 +165,11 @@ sub pagetemplate (@) { #{{{
my $destpage=$params{destpage};
my $template=$params{template};
- $template->param(meta => $meta{$page})
- if exists $meta{$page} && $template->query(name => "meta");
+ if (exists $meta{$page} && $template->query(name => "meta")) {
+ # avoid duplicate meta lines
+ my %seen;
+ $template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$meta{$page}}));
+ }
if (exists $title{$page} && $template->query(name => "title")) {
$template->param(title => $title{$page});
$template->param(title_overridden => 1);