X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dedbe110f27e77051c8e49e0a53b8cdd148dd752..9711181a3f7b69b82bc975d6c208f9484e168fbd:/IkiWiki/CGI.pm?ds=sidebyside

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 8734cdd49..3000ed100 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -229,6 +229,20 @@ sub cgi_prefs ($$) {
 	showform($form, $buttons, $session, $q);
 }
 
+sub cgi_custom_failure ($$) {
+	my $header=shift;
+	my $message=shift;
+
+	print $header;
+	print $message;
+
+	# Internet Explod^Hrer won't show custom 404 responses
+	# unless they're >= 512 bytes
+	print ' ' x 512;
+
+	exit;
+}
+
 sub check_banned ($$) {
 	my $q=shift;
 	my $session=shift;
@@ -236,14 +250,11 @@ sub check_banned ($$) {
 	my $name=$session->param("name");
 	if (defined $name) {
 		if (grep { $name eq $_ } @{$config{banned_users}}) {
-			print $q->header(-status => "403 Forbidden");
 			$session->delete();
-			print gettext("You are banned.");
-			# Internet Explorer won't show custom 404 responses
-			# unless they're >= 512 bytes
-			print " " x 512;
 			cgi_savesession($session);
-			exit;
+			cgi_custom_failure(
+				$q->header(-status => "403 Forbidden"),
+				gettext("You are banned."));
 		}
 	}
 }
@@ -294,90 +305,6 @@ sub cgi_savesession ($) {
 	umask($oldmask);
 }
 
-# cgi_goto(CGI, [page])
-# Redirect to a specified page, or display "not found". If not specified,
-# the page param from the CGI object is used.
-sub cgi_goto ($;$) {
-	my $q = shift;
-	my $page = shift;
-
-	if (!defined $page) {
-		$page = decode_utf8($q->param("page"));
-
-		if (!defined $page) {
-			error("missing page parameter");
-		}
-	}
-
-	loadindex();
-
-	# If the page is internal (like a comment), see if it has a
-	# permalink. Comments do.
-	if (isinternal($page) &&
-	    defined $pagestate{$page}{meta}{permalink}) {
-		redirect($q, $pagestate{$page}{meta}{permalink});
-	}
-
-	my $link = bestlink("", $page);
-
-	if (! length $link) {
-		print $q->header(-status => "404 Not Found");
-		print misctemplate(gettext("missing page"),
-			"<p>".
-			sprintf(gettext("The page %s does not exist."),
-				htmllink("", "", $page)).
-			"</p>".
-			# Internet Explorer won't show custom 404 responses
-			# unless they're >= 512 bytes
-			(" " x 512));
-	}
-	else {
-		redirect($q, urlto($link, undef, 1));
-	}
-
-	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;
@@ -405,20 +332,6 @@ 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') {
-		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.
 	lockwiki();
 	loadindex();