* Patch from Paul Tötterman to use CP in the Makefile.

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index eb89752ec2084a03e522c6f94c3001e07af0e925..f550b673a7acceaee1f35195565487b6857cab81 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -99,6 +99,9 @@ sub cgi_recentchanges ($) { #{{{
                changelog => $changelog,
                baseurl => baseurl(),
        );
+       run_hooks(pagetemplate => sub {
+               shift->(page => "", destpage => "", template => $template);
+       });
        print $q->header(-charset => 'utf-8'), $template->output;
 } #}}}
 
@@ -349,9 +352,19 @@ sub cgi_editpage ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
-       eval q{use CGI::FormBuilder};
+       my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+       my @buttons=("Save Page", "Preview", "Cancel");
+       
+       eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML};
+       my $renderer=CGI::FormBuilder::Template::HTML->new(
+               fields => \@fields,
+               template_params("editpage.tmpl"),
+       );
+       run_hooks(pagetemplate => sub {
+               shift->(page => "", destpage => "", template => $renderer->engine);
+       });
        my $form = CGI::FormBuilder->new(
-               fields => [qw(do rcsinfo subpage from page type editcontent comments)],
+               fields => \@fields,
                header => 1,
                charset => "utf-8",
                method => 'POST',
@@ -363,9 +376,8 @@ sub cgi_editpage ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                table => 0,
-               template => {template_params("editpage.tmpl")},
+               template => $renderer,
        );
-       my @buttons=("Save Page", "Preview", "Cancel");
        
        decode_form_utf8($form);
        
@@ -427,11 +439,18 @@ sub cgi_editpage ($$) { #{{{
        }
        
        if ($form->submitted eq "Cancel") {
-               redirect($q, "$config{url}/".htmlpage($page));
+               if ($newfile && defined $from) {
+                       redirect($q, "$config{url}/".htmlpage($from));
+               }
+               elsif ($newfile) {
+                       redirect($q, $config{url});
+               }
+               else {
+                       redirect($q, "$config{url}/".htmlpage($page));
+               }
                return;
        }
        elsif ($form->submitted eq "Preview") {
-               require IkiWiki::Render;
                my $content=$form->field('editcontent');
                my $comments=$form->field('comments');
                $form->field(name => "editcontent",
@@ -615,7 +634,7 @@ sub cgi () { #{{{
                cgi_hyperestraier();
        }
        
-       CGI::Session->name("ikiwiki_session_$config{wikiname}");
+       CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
        
        my $oldmask=umask(077);
        my $session = CGI::Session->new("driver:DB_File", $q,