X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/20eacc2c1f74d0ab617dca36378a35920e313a23..bd4cd357a13ae205294217024dbb74e1d74534fd:/IkiWiki/Plugin/meta.pm
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index d4b4e5db5..9b026fffa 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -8,14 +8,27 @@ use IkiWiki;
my %meta;
my %title;
+my %permalink;
+my %author;
+my %authorurl;
sub import { #{{{
IkiWiki::hook(type => "preprocess", id => "meta",
call => \&preprocess);
+ IkiWiki::hook(type => "filter", id => "meta",
+ call => \&filter);
IkiWiki::hook(type => "pagetemplate", id => "meta",
call => \&pagetemplate);
} # }}}
+sub filter (@) { #{{{
+ my %params=@_;
+
+ $meta{$params{page}}='';
+
+ return $params{content};
+} # }}}
+
sub preprocess (@) { #{{{
if (! @_) {
return "";
@@ -26,14 +39,17 @@ sub preprocess (@) { #{{{
delete $params{$key};
my $page=$params{page};
delete $params{page};
+ delete $params{destpage};
- eval q{use CGI 'escapeHTML'};
+ eval q{use HTML::Entities};
+ # Always dencode, even if encoding later, since it might not be
+ # fully encoded.
+ $value=decode_entities($value);
if ($key eq 'link') {
if (%params) {
- $meta{$page}='' unless exists $meta{$page};
- $meta{$page}.="\n";
}
else {
@@ -42,24 +58,44 @@ sub preprocess (@) { #{{{
}
}
elsif ($key eq 'title') {
- $title{$page}=escapeHTML($value);
+ $title{$page}=$value;
+ }
+ elsif ($key eq 'permalink') {
+ $permalink{$page}=$value;
+ $meta{$page}.="\n";
}
else {
- $meta{$page}='' unless exists $meta{$page};
- $meta{$page}.="\n";
+ $meta{$page}.="\n";
+ if ($key eq 'author') {
+ $author{$page}=$value;
+ }
+ elsif ($key eq 'authorurl') {
+ $authorurl{$page}=$value;
+ }
}
return "";
} # }}}
-sub pagetemplate ($$) { #{{{
- my $page=shift;
- my $template=shift;
+sub pagetemplate (@) { #{{{
+ my %params=@_;
+ my $page=$params{page};
+ my $template=$params{template};
$template->param(meta => $meta{$page})
if exists $meta{$page} && $template->query(name => "meta");
- $template->param(title => $title{$page})
- if exists $title{$page} && $template->query(name => "title");
+ if (exists $title{$page} && $template->query(name => "title")) {
+ $template->param(title => $title{$page});
+ $template->param(title_overridden => 1);
+ }
+ $template->param(permalink => $permalink{$page})
+ if exists $permalink{$page} && $template->query(name => "permalink");
+ $template->param(author => $author{$page})
+ if exists $author{$page} && $template->query(name => "author");
+ $template->param(authorurl => $authorurl{$page})
+ if exists $authorurl{$page} && $template->query(name => "authorurl");
+
} # }}}
1