X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/54541869392f162bb195b8b67814ef0a394c1961..a6e1274f468477cceb9b118aa5b49bd74e9385c4:/IkiWiki/Plugin/meta.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 41d096e0e..2e5fd7e76 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -8,12 +8,22 @@ use IkiWiki;
 
 my %meta;
 my %title;
+my %permalink;
+my %author;
+my %authorurl;
 
 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 (@) { #{{{
@@ -26,38 +36,63 @@ sub preprocess (@) { #{{{
 	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) {
-			$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
-			push @{$IkiWiki::links{$page}}, $value;
+			push @{$links{$page}}, $value;
 		}
 	}
 	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 {
-		$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 "";
 } # }}}
 
-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->param(title => $title{$page}) if exists $title{$page};
+	$template->param(meta => $meta{$page})
+		if exists $meta{$page} && $template->query(name => "meta");
+	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