simplify

[git.ikiwiki.info.git] / IkiWiki / Plugin / goto.pm

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 9e7a2621fabe3c754f49ee9d582afb17b8f85712..6b596ac8b6af95641dec071071e5be38b3898f87 100644 (file)
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -7,6 +7,7 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "cgi", id => 'goto',  call => \&cgi);
+       hook(type => "getsetup", id => 'goto',  call => \&getsetup);
 }
 
 sub getsetup () {
@@ -14,6 +15,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
+                       section => "web",
                }
 }
 
@@ -32,30 +34,37 @@ sub cgi_goto ($;$) {
                }
        }
 
+       # It's possible that $page is not a valid page name;
+       # if so attempt to turn it into one.
+       if ($page !~ /$config{wiki_file_regexp}/) {
+               $page=titlepage($page);
+       }
+
        IkiWiki::loadindex();
 
-       # If the page is internal (like a comment), see if it has a
-       # permalink. Comments do.
-       if (IkiWiki::isinternal($page) &&
-           defined $pagestate{$page}{meta}{permalink}) {
-               redirect($q, $pagestate{$page}{meta}{permalink});
+       my $link;
+       if (! IkiWiki::isinternal($page)) {
+               $link = bestlink("", $page);
+       }
+       elsif (defined $pagestate{$page}{meta}{permalink}) {
+               # Can only redirect to an internal page if it has a
+               # permalink.
+               IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
        }
 
-       my $link = bestlink("", $page);
-
-       if (! length $link) {
-               print $q->header(-status => "404 Not Found");
-               print IkiWiki::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));
+       if (! defined $link || ! length $link) {
+               IkiWiki::cgi_custom_failure(
+                       $q,
+                       "404 Not Found",
+                       IkiWiki::cgitemplate($q, gettext("missing page"),
+                               "<p>".
+                               sprintf(gettext("The page %s does not exist."),
+                                       htmllink("", "", $page)).
+                               "</p>")
+               )
        }
        else {
-               IkiWiki::redirect($q, urlto($link, undef, 1));
+               IkiWiki::redirect($q, urlto($link));
        }
 
        exit;
@@ -66,7 +75,7 @@ sub cgi ($) {
        my $do = $cgi->param('do');
 
        if (defined $do && ($do eq 'goto' || $do eq 'commenter' ||
-                              $do eq 'recentchanged_link')) {
+                              $do eq 'recentchanges_link')) {
                # goto is the preferred name for this; recentchanges_link and
                # commenter are for compatibility with any saved URLs
                cgi_goto($cgi);