X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ea244ab7b53afbd710dab267ca9a8fb9f17cfb00..3fe434189b99daf3d8cc075186c4ed4ebdd43b8f:/IkiWiki/Plugin/getsource.pm

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 1b7eb56c6..0a21413bd 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		getsource_mimetype => {
 			type => "string",
@@ -42,23 +43,25 @@ sub pagetemplate (@) {
 sub cgi_getsource ($) {
 	my $cgi=shift;
 
-	# Note: we use sessioncgi rather than just cgi
-	# because we need $IkiWiki::pagesources{} to be
-	# populated.
-
-	return unless (defined $cgi->param('do') &&
-					$cgi->param("do") eq "getsource");
+	return unless defined $cgi->param('do') &&
+	              $cgi->param("do") eq "getsource";
 
 	IkiWiki::decode_cgi_utf8($cgi);
 
 	my $page=$cgi->param('page');
 
+	if (! defined $page || $page !~ /$config{wiki_file_regexp}/) {
+		error("invalid page parameter");
+	}
+
+	# For %pagesources.
 	IkiWiki::loadindex();
 
-	if (! exists $IkiWiki::pagesources{$page}) {
+	if (! exists $pagesources{$page}) {
 		IkiWiki::cgi_custom_failure(
-			$cgi->header(-status => "404 Not Found"),
-			IkiWiki::misctemplate(gettext("missing page"),
+			$cgi,
+			"404 Not Found",
+			IkiWiki::cgitemplate($cgi, gettext("missing page"),
 				"<p>".
 				sprintf(gettext("The page %s does not exist."),
 					htmllink("", "", $page)).
@@ -66,10 +69,10 @@ sub cgi_getsource ($) {
 		exit;
 	}
 
-	if (! defined pagetype($IkiWiki::pagesources{$page})) {
+	if (! defined pagetype($pagesources{$page})) {
 		IkiWiki::cgi_custom_failure(
 			$cgi->header(-status => "403 Forbidden"),
-			IkiWiki::misctemplate(gettext("not a page"),
+			IkiWiki::cgitemplate($cgi, gettext("not a page"),
 				"<p>".
 				sprintf(gettext("%s is an attachment, not a page."),
 					htmllink("", "", $page)).
@@ -77,18 +80,14 @@ sub cgi_getsource ($) {
 		exit;
 	}
 
-	my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
-
 	if (! $config{getsource_mimetype}) {
 		$config{getsource_mimetype} = "text/plain; charset=utf-8";
 	}
 
 	print "Content-Type: $config{getsource_mimetype}\r\n";
-
 	print ("\r\n");
+	print readfile(srcfile($pagesources{$page}));
 
-	print $data;
-	
 	exit 0;
 }