* Fix img plugin's handling of adding dependencies for images that do not

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 15a8bad845f08e389bbc656ff518947ff175c6b9..2e5fd7e76959deaa7aed03445284c2b8bb4fb59c 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -8,12 +8,22 @@ use IkiWiki;
 
 my %meta;
 my %title;
 
 my %meta;
 my %title;

+my %permalink;
+my %author;
+my %authorurl;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "meta", 
-               call => \&preprocess);
-       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 (@) { #{{{
+       my %params=@_;
+       
+       $meta{$params{page}}='';
+
+       return $params{content};

 } # }}}
 
 sub preprocess (@) { #{{{
 } # }}}
 
 sub preprocess (@) { #{{{


@@ -28,26 +38,38 @@ sub preprocess (@) { #{{{
        delete $params{page};
        delete $params{destpage};
 
        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 {
                        # hidden WikiLink
                                " />\n";
                }
                else {
                        # hidden WikiLink

-                       push @{$IkiWiki::links{$page}}, $value;
+                       push @{$links{$page}}, $value;

                }
        }
        elsif ($key eq 'title') {
                }
        }
        elsif ($key eq 'title') {

-               $title{$page}=escapeHTML($value);
+               $title{$page}=$value;
+       }
+       elsif ($key eq 'permalink') {
+               $permalink{$page}=$value;
+               $meta{$page}.="<link rel=\"bookmark\" href=\"".encode_entities($value)."\" />\n";

        }
        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";
+               if ($key eq 'author') {
+                       $author{$page}=$value;
+               }
+               elsif ($key eq 'authorurl') {
+                       $authorurl{$page}=$value;
+               }

        }
 
        return "";
        }
 
        return "";


@@ -60,8 +82,17 @@ sub pagetemplate (@) { #{{{
 
        $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");

-       $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})
+               if exists $author{$page} && $template->query(name => "author");
+       $template->param(authorurl => $authorurl{$page})
+               if exists $authorurl{$page} && $template->query(name => "authorurl");
+       

 } # }}}
 
 1
 } # }}}
 
 1