* Fix a bug with inlined create page links, including Discussion links on

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index aee80253ba94401e9b517f99f1dcc87b8549145b..1c4e088dc5c9b92853f24b13ed5a1c23aa82c45d 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -290,7 +290,8 @@ sub cgi_editpage ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
-       my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+       my @fields=qw(do rcsinfo subpage from page type editcontent comments
+                     newfile);
        my @buttons=("Save Page", "Preview", "Cancel");
        
        eval q{use CGI::FormBuilder};
@@ -352,20 +353,17 @@ sub cgi_editpage ($$) { #{{{
                $file=$page.".".$type;
        }
 
-       my $newfile=0;
-       if (! -e "$config{srcdir}/$file") {
-               $newfile=1;
-       }
 
        $form->field(name => "do", type => 'hidden');
        $form->field(name => "from", type => 'hidden');
        $form->field(name => "rcsinfo", type => 'hidden');
        $form->field(name => "subpage", type => 'hidden');
-       $form->field(name => "page", value => $page, force => 1);
+       $form->field(name => "page", value => pagetitle($page, 1), force => 1);
        $form->field(name => "type", value => $type, force => 1);
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "editcontent", type => "textarea", rows => 20,
                cols => 80);
+       $form->field(name => "newfile", type => 'hidden');
        $form->tmpl_param("can_commit", $config{rcs});
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
@@ -374,13 +372,16 @@ sub cgi_editpage ($$) { #{{{
        if (! $form->submitted) {
                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
                        force => 1);
+               $form->field(name => "newfile", 
+                       value => ! -e "$config{srcdir}/$file",
+                       force => 1);
        }
        
        if ($form->submitted eq "Cancel") {
-               if ($newfile && defined $from) {
+               if ($form->field(name => "newfile") && defined $from) {
                        redirect($q, "$config{url}/".htmlpage($from));
                }
-               elsif ($newfile) {
+               elsif ($form->field(name => "newfile")) {
                        redirect($q, $config{url});
                }
                else {
@@ -395,12 +396,11 @@ sub cgi_editpage ($$) { #{{{
                                value => $content, force => 1);
                $form->field(name => "comments",
                                value => $comments, force => 1);
-               $config{rss}=$config{atom}=0; # avoid preview writing a feed!
                $form->tmpl_param("page_preview",
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,
-                       filter($page, $content)))));
+                       filter($page, $content), 0, 1))));
        }
        else {
                $form->tmpl_param("page_preview", "");
@@ -466,8 +466,8 @@ sub cgi_editpage ($$) { #{{{
                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',
-                               options => { map { $_ => pagetitle($_, 1) } @editable_locs },
-                               value => $best_loc);
+                               options => [ map { pagetitle($_, 1) } @editable_locs ],
+                               value => pagetitle($best_loc, 1));
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
@@ -495,6 +495,16 @@ sub cgi_editpage ($$) { #{{{
        else {
                # save page
                check_canedit($page, $q, $session);
+               if (! -e "$config{srcdir}/$file" && ! $form->field(name => 'newfile')){
+                       $form->tmpl_param("page_gone", 1);
+                       $form->field(name => "newfile",
+                                    value => 1, force => 1);
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       print $form->render(submit => \@buttons);
+                       return;
+               }
                
                my $content=$form->field('editcontent');
 
@@ -510,8 +520,6 @@ sub cgi_editpage ($$) { #{{{
                        $form->tmpl_param("failed_save", 1);
                        $form->tmpl_param("error_message", $@);
                        $form->field("editcontent", value => $content, force => 1);
-                       $form->field(name => "comments", value => $form->field('comments'), force => 1);
-                       $form->field("do", "edit)");
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
@@ -528,7 +536,7 @@ sub cgi_editpage ($$) { #{{{
                                $message=$form->field('comments');
                        }
                        
-                       if ($newfile) {
+                       if ($form->field(name => "newfile")) {
                                rcs_add($file);
                        }
 
@@ -555,8 +563,7 @@ sub cgi_editpage ($$) { #{{{
                                force => 1);
                        $form->tmpl_param("page_conflict", 1);
                        $form->field("editcontent", value => $conflict, force => 1);
-                       $form->field(name => "comments", value => $form->field('comments'), force => 1);
-                       $form->field("do", "edit)");
+                       $form->field("do", "edit", force => 1);
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
@@ -674,12 +681,12 @@ sub cgi (;$$) { #{{{
                cgi_editpage($q, $session);
        }
        elsif ($do eq 'blog') {
-               my $page=titlepage(decode_utf8($q->param('title')));
-               $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
+               my $page=decode_utf8($q->param('title'));
+               $page=~s/\///g; # no slashes in blog posts
                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
                my $add="";
-               while (exists $pagecase{lc "$from/$page$add"}) {
+               while (exists $pagecase{lc($from."/".titlepage($page).$add)}) {
                        $add=1 unless length $add;
                        $add++;
                }