From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 26 Jul 2009 15:45:01 +0000 (+0100)
Subject: getsource: turn missing pages into a 404
X-Git-Tag: 3.15~18^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0afcec734622811b8910d3df5d102df58d429a51;p=ikiwiki.git

getsource: turn missing pages into a 404

Also restructure so we return early on missing pages.
---

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 08d9d110c..6a208f1e7 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -55,25 +55,29 @@ sub cgi_getsource ($) {
 
 	IkiWiki::loadindex();
 
-	if ($IkiWiki::pagesources{$page}) {
-		
-		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 $data;
-		
-		exit 0;
+	if (! exists $IkiWiki::pagesources{$page}) {
+		IkiWiki::cgi_custom_failure(
+			$cgi->header(-status => "404 Not Found"),
+			IkiWiki::misctemplate(gettext("missing page"),
+				"<p>".
+				sprintf(gettext("The page %s does not exist."),
+					htmllink("", "", $page)).
+				"</p>"));
+		exit;
+	}
+
+	my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
+
+	if (! $config{getsource_mimetype}) {
+		$config{getsource_mimetype} = "text/plain; charset=utf-8";
 	}
-	
-	error("Unable to find page source for page: $page");
 
+	print "Content-Type: $config{getsource_mimetype}\r\n";
+
+	print ("\r\n");
+
+	print $data;
+	
 	exit 0;
 }