X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/655d7925c60ecd7dd5dc3b35887f7a2573029796..723a10b5b16d87f118bea4c6afaa8d5f60ba5947:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index cfa4b84b1..8555e1109 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -15,18 +15,24 @@ my %license;
 my %copyright;
 
 sub import { #{{{
-	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
-	hook(type => "filter", id => "meta", call => \&filter);
+	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
+	hook(type => "preprocess", id => "meta", call => \&preprocess);
 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
 } # }}}
 
-sub filter (@) { #{{{
-	my %params=@_;
-	
-	$meta{$params{page}}='';
-
-	return $params{content};
-} # }}}
+sub needsbuild (@) { #{{{
+	my $needsbuild=shift;
+	foreach my $page (keys %pagestate) {
+		if (exists $pagestate{$page}{meta}) {
+			if (grep { $_ eq $pagesources{$page} } @$needsbuild) {
+				# remove state, it will be re-added
+				# if the preprocessor directive is still
+				# there during the rebuild
+				delete $pagestate{$page}{meta};
+			}
+		}
+	}
+}
 
 sub scrub ($) { #{{{
 	if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
@@ -38,9 +44,7 @@ sub scrub ($) { #{{{
 } #}}}
 
 sub preprocess (@) { #{{{
-	if (! @_) {
-		return "";
-	}
+	return "" unless @_;
 	my %params=@_;
 	my $key=shift;
 	my $value=$params{$key};
@@ -52,27 +56,16 @@ sub preprocess (@) { #{{{
 	delete $params{preview};
 
 	eval q{use HTML::Entities};
-	# Always dencode, even if encoding later, since it might not be
+	# Always decode, even if encoding later, since it might not be
 	# fully encoded.
 	$value=decode_entities($value);
 
-	if ($key eq 'link') {
-		if (%params) {
-			$meta{$page}.=scrub("<link href=\"".encode_entities($value)."\" ".
-				join(" ", map { encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\"" } keys %params).
-				" />\n");
-		}
-		else {
-			# hidden WikiLink
-			push @{$links{$page}}, $value;
-		}
-	}
-	elsif ($key eq 'title') {
+	if ($key eq 'title') {
 		$title{$page}=HTML::Entities::encode_numeric($value);
 	}
 	elsif ($key eq 'permalink') {
 		$permalink{$page}=$value;
-		$meta{$page}.=scrub("<link rel=\"bookmark\" href=\"".encode_entities($value)."\" />\n");
+		push @{$meta{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />');
 	}
 	elsif ($key eq 'date') {
 		eval q{use Date::Parse};
@@ -90,49 +83,68 @@ sub preprocess (@) { #{{{
 		if (! length $stylesheet) {
 			return "[[meta ".gettext("stylesheet not found")."]]";
 		}
-		$meta{$page}.='<link href="'.urlto($stylesheet, $page).
+		push @{$meta{$page}}, '<link href="'.urlto($stylesheet, $page).
 			'" rel="'.encode_entities($rel).
 			'" title="'.encode_entities($title).
-			"\" type=\"text/css\" />\n";
+			"\" type=\"text/css\" />";
 	}
 	elsif ($key eq 'openid') {
 		if (exists $params{server}) {
-			$meta{$page}.='<link href="'.encode_entities($params{server}).
-				"\" rel=\"openid.server\" />\n";
+			push @{$meta{$page}}, '<link href="'.encode_entities($params{server}).
+				'" rel="openid.server" />';
 		}
-		$meta{$page}.='<link href="'.encode_entities($value).
-			"\" rel=\"openid.delegate\" />\n";
+		push @{$meta{$page}}, '<link href="'.encode_entities($value).
+			'" rel="openid.delegate" />';
 	}
 	elsif ($key eq 'license') {
-		$meta{$page}.="<link rel=\"license\" href=\"#page_license\" />\n";
+		push @{$meta{$page}}, '<link rel="license" href="#page_license" />';
 		$license{$page}=$value;
 	}
 	elsif ($key eq 'copyright') {
-		$meta{$page}.="<link rel=\"copyright\" href=\"#page_copyright\" />\n";
+		push @{$meta{$page}}, '<link rel="copyright" href="#page_copyright" />';
 		$copyright{$page}=$value;
 	}
-	elsif ($key eq 'forward') {
-		my $delay=0;
-		my $dest_url;
-		my $text;
-		if (exists $params{delay}) {
-			$delay=$params{delay};
+	elsif ($key eq 'redir') {
+		return "" if $page ne $destpage;
+		my $safe=0;
+		if ($value !~ /^\w+:\/\//) {
+			add_depends($page, $value);
+			my $link=bestlink($page, $value);
+			if (! length $link) {
+				return "[[meta ".gettext("redir page not found")."]]";
+			}
+
+			$value=urlto($link, $page);
+			$safe=1;
+
+			# redir cycle detection
+			$pagestate{$page}{meta}{redir}=$link;
+			my $at=$page;
+			my %seen;
+			while (exists $pagestate{$at}{meta}{redir}) {
+				if ($seen{$at}) {
+					return "[[meta ".gettext("redir cycle is not allowed")."]]";
+				}
+				$seen{$at}=1;
+				$at=$pagestate{$at}{meta}{redir};
+			}
 		}
-		# Is this a wikilink?
-		if ($value =~ /^\[\[(.*)\]\]$/) {
-			$text=htmllink($page, $destpage, $1);
-			$dest_url=urlto(bestlink($page, $1), $destpage);
-		} else {
-			$text="<a href=\"$dest_url\">$dest_url</a>";
-			$dest_url=$value;
+		else {
+			$value=encode_entities($value);
+		}
+		my $delay=int(exists $params{delay} ? $params{delay} : 0);
+		my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\">";
+		if (! $safe) {
+			$redir=scrub($redir);
 		}
-# TODO.		$meta{$page}.=scrub("<meta http-equiv=\"refresh\" content=\"$delay; URL=$dest_url\">");
-		$meta{$page}.="<meta http-equiv=\"refresh\" content=\"$delay; URL=$dest_url\">";
-		return "You are being forwarded to $text.";
+		push @{$meta{$page}}, $redir;
+	}
+	elsif ($key eq 'link') {
+		return "[[meta ".gettext("link is no longer supported")."]]";
 	}
 	else {
-		$meta{$page}.=scrub("<meta name=\"".encode_entities($key).
-			"\" content=\"".encode_entities($value)."\" />\n");
+		push @{$meta{$page}}, scrub('<meta name="'.encode_entities($key).
+			'" content="'.encode_entities($value).'" />');
 		if ($key eq 'author') {
 			$author{$page}=$value;
 		}
@@ -150,8 +162,11 @@ sub pagetemplate (@) { #{{{
         my $destpage=$params{destpage};
         my $template=$params{template};
 
-	$template->param(meta => $meta{$page})
-		if exists $meta{$page} && $template->query(name => "meta");
+	if (exists $meta{$page} && $template->query(name => "meta")) {
+		# avoid duplicate meta lines
+		my %seen;
+		$template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$meta{$page}}));
+	}
 	if (exists $title{$page} && $template->query(name => "title")) {
 		$template->param(title => $title{$page});
 		$template->param(title_overridden => 1);