fix title metadata on blogs, reorg needed to do it, simplified tag some

[git.ikiwiki.info.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index d4b4e5db5f09ceb919228ce41f5ac253331d2c2f..bac16346932d2a00e1bc034d500a1fe8a08abebb 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -12,10 +12,20 @@ my %title;
 sub import { #{{{
        IkiWiki::hook(type => "preprocess", id => "meta", 
                call => \&preprocess);
 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);
 } # }}}
 
        IkiWiki::hook(type => "pagetemplate", id => "meta", 
                call => \&pagetemplate);
 } # }}}
 

+sub filter (@) { #{{{
+       my %params=@_;
+       
+       $meta{$params{page}}='';
+
+       return $params{content};
+} # }}}
+

 sub preprocess (@) { #{{{
        if (! @_) {
                return "";
 sub preprocess (@) { #{{{
        if (! @_) {
                return "";


@@ -26,14 +36,17 @@ sub preprocess (@) { #{{{
        delete $params{$key};
        my $page=$params{page};
        delete $params{page};
        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) {
 
        if ($key eq 'link') {
                if (%params) {

-                       $meta{$page}='' unless exists $meta{$page};
-                       $meta{$page}.="<link href=\"".escapeHTML($value)."\" ".
-                               join(" ", map { escapeHTML("$_=\"$params{$_}\"") } keys %params).
+                       $meta{$page}.="<link href=\"".encode_entities($value)."\" ".
+                               join(" ", map { encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\"" } keys %params).

                                " />\n";
                }
                else {
                                " />\n";
                }
                else {


@@ -42,19 +55,20 @@ sub preprocess (@) { #{{{
                }
        }
        elsif ($key eq 'title') {
                }
        }
        elsif ($key eq 'title') {

-               $title{$page}=escapeHTML($value);
+               $title{$page}=$value;

        }
        else {
        }
        else {

-               $meta{$page}='' unless exists $meta{$page};
-               $meta{$page}.="<meta name=\"".escapeHTML($key)."\" content=\"".escapeHTML($value)."\" />\n";
+               $meta{$page}.="<meta name=\"".encode_entities($key).
+                       "\" content=\"".encode_entities($value)."\" />\n";

        }
 
        return "";
 } # }}}
 
        }
 
        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(meta => $meta{$page})
                if exists $meta{$page} && $template->query(name => "meta");