web commit by http://dmarti.myopenid.com/

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index aeccd31accd006968019df1b0e23e34135f0c07a..2b772700067ca9c942d2f56138ebd21fb6e16dfb 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -286,13 +286,11 @@ sub cgi_prefs ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub cgi_editpage ($$;$) { #{{{
+sub cgi_editpage ($$) { #{{{

        my $q=shift;
        my $session=shift;
        my $q=shift;
        my $session=shift;

-       my $blogpost=shift;

 
 

-       my @fields=qw(do rcsinfo subpage from page type editcontent comments
-                     newfile);
+       my @fields=qw(do rcsinfo subpage from page type editcontent comments);

        my @buttons=("Save Page", "Preview", "Cancel");
        
        eval q{use CGI::FormBuilder};
        my @buttons=("Save Page", "Preview", "Cancel");
        
        eval q{use CGI::FormBuilder};


@@ -323,9 +321,6 @@ sub cgi_editpage ($$;$) { #{{{
        # characters.
        my ($page)=$form->field('page');
        $page=titlepage(possibly_foolish_untaint($page));
        # characters.
        my ($page)=$form->field('page');
        $page=titlepage(possibly_foolish_untaint($page));

-       if ($blogpost) {
-               $page=~s/(\/)/"__".ord($1)."__"/eg;
-       }

        if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) {
                error("bad page name");
        }
        if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) {
                error("bad page name");
        }


@@ -337,12 +332,16 @@ sub cgi_editpage ($$;$) { #{{{
        
        my $file;
        my $type;
        
        my $file;
        my $type;

-       if (exists $pagesources{$page}) {
+       if (exists $pagesources{$page} && $form->field("do") ne "create") {

                $file=$pagesources{$page};
                $type=pagetype($file);
                if (! defined $type) {
                        error(sprintf(gettext("%s is not an editable page"), $page));
                }
                $file=$pagesources{$page};
                $type=pagetype($file);
                if (! defined $type) {
                        error(sprintf(gettext("%s is not an editable page"), $page));
                }

+               if (! $form->submitted) {
+                       $form->field(name => "rcsinfo",
+                               value => rcs_prepedit($file), force => 1);
+               }

        }
        else {
                $type=$form->param('type');
        }
        else {
                $type=$form->param('type');


@@ -355,37 +354,31 @@ sub cgi_editpage ($$;$) { #{{{
                }
                $type=$config{default_pageext} unless defined $type;
                $file=$page.".".$type;
                }
                $type=$config{default_pageext} unless defined $type;
                $file=$page.".".$type;

+               if (! $form->submitted) {
+                       $form->field(name => "rcsinfo", value => "", force => 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 => "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 => "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",
                htmllink("", "", "HelpOnFormatting", noimageinline => 1));
        $form->tmpl_param("baseurl", baseurl());
        $form->tmpl_param("can_commit", $config{rcs});
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
                htmllink("", "", "HelpOnFormatting", noimageinline => 1));
        $form->tmpl_param("baseurl", baseurl());

-       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 ($form->submitted eq "Cancel") {

-               if ($form->field(name => "newfile") && defined $from) {
+               if ($form->field("do") eq "create" && defined $from) {

                        redirect($q, "$config{url}/".htmlpage($from));
                }
                        redirect($q, "$config{url}/".htmlpage($from));
                }

-               elsif ($form->field(name => "newfile")) {
+               elsif ($form->field("do") eq "create") {

                        redirect($q, $config{url});
                }
                else {
                        redirect($q, $config{url});
                }
                else {


@@ -394,17 +387,11 @@ sub cgi_editpage ($$;$) { #{{{
                return;
        }
        elsif ($form->submitted eq "Preview") {
                return;
        }
        elsif ($form->submitted eq "Preview") {

-               my $content=$form->field('editcontent');
-               my $comments=$form->field('comments');
-               $form->field(name => "editcontent",
-                               value => $content, force => 1);
-               $form->field(name => "comments",
-                               value => $comments, force => 1);

                $form->tmpl_param("page_preview",
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,
                $form->tmpl_param("page_preview",
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,

-                       filter($page, $content), 0, 1))));
+                       filter($page, $form->field('editcontent')), 0, 1))));

        }
        else {
                $form->tmpl_param("page_preview", "");
        }
        else {
                $form->tmpl_param("page_preview", "");


@@ -499,13 +486,29 @@ sub cgi_editpage ($$;$) { #{{{
        else {
                # save page
                check_canedit($page, $q, $session);
        else {
                # save page
                check_canedit($page, $q, $session);

-               if (! -e "$config{srcdir}/$file" && ! $form->field(name => 'newfile')){
+               if (! -e "$config{srcdir}/$file" &&
+                   $form->field("do") ne "create") {

                        $form->tmpl_param("page_gone", 1);
                        $form->tmpl_param("page_gone", 1);

-                       $form->field(name => "newfile",
-                                    value => 1, force => 1);
+                       $form->field(name => "do", value => "create", force => 1);

                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');

+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       print $form->render(submit => \@buttons);
+                       return;
+               }
+               elsif (-e "$config{srcdir}/$file" &&
+                      $form->field("do") eq "create") {
+                       $form->tmpl_param("creation_conflict", 1);
+                       $form->field(name => "do", value => "edit", force => 1);
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       $form->field("editcontent", 
+                               value => readfile("$config{srcdir}/$file").
+                                        "\n\n\n".$form->field("editcontent"),
+                               force => 1);

                        print $form->render(submit => \@buttons);
                        return;
                }
                        print $form->render(submit => \@buttons);
                        return;
                }


@@ -540,7 +543,7 @@ sub cgi_editpage ($$;$) { #{{{
                                $message=$form->field('comments');
                        }
                        
                                $message=$form->field('comments');
                        }
                        

-                       if ($form->field(name => "newfile")) {
+                       if ($form->field("do") eq "create") {

                                rcs_add($file);
                        }
 
                                rcs_add($file);
                        }
 


@@ -686,17 +689,18 @@ sub cgi (;$$) { #{{{
        }
        elsif ($do eq 'blog') {
                my $page=decode_utf8($q->param('title'));
        }
        elsif ($do eq 'blog') {
                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="";
                # 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++;
                }
                $q->param('page', $page.$add);
                        $add=1 unless length $add;
                        $add++;
                }
                $q->param('page', $page.$add);

-               # now run same as create, except escape slashes too
+               # now run same as create

                $q->param('do', 'create');
                $q->param('do', 'create');

-               cgi_editpage($q, $session, 1);
+               cgi_editpage($q, $session);

        }
        elsif ($do eq 'postsignin') {
                error(gettext("login failed, perhaps you need to turn on cookies?"));
        }
        elsif ($do eq 'postsignin') {
                error(gettext("login failed, perhaps you need to turn on cookies?"));