X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/819b31d46c05c00d4183f824f74bfe3836471d78..8a6a0673339c00480d49513eb0e3db83a9c7ce9c:/IkiWiki/Plugin/meta.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index adfd688a6..184146cfe 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -4,7 +4,7 @@ package IkiWiki::Plugin::meta; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; my %meta; my %title; @@ -13,12 +13,9 @@ 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); + hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1); + hook(type => "filter", id => "meta", call => \&filter); + hook(type => "pagetemplate", id => "meta", call => \&pagetemplate); } # }}} sub filter (@) { #{{{ @@ -29,6 +26,15 @@ sub filter (@) { #{{{ return $params{content}; } # }}} +sub scrub ($) { #{{{ + if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) { + return IkiWiki::Plugin::htmlscrubber::sanitize(content => shift); + } + else { + return shift; + } +} #}}} + sub preprocess (@) { #{{{ if (! @_) { return ""; @@ -40,6 +46,7 @@ sub preprocess (@) { #{{{ my $page=$params{page}; delete $params{page}; delete $params{destpage}; + delete $params{preview}; eval q{use HTML::Entities}; # Always dencode, even if encoding later, since it might not be @@ -48,24 +55,54 @@ sub preprocess (@) { #{{{ if ($key eq 'link') { if (%params) { - $meta{$page}.="\n"; + " />\n"); } else { # hidden WikiLink - push @{$IkiWiki::links{$page}}, $value; + push @{$links{$page}}, $value; } } elsif ($key eq 'title') { - $title{$page}=$value; + $title{$page}=HTML::Entities::encode_numeric($value); } elsif ($key eq 'permalink') { $permalink{$page}=$value; + $meta{$page}.=scrub("\n"); + } + elsif ($key eq 'date') { + eval q{use Date::Parse}; + if (! $@) { + my $time = str2time($value); + $IkiWiki::pagectime{$page}=$time if defined $time; + } + } + elsif ($key eq 'stylesheet') { + my $rel=exists $params{rel} ? $params{rel} : "alternate stylesheet"; + my $title=exists $params{title} ? $params{title} : $value; + # adding .css to the value prevents using any old web + # editable page as a stylesheet + my $stylesheet=bestlink($page, $value.".css"); + if (! length $stylesheet) { + return "[[meta ".gettext("stylesheet not found")."]]"; + } + $meta{$page}.='\n"; + } + elsif ($key eq 'openid') { + if (exists $params{server}) { + $meta{$page}.='\n"; + } + $meta{$page}.='\n"; } else { - $meta{$page}.="\n"; + $meta{$page}.=scrub("\n"); if ($key eq 'author') { $author{$page}=$value; } @@ -84,8 +121,10 @@ sub pagetemplate (@) { #{{{ $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})