update for rename of users/smcv/approved.mdwn to users/smcv/yesplease.mdwn

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

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 3f40c5859f3d22f7d7c1fc7dfb8d9398e8a7249f..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);
 
 sub import {
        hook(type => "cgi", id => 'goto',  call => \&cgi);

+       hook(type => "getsetup", id => 'goto',  call => \&getsetup);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -14,6 +15,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "web",

                }
 }
 
                }
 }
 


@@ -32,21 +34,29 @@ 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();
 
        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}) {
-               IkiWiki::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) {
+       if (! defined $link || ! length $link) {

                IkiWiki::cgi_custom_failure(
                IkiWiki::cgi_custom_failure(

-                       $q->header(-status => "404 Not Found"),
-                       IkiWiki::misctemplate(gettext("missing page"),
+                       $q,
+                       "404 Not Found",
+                       IkiWiki::cgitemplate($q, gettext("missing page"),

                                "<p>".
                                sprintf(gettext("The page %s does not exist."),
                                        htmllink("", "", $page)).
                                "<p>".
                                sprintf(gettext("The page %s does not exist."),
                                        htmllink("", "", $page)).


@@ -54,7 +64,7 @@ sub cgi_goto ($;$) {
                )
        }
        else {
                )
        }
        else {

-               IkiWiki::redirect($q, urlto($link, undef, 1));
+               IkiWiki::redirect($q, urlto($link));

        }
 
        exit;
        }
 
        exit;