From 0afcec734622811b8910d3df5d102df58d429a51 Mon Sep 17 00:00:00 2001
From: Simon McVittie
Date: Sun, 26 Jul 2009 16:45:01 +0100
Subject: [PATCH] getsource: turn missing pages into a 404
Also restructure so we return early on missing pages.
---
IkiWiki/Plugin/getsource.pm | 38 ++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
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"),
+ "
".
+ sprintf(gettext("The page %s does not exist."),
+ htmllink("", "", $page)).
+ "
"));
+ exit;
}
-
- error("Unable to find page source for page: $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;
}