CGI: if the page is missing, give the "missing page" a 404 status

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 3fadc462e5704cf446dc9e347d710265b1eae374..fe845726229137b8c623cb8fda86100785d82d07 100644 (file)
--- 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 $q->header(-status => "404 Not Found");
+               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;
@@ -317,7 +358,14 @@ sub cgi (;$$) {
                        error("\"do\" parameter missing");
                }
        }
-       
+
+       # 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);
+       }
+
        # Need to lock the wiki before getting a session.
        lockwiki();
        loadindex();