X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d4128e899528c972262efc043eb89ebb34c068bd..fc36ba4c1f80d37161967021b7ded6cc7e54819c:/IkiWiki/Plugin/meta.pm
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 220fff9dc..cd367da70 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}) {
@@ -143,14 +155,30 @@ sub preprocess (@) {
eval q{use Date::Parse};
if (! $@) {
my $time = str2time($value);
- $IkiWiki::pagectime{$page}=$time if defined $time;
+ if (defined $time) {
+ $IkiWiki::pagectime{$page}=$time;
+ }
+ else {
+ error(sprintf(gettext('cannot parse date/time: %s'), $value));
+ }
+ }
+ else {
+ error $@;
}
}
elsif ($key eq 'updated') {
eval q{use Date::Parse};
if (! $@) {
my $time = str2time($value);
- $pagestate{$page}{meta}{updated}=$time if defined $time;
+ if (defined $time) {
+ $pagestate{$page}{meta}{updated}=$time;
+ }
+ else {
+ error(sprintf(gettext('cannot parse date/time: %s'), $value));
+ }
+ }
+ else {
+ error $@;
}
}
@@ -275,17 +303,24 @@ 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('