web commit by http://ptecza.myopenid.com/: * Reply

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 5aa744c9490eaae61c9549afcb0604c36f5e055b..788d0487e1012d3d6fe4dd8359200e99bf186e15 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -20,6 +20,24 @@ sub printheader ($) { #{{{
        }
 
 } #}}}
+       
+sub showform ($$$$) { #{{{
+       my $form=shift;
+       my $buttons=shift;
+       my $session=shift;
+       my $cgi=shift;
+
+       if (exists $hooks{formbuilder}) {
+               run_hooks(formbuilder => sub {
+                       shift->(form => $form, cgi => $cgi, session => $session,
+                               buttons => $buttons);
+               });
+       }
+       else {
+               printheader($session);
+               print misctemplate($form->title, $form->render(submit => $buttons));
+       }
+}
 
 sub redirect ($$) { #{{{
        my $q=shift;
@@ -156,25 +174,18 @@ sub cgi_signin ($$) { #{{{
        $form->field(name => "do", type => "hidden", value => "signin",
                force => 1);
        
+       decode_form_utf8($form);
+       
        run_hooks(formbuilder_setup => sub {
-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => $buttons);
        });
-       
-       decode_form_utf8($form);
 
-       if (exists $hooks{formbuilder}) {
-               run_hooks(formbuilder => sub {
-                       shift->(form => $form, cgi => $q, session => $session,
-                               buttons => $buttons);
-               });
-       }
-       else {
-               if ($form->submitted) {
-                       $form->validate;
-               }
-               printheader($session);
-               print misctemplate($form->title, $form->render(submit => $buttons));
+       if ($form->submitted) {
+               $form->validate;
        }
+
+       showform($form, $buttons, $session, $q);
 } #}}}
 
 sub cgi_postsignin ($$) { #{{{
@@ -227,8 +238,11 @@ sub cgi_prefs ($$) { #{{{
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
 
+       decode_form_utf8($form);
+
        run_hooks(formbuilder_setup => sub {
-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => $buttons);
        });
        
        $form->field(name => "do", type => "hidden");
@@ -255,8 +269,6 @@ sub cgi_prefs ($$) { #{{{
                }
        }
        
-       decode_form_utf8($form);
-       
        if ($form->submitted eq 'Logout') {
                $session->delete();
                redirect($q, $config{url});
@@ -282,16 +294,7 @@ sub cgi_prefs ($$) { #{{{
                $form->text(gettext("Preferences saved."));
        }
        
-       if (exists $hooks{formbuilder}) {
-               run_hooks(formbuilder => sub {
-                       shift->(form => $form, cgi => $q, session => $session,
-                               buttons => $buttons);
-               });
-       }
-       else {
-               printheader($session);
-               print misctemplate($form->title, $form->render(submit => $buttons));
-       }
+       showform($form, $buttons, $session, $q);
 } #}}}
 
 sub cgi_editpage ($$) { #{{{
@@ -304,6 +307,7 @@ sub cgi_editpage ($$) { #{{{
        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
+               title => "editpage",
                fields => \@fields,
                charset => "utf-8",
                method => 'POST',
@@ -320,17 +324,19 @@ sub cgi_editpage ($$) { #{{{
                wikiname => $config{wikiname},
        );
        
+       decode_form_utf8($form);
+       
        run_hooks(formbuilder_setup => sub {
-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => \@buttons);
        });
        
-       decode_form_utf8($form);
-       
        # This untaint is safe because titlepage removes any problematic
        # characters.
        my ($page)=$form->field('page');
        $page=titlepage(possibly_foolish_untaint($page));
-       if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) {
+       if (! defined $page || ! length $page ||
+           file_pruned($page, $config{srcdir}) || $page=~/^\//) {
                error("bad page name");
        }
        
@@ -396,19 +402,27 @@ sub cgi_editpage ($$) { #{{{
                return;
        }
        elsif ($form->submitted eq "Preview") {
+               my $content=$form->field('editcontent');
+               run_hooks(editcontent => sub {
+                       $content=shift->(
+                               content => $content,
+                               page => $page,
+                               cgi => $q,
+                               session => $session,
+                       );
+               });
                $form->tmpl_param("page_preview",
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,
-                       filter($page, $page, $form->field('editcontent')), 0, 1))));
+                       filter($page, $page, $content), 0, 1))));
        }
-       else {
+       elsif ($form->submitted eq "Save Page") {
                $form->tmpl_param("page_preview", "");
        }
        $form->tmpl_param("page_conflict", "");
        
-       if (! $form->submitted || $form->submitted eq "Preview" || 
-           ! $form->validate) {
+       if ($form->submitted ne "Save Page" || ! $form->validate) {
                if ($form->field("do") eq "create") {
                        my @page_locs;
                        my $best_loc;
@@ -491,26 +505,27 @@ sub cgi_editpage ($$) { #{{{
                        $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
                }
                
-               printheader($session);
-               print misctemplate($form->title, $form->render(submit => \@buttons));
+               showform($form, \@buttons, $session, $q);
+               saveindex();
        }
        else {
                # save page
                check_canedit($page, $q, $session);
-               if (! -e "$config{srcdir}/$file" &&
-                   $form->field("do") ne "create") {
+
+               my $exists=-e "$config{srcdir}/$file";
+
+               if ($form->field("do") ne "create" && ! $exists &&
+                   ! eval { srcfile($file) }) {
                        $form->tmpl_param("page_gone", 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->title(sprintf(gettext("editing %s"), $page));
-                       printheader($session);
-                       print misctemplate($form->title, $form->render(submit => \@buttons));
+                       showform($form, \@buttons, $session, $q);
                        return;
                }
-               elsif (-e "$config{srcdir}/$file" &&
-                      $form->field("do") eq "create") {
+               elsif ($form->field("do") eq "create" && $exists) {
                        $form->tmpl_param("creation_conflict", 1);
                        $form->field(name => "do", value => "edit", force => 1);
                        $form->tmpl_param("page_select", 0);
@@ -521,13 +536,19 @@ sub cgi_editpage ($$) { #{{{
                                value => readfile("$config{srcdir}/$file").
                                         "\n\n\n".$form->field("editcontent"),
                                force => 1);
-                       printheader($session);
-                       print misctemplate($form->title, $form->render(submit => \@buttons));
+                       showform($form, \@buttons, $session, $q);
                        return;
                }
                
                my $content=$form->field('editcontent');
-
+               run_hooks(editcontent => sub {
+                       $content=shift->(
+                               content => $content,
+                               page => $page,
+                               cgi => $q,
+                               session => $session,
+                       );
+               });
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
 
@@ -544,8 +565,7 @@ sub cgi_editpage ($$) { #{{{
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
-                       printheader($session);
-                       print misctemplate($form->title, $form->render(submit => \@buttons));
+                       showform($form, \@buttons, $session, $q);
                        return;
                }
                
@@ -557,7 +577,7 @@ sub cgi_editpage ($$) { #{{{
                                $message=$form->field('comments');
                        }
                        
-                       if ($form->field("do") eq "create") {
+                       if (! $exists) {
                                rcs_add($file);
                        }
 
@@ -576,6 +596,10 @@ sub cgi_editpage ($$) { #{{{
                # may have been committed while the post-commit hook was
                # disabled.
                require IkiWiki::Render;
+               # Reload index, since the first time it's loaded is before
+               # the wiki is locked, and things may have changed in the
+               # meantime.
+               loadindex();
                refresh();
                saveindex();
 
@@ -589,8 +613,7 @@ sub cgi_editpage ($$) { #{{{
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
-                       printheader($session);
-                       print misctemplate($form->title, $form->render(submit => \@buttons));
+                       showform($form, \@buttons, $session, $q);
                        return;
                }
                else {