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 70663020318197396412354be7a9d7462df62e4b..a385ed8395272446f62bbba41c5fb5876c0dbca0 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -75,7 +75,7 @@ sub cgi_editpage ($$) {
                required => [qw{editcontent}],
                javascript => 0,
                params => $q,
-               action => $config{cgiurl},
+               action => IkiWiki::cgiurl(),
                header => 0,
                table => 0,
                template => { template("editpage.tmpl") },
@@ -91,6 +91,9 @@ 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) {
+               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 ||
@@ -98,7 +101,7 @@ sub cgi_editpage ($$) {
                error(gettext("bad page name"));
        }
 
-       my $baseurl = urlto($page, undef, 1);
+       my $baseurl = urlto($page);
 
        my $from;
        if (defined $form->field('from')) {
@@ -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);
@@ -156,13 +160,13 @@ sub cgi_editpage ($$) {
        my $previewing=0;
        if ($form->submitted eq "Cancel") {
                if ($form->field("do") eq "create" && defined $from) {
-                       redirect($q, urlto($from, undef, 1));
+                       redirect($q, urlto($from));
                }
                elsif ($form->field("do") eq "create") {
-                       redirect($q, $config{url});
+                       redirect($q, baseurl(undef));
                }
                else {
-                       redirect($q, urlto($page, undef, 1));
+                       redirect($q, $baseurl);
                }
                exit;
        }
@@ -187,7 +191,7 @@ sub cgi_editpage ($$) {
                my $preview=htmlize($page, $page, $type,
                        linkify($page, $page,
                        preprocess($page, $page,
-                       filter($page, $page, $content, 'fullpage'), 0, 1)));
+                       filter($page, $page, $content), 0, 1)));
                run_hooks(format => sub {
                        $preview=shift->(
                                page => $page,
@@ -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;
@@ -262,7 +273,7 @@ sub cgi_editpage ($$) {
                                        @page_locs=$page;
                                }
                                else {
-                                       redirect($q, urlto($page, undef, 1));
+                                       redirect($q, $baseurl);
                                        exit;
                                }
                        }
@@ -291,7 +302,7 @@ sub cgi_editpage ($$) {
                                value => $best_loc);
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
-                       $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
+                       $form->title(sprintf(gettext("creating %s"), pagetitle(basename($page))));
                        
                }
                elsif ($form->field("do") eq "edit") {
@@ -309,11 +320,10 @@ sub cgi_editpage ($$) {
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
-                       $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
+                       $form->title(sprintf(gettext("editing %s"), pagetitle(basename($page))));
                }
                
-               showform($form, \@buttons, $session, $q,
-                       forcebaseurl => $baseurl, page => $page);
+               showform($form, \@buttons, $session, $q, page => $page);
        }
        else {
                # save page
@@ -331,7 +341,7 @@ sub cgi_editpage ($$) {
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        showform($form, \@buttons, $session, $q,
-                               forcebaseurl => $baseurl, page => $page);
+                               page => $page);
                        exit;
                }
                elsif ($form->field("do") eq "create" && $exists) {
@@ -346,7 +356,7 @@ sub cgi_editpage ($$) {
                                         "\n\n\n".$form->field("editcontent"),
                                force => 1);
                        showform($form, \@buttons, $session, $q,
-                               forcebaseurl => $baseurl, page => $page);
+                               page => $page);
                        exit;
                }
                        
@@ -387,7 +397,7 @@ sub cgi_editpage ($$) {
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        showform($form, \@buttons, $session, $q,
-                               forcebaseurl => $baseurl, page => $page);
+                               page => $page);
                        exit;
                }
                
@@ -429,12 +439,12 @@ sub cgi_editpage ($$) {
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        showform($form, \@buttons, $session, $q,
-                               forcebaseurl => $baseurl, page => $page);
+                               page => $page);
                }
                else {
                        # The trailing question mark tries to avoid broken
                        # caches and get the most recent version of the page.
-                       redirect($q, urlto($page, undef, 1)."?updated");
+                       redirect($q, $baseurl."?updated");
                }
        }