X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/116672d7d72d8181607f69ad22ad8bd0bb9d8348..154c4ea9e:/IkiWiki/Plugin/meta.pm?ds=inline
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index eebe3460f..e7b96bdf1 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -107,12 +107,12 @@ sub preprocess (@) {
# fallthrough
}
elsif ($key eq 'license') {
- push @{$metaheaders{$page}}, '';
+ push @{$metaheaders{$page}}, '';
$pagestate{$page}{meta}{license}=$value;
return "";
}
elsif ($key eq 'copyright') {
- push @{$metaheaders{$page}}, '';
+ push @{$metaheaders{$page}}, '';
$pagestate{$page}{meta}{copyright}=$value;
return "";
}
@@ -121,6 +121,18 @@ sub preprocess (@) {
add_link($page, $value);
return "";
}
+ elsif ($key eq 'enclosure') {
+ my $link=bestlink($page, $value);
+ if (! length $link) {
+ error gettext("enclosure not found")
+ }
+ add_depends($page, $link, deptype("presence"));
+
+ $value=urlto($link, $page, 1);
+ $pagestate{$page}{meta}{enclosure}=$value;
+ $pagestate{$page}{meta}{enclosurefile}=$link;
+ # fallthrough
+ }
elsif ($key eq 'author') {
$pagestate{$page}{meta}{author}=$value;
if (exists $params{sortas}) {
@@ -187,7 +199,7 @@ sub preprocess (@) {
error gettext("script not found");
}
push @{$metaheaders{$page}}, scrub('',
+ '"' . $defer . $async . ' type="text/javascript">',
$page, $destpage);
}
elsif ($key eq 'openid') {
@@ -217,6 +229,13 @@ sub preprocess (@) {
'content="'.encode_entities($url).'" />';
}
}
+ elsif ($key eq 'foaf') {
+ if (safeurl($value)) {
+ push @{$metaheaders{$page}}, '';
+ }
+ }
elsif ($key eq 'redir') {
return "" if $page ne $destpage;
my $safe=0;
@@ -268,17 +287,23 @@ sub preprocess (@) {
push @{$metaheaders{$page}}, '';
}
- elsif ($key eq 'description') {
- push @{$metaheaders{$page}}, '';
}
elsif ($key eq 'name') {
- push @{$metaheaders{$page}}, scrub('', $page, $destpage);
}
+ elsif ($key eq 'keywords') {
+ # Make sure the keyword string is safe: only allow alphanumeric
+ # characters, space and comma and strip the rest.
+ $value =~ s/[^[:alnum:], ]+//g;
+ push @{$metaheaders{$page}}, '';
+ }
else {
push @{$metaheaders{$page}}, scrub('query(name => "title")) {
+ eval q{use HTML::Entities};
$template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));
$template->param(title_overridden => 1);
}
- foreach my $field (qw{author authorurl permalink}) {
- $template->param($field => $pagestate{$page}{meta}{$field})
+ if (exists $pagestate{$page}{meta}{enclosure}) {
+ $template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url})));
+ }
+
+ foreach my $field (qw{authorurl}) {
+ eval q{use HTML::Entities};
+ $template->param($field => HTML::Entities::encode_entities($pagestate{$page}{meta}{$field}))
if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
}
foreach my $field (qw{permalink}) {
- $template->param($field => IkiWiki::urlabs($pagestate{$page}{meta}{$field}, $config{url}))
- if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
+ if (exists $pagestate{$page}{meta}{$field} && $template->query(name => $field)) {
+ eval q{use HTML::Entities};
+ $template->param($field => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{$field}, $config{url})));
+ }
}
- foreach my $field (qw{description}) {
+ foreach my $field (qw{description author}) {
+ eval q{use HTML::Entities};
$template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
}