X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/18f4aeffb1841f8b455a5e31811695102262a06a..170b86a2efb1908355f5812eaa3f3de4a2dcaa49:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 949390e68..7e968d966 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -318,7 +318,7 @@ sub cgi_goto ($;$) {
 	my $link = bestlink("", $page);
 
 	if (! length $link) {
-		print "Content-type: text/html\n\n";
+		print $q->header(-status => "404 Not Found");
 		print misctemplate(gettext("missing page"),
 			"<p>".
 			sprintf(gettext("The page %s does not exist."),
@@ -332,6 +332,46 @@ sub cgi_goto ($;$) {
 	exit;
 }
 
+sub cgi_page_from_404 ($$$) {
+	my $path = shift;
+	my $baseurl = shift;
+	my $usedirs = shift;
+
+	# fail if missing from environment or whatever
+	return undef unless defined $path;
+	return undef unless defined $baseurl;
+
+	# with usedirs on, path is like /~fred/foo/bar/ or /~fred/foo/bar or
+	#    /~fred/foo/bar/index.html
+	# with usedirs off, path is like /~fred/foo/bar.html
+	# baseurl is like 'http://people.example.com/~fred'
+
+	# convert baseurl to ~fred
+	unless ($baseurl =~ s{^https?://[^/]+/?}{}) {
+		return undef;
+	}
+
+	# convert path to /~fred/foo/bar
+	if ($usedirs) {
+		$path =~ s/\/*(?:index\.$config{htmlext})?$//;
+	}
+	else {
+		$path =~ s/\.$config{htmlext}$//;
+	}
+
+	# remove /~fred/
+	unless ($path =~ s{^/*\Q$baseurl\E/*}{}) {
+		return undef;
+	}
+
+	# special case for the index
+	unless ($path) {
+		return 'index';
+	}
+
+	return $path;
+}
+
 sub cgi (;$$) {
 	my $q=shift;
 	my $session=shift;
@@ -359,9 +399,18 @@ sub cgi (;$$) {
 		}
 	}
 
+	# goto is the preferred name for this; recentchanges_link and
+	# commenter are for compatibility with any saved URLs
 	if ($do eq 'goto' || $do eq 'recentchanges_link' ||
 	    $do eq 'commenter') {
-		cgi_goto($q);
+		my $page = undef;
+
+		if ($ENV{REDIRECT_STATUS} eq '404') {
+			$page = cgi_page_from_404($ENV{REDIRECT_URL},
+				$config{url}, $config{usedirs});
+		}
+
+		cgi_goto($q, $page);
 	}
 
 	# Need to lock the wiki before getting a session.