X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a0aca9f585d3a530dba0739a1ec2e7da8472f94d..0a56f05b53c8b9a91478c2af932a60c4a46c441b:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index fd21432fa..4aa545a93 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -11,6 +11,8 @@ my %title;
 my %permalink;
 my %author;
 my %authorurl;
+my %license;
+my %copyright;
 
 sub import { #{{{
 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
@@ -22,6 +24,7 @@ sub filter (@) { #{{{
 	my %params=@_;
 	
 	$meta{$params{page}}='';
+	delete $pagestate{$params{page}}{meta}{redir};
 
 	return $params{content};
 } # }}}
@@ -45,6 +48,7 @@ sub preprocess (@) { #{{{
 	delete $params{$key};
 	my $page=$params{page};
 	delete $params{page};
+	my $destpage=$params{destpage};
 	delete $params{destpage};
 	delete $params{preview};
 
@@ -56,7 +60,9 @@ sub preprocess (@) { #{{{
 	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).
+				join(" ", map {
+					encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
+				} keys %params).
 				" />\n");
 		}
 		else {
@@ -64,6 +70,41 @@ sub preprocess (@) { #{{{
 			push @{$links{$page}}, $value;
 		}
 	}
+	elsif ($key eq 'redir') {
+		return "" if $destpage ne $page;
+		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};
+			}
+		}
+		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);
+		}
+		$meta{$page}.=$redir;
+	}
 	elsif ($key eq 'title') {
 		$title{$page}=HTML::Entities::encode_numeric($value);
 	}
@@ -100,6 +141,14 @@ sub preprocess (@) { #{{{
 		$meta{$page}.='<link href="'.encode_entities($value).
 			"\" rel=\"openid.delegate\" />\n";
 	}
+	elsif ($key eq 'license') {
+		$meta{$page}.="<link rel=\"license\" href=\"#page_license\" />\n";
+		$license{$page}=$value;
+	}
+	elsif ($key eq 'copyright') {
+		$meta{$page}.="<link rel=\"copyright\" href=\"#page_copyright\" />\n";
+		$copyright{$page}=$value;
+	}
 	else {
 		$meta{$page}.=scrub("<meta name=\"".encode_entities($key).
 			"\" content=\"".encode_entities($value)."\" />\n");
@@ -117,6 +166,7 @@ sub preprocess (@) { #{{{
 sub pagetemplate (@) { #{{{
 	my %params=@_;
         my $page=$params{page};
+        my $destpage=$params{destpage};
         my $template=$params{template};
 
 	$template->param(meta => $meta{$page})
@@ -131,7 +181,26 @@ sub pagetemplate (@) { #{{{
 		if exists $author{$page} && $template->query(name => "author");
 	$template->param(authorurl => $authorurl{$page})
 		if exists $authorurl{$page} && $template->query(name => "authorurl");
-	
+		
+	if ($page ne $destpage &&
+	    ((exists $license{$page}   && ! exists $license{$destpage}) ||
+	     (exists $copyright{$page} && ! exists $copyright{$destpage}))) {
+		# Force a scan of the destpage to get its copyright/license
+		# info. If the info is declared after an inline, it will
+		# otherwise not be available at this point.
+		IkiWiki::scan($pagesources{$destpage});
+	}
+
+	if (exists $license{$page} && $template->query(name => "license") &&
+	    ($page eq $destpage || ! exists $license{$destpage} ||
+	     $license{$page} ne $license{$destpage})) {
+		$template->param(license => IkiWiki::linkify($page, $destpage, $license{$page}));
+	}
+	if (exists $copyright{$page} && $template->query(name => "copyright") &&
+	    ($page eq $destpage || ! exists $copyright{$destpage} ||
+	     $copyright{$page} ne $copyright{$destpage})) {
+		$template->param(copyright => IkiWiki::linkify($page, $destpage, $copyright{$page}));
+	}
 } # }}}
 
 1