From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 31 Jan 2009 14:36:23 +0000 (+0000)
Subject: CGI: add cgi_goto(CGI, [page])
X-Git-Tag: 3.04~86^2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2dafcb4e5e8c9f654c0ad5719607366cf84b75a;p=ikiwiki.git

CGI: add cgi_goto(CGI, [page])

This redirects to the given page (or if none is given, the page parameter
given to the CGI), or displays an error with a create link if the page
doesn't exist.
---

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 3fadc462e..a6b485edb 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -291,6 +291,47 @@ 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 "Content-type: text/html\n\n";
+		print misctemplate(gettext("missing page"),
+			"<p>".
+			sprintf(gettext("The page %s does not exist."),
+				htmllink("", "", $page)).
+			"</p>");
+	}
+	else {
+		redirect($q, urlto($link, undef, 1));
+	}
+
+	exit;
+}
+
 sub cgi (;$$) {
 	my $q=shift;
 	my $session=shift;