Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 8c78e853cfc188927a4c1c225dca7a1267fdc7b4..a385ed8395272446f62bbba41c5fb5876c0dbca0 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -91,12 +91,15 @@ sub cgi_editpage ($$) {
        # This untaint is safe because we check file_pruned and
        # wiki_file_regexp.
        my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;
-       if (! defined $page || ! length $page ||
-           file_pruned($page)) {
+       if (! defined $page) {
                error(gettext("bad page name"));
        }
        $page=possibly_foolish_untaint($page);
        my $absolute=($page =~ s#^/+##); # absolute name used to force location
+       if (! defined $page || ! length $page ||
+           file_pruned($page)) {
+               error(gettext("bad page name"));
+       }
 
        my $baseurl = urlto($page);
 
@@ -128,7 +131,8 @@ sub cgi_editpage ($$) {
                        # favor the type of linking page
                        $type=pagetype($pagesources{$from});
                }
-               $type=$config{default_pageext} unless defined $type;
+               $type=$config{default_pageext}
+                       if ! defined $type || $type=~/^_/; # not internal type
                $file=newpagefile($page, $type);
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo", value => "", force => 1);
@@ -223,6 +227,8 @@ sub cgi_editpage ($$) {
                            $absolute ||
                            $form->submitted) {
                                @page_locs=$best_loc=$page;
+                               unshift @page_locs, lc($page)
+                                       if ! $form->submitted && lc($page) ne $page;
                        }
                        else {
                                my $dir=$from."/";
@@ -237,13 +243,18 @@ sub cgi_editpage ($$) {
                                        $best_loc=$dir.$page;
                                }
                                
+                               my $mixedcase=lc($page) ne $page;
+
+                               push @page_locs, $dir.lc($page) if $mixedcase;
                                push @page_locs, $dir.$page;
-                               push @page_locs, "$from/$page";
+                               push @page_locs, $from."/".lc($page) if $mixedcase;
+                               push @page_locs, $from."/".$page;
                                while (length $dir) {
                                        $dir=~s![^/]+/+$!!;
+                                       push @page_locs, $dir.lc($page) if $mixedcase;
                                        push @page_locs, $dir.$page;
                                }
-                       
+
                                my $userpage=IkiWiki::userpage($page);
                                push @page_locs, $userpage
                                        if ! grep { $_ eq $userpage } @page_locs;