X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bb09a1f0010b749ac466f658b1a588bb2734bd84..03bbdfa11698cfbc40b991a4a83067a86c044c8c:/IkiWiki/Plugin/meta.pm
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 128a6342c..421f1dc86 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -37,12 +37,13 @@ sub needsbuild (@) {
}
}
}
+ return $needsbuild;
}
-sub scrub ($$) {
+sub scrub ($$$) {
if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
return IkiWiki::Plugin::htmlscrubber::sanitize(
- content => shift, destpage => shift);
+ content => shift, page => shift, destpage => shift);
}
else {
return shift;
@@ -161,7 +162,7 @@ sub preprocess (@) {
# Metadata handling that happens only during preprocessing pass.
if ($key eq 'permalink') {
if (safeurl($value)) {
- push @{$metaheaders{$page}}, scrub('', $destpage);
+ push @{$metaheaders{$page}}, scrub('', $page, $destpage);
}
}
elsif ($key eq 'stylesheet') {
@@ -173,10 +174,21 @@ sub preprocess (@) {
if (! length $stylesheet) {
error gettext("stylesheet not found")
}
- push @{$metaheaders{$page}}, '";
+ "\" type=\"text/css\" />", $page, $destpage);
+ }
+ elsif ($key eq 'script') {
+ my $defer=exists $params{defer} ? ' defer="defer"' : '';
+ my $async=exists $params{async} ? ' async="async"' : '';
+ my $js=bestlink($page, $value.".js");
+ if (! length $js) {
+ error gettext("script not found");
+ }
+ push @{$metaheaders{$page}}, scrub('',
+ $page, $destpage);
}
elsif ($key eq 'openid') {
my $delegate=0; # both by default
@@ -197,8 +209,19 @@ sub preprocess (@) {
'" rel="openid2.local_id" />' if $delegate ne 1;
}
if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
- push @{$metaheaders{$page}}, '';
+ # force url absolute
+ eval q{use URI};
+ error($@) if $@;
+ my $url=URI->new_abs($params{"xrds-location"}, $config{url});
+ push @{$metaheaders{$page}}, '';
+ }
+ }
+ elsif ($key eq 'foaf') {
+ if (safeurl($value)) {
+ push @{$metaheaders{$page}}, '';
}
}
elsif ($key eq 'redir') {
@@ -235,7 +258,7 @@ sub preprocess (@) {
my $delay=int(exists $params{delay} ? $params{delay} : 0);
my $redir="";
if (! $safe) {
- $redir=scrub($redir, $destpage);
+ $redir=scrub($redir, $page, $destpage);
}
push @{$metaheaders{$page}}, $redir;
}
@@ -245,20 +268,34 @@ sub preprocess (@) {
join(" ", map {
encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
} keys %params).
- " />\n", $destpage);
+ " />\n", $page, $destpage);
}
}
elsif ($key eq 'robots') {
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('', $destpage);
+ push @{$metaheaders{$page}}, scrub('', $page, $destpage);
}
return "";
@@ -276,16 +313,26 @@ sub pagetemplate (@) {
$template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}}));
}
if (exists $pagestate{$page}{meta}{title} && $template->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})
+ 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{description}) {
+ foreach my $field (qw{permalink}) {
+ 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 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);
}
@@ -342,15 +389,15 @@ sub match {
}
if (defined $val) {
- if ($val=~/^$re$/i) {
+ if ($val=~$re) {
return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
}
else {
- return IkiWiki::FailReason->new("$re does not match $field of $page", "" => 1);
+ return IkiWiki::FailReason->new("$re does not match $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
}
}
else {
- return IkiWiki::FailReason->new("$page does not have a $field", "" => 1);
+ return IkiWiki::FailReason->new("$page does not have a $field", $page => $IkiWiki::DEPEND_CONTENT);
}
}
@@ -376,6 +423,10 @@ sub match_copyright ($$;@) {
IkiWiki::Plugin::meta::match("copyright", @_);
}
+sub match_guid ($$;@) {
+ IkiWiki::Plugin::meta::match("guid", @_);
+}
+
package IkiWiki::SortSpec;
sub cmp_meta {