X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c8b4ba354f82fbbcebbbfca65b40a047f9920525..2c784773879b228b7dfec2c6d092c9e1e98ab97b:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index ec7a2d081..134c0ce5d 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -4,13 +4,16 @@ package IkiWiki::Plugin::meta;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my %meta;
 my %title;
 my %permalink;
 my %author;
 my %authorurl;
+my %license;
+my %copyright;
+my %redirected;
 
 sub import { #{{{
 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
@@ -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,8 +70,34 @@ sub preprocess (@) { #{{{
 			push @{$links{$page}}, $value;
 		}
 	}
+	elsif ($key eq 'redir') {
+		$redirected{$page}=1;
+		my $safe=0;
+		if ($value =~ /^$config{wiki_link_regexp}$/) {
+			my $link=bestlink($page, $value);
+			if (! length $link) {
+				return "[[meta ".gettext("redir page not found")."]]";
+			}
+			if ($redirected{$link}) {
+				# TODO this is a cheap way of avoiding
+				# redir cycles, but it is really too strict.
+				return "[[meta ".gettext("redir to page that itself redirs is not allowed")."]]";
+			}
+			$value=urlto($link, $destpage);
+			$safe=1;
+		}
+		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}=encode_entities($value);
+		$title{$page}=HTML::Entities::encode_numeric($value);
 	}
 	elsif ($key eq 'permalink') {
 		$permalink{$page}=$value;
@@ -87,10 +119,10 @@ sub preprocess (@) { #{{{
 		if (! length $stylesheet) {
 			return "[[meta ".gettext("stylesheet not found")."]]";
 		}
-		$meta{$page}.='<link href="'.$stylesheet.
+		$meta{$page}.='<link href="'.urlto($stylesheet, $page).
 			'" rel="'.encode_entities($rel).
 			'" title="'.encode_entities($title).
-			"style=\"text/css\" />\n";
+			"\" type=\"text/css\" />\n";
 	}
 	elsif ($key eq 'openid') {
 		if (exists $params{server}) {
@@ -100,6 +132,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 +157,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 +172,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