X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0fe87efc348643e30405f2d50c8498c971b99af4..f9b87a9f8b498f3a41614b159dcb278024be70dd:/IkiWiki/Plugin/meta.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 02c99e9f6..3991797c0 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -9,11 +9,20 @@ use IkiWiki 2.00;
 my %metaheaders;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "meta", call => \&getsetup);
 	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
 } # }}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
 sub needsbuild (@) { #{{{
 	my $needsbuild=shift;
 	foreach my $page (keys %pagestate) {
@@ -29,9 +38,10 @@ sub needsbuild (@) { #{{{
 	}
 }
 
-sub scrub ($) { #{{{
+sub scrub ($$) { #{{{
 	if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
-		return IkiWiki::Plugin::htmlscrubber::sanitize(content => shift);
+		return IkiWiki::Plugin::htmlscrubber::sanitize(
+			content => shift, destpage => shift);
 	}
 	else {
 		return shift;
@@ -84,14 +94,8 @@ sub preprocess (@) { #{{{
 		$pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
 		# fallthrough
 	}
-	elsif ($key eq 'uuid') {
-		my $abs = $value;
-
-		if ($abs =~ m/^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}$/) {
-			$abs = lc "urn:uuid:$abs";
-		}
-
-		$pagestate{$page}{meta}{uuid}=HTML::Entities::encode_numeric($abs);
+	elsif ($key eq 'guid') {
+		$pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
 		# fallthrough
 	}
 	elsif ($key eq 'license') {
@@ -134,7 +138,7 @@ sub preprocess (@) { #{{{
 	elsif ($key eq 'permalink') {
 		if (safeurl($value)) {
 			$pagestate{$page}{meta}{permalink}=$value;
-			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />');
+			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
 		}
 	}
 	elsif ($key eq 'stylesheet') {
@@ -144,7 +148,7 @@ sub preprocess (@) { #{{{
 		# editable page as a stylesheet
 		my $stylesheet=bestlink($page, $value.".css");
 		if (! length $stylesheet) {
-			return "[[meta ".gettext("stylesheet not found")."]]";
+			error gettext("stylesheet not found")
 		}
 		push @{$metaheaders{$page}}, '<link href="'.urlto($stylesheet, $page).
 			'" rel="'.encode_entities($rel).
@@ -178,7 +182,7 @@ sub preprocess (@) { #{{{
 			add_depends($page, $redir_page);
 			my $link=bestlink($page, $redir_page);
 			if (! length $link) {
-				return "[[meta ".gettext("redir page not found")."]]";
+				error gettext("redir page not found")
 			}
 
 			$value=urlto($link, $page);
@@ -191,7 +195,7 @@ sub preprocess (@) { #{{{
 			my %seen;
 			while (exists $pagestate{$at}{meta}{redir}) {
 				if ($seen{$at}) {
-					return "[[meta ".gettext("redir cycle is not allowed")."]]";
+					error gettext("redir cycle is not allowed")
 				}
 				$seen{$at}=1;
 				$at=$pagestate{$at}{meta}{redir};
@@ -203,7 +207,7 @@ sub preprocess (@) { #{{{
 		my $delay=int(exists $params{delay} ? $params{delay} : 0);
 		my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
 		if (! $safe) {
-			$redir=scrub($redir);
+			$redir=scrub($redir, $destpage);
 		}
 		push @{$metaheaders{$page}}, $redir;
 	}
@@ -213,7 +217,7 @@ sub preprocess (@) { #{{{
 				join(" ", map {
 					encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
 				} keys %params).
-				" />\n");
+				" />\n", $destpage);
 		}
 	}
 	elsif ($key eq 'robots') {
@@ -222,7 +226,7 @@ sub preprocess (@) { #{{{
 	}
 	else {
 		push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
-			'" content="'.encode_entities($value).'" />');
+			'" content="'.encode_entities($value).'" />', $destpage);
 	}
 
 	return "";
@@ -270,7 +274,7 @@ sub match { #{{{
 		$val=$pagestate{$page}{meta}{$field};
 	}
 	elsif ($field eq 'title') {
-		$val=pagetitle($page);
+		$val = pagetitle($page);
 	}
 
 	if (defined $val) {