add htmlise

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 0d763caa38ec942e540a1b36b5e579c08841c054..5e7f771719945155c01dcb1def77651dcb6dd599 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,6 +4,8 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
+use open qw{:utf8 :std};
+use Encode;
 
 package IkiWiki;
 
@@ -32,9 +34,7 @@ sub cgi_recentchanges ($) { #{{{
        
        unlockwiki();
 
-       my $template=HTML::Template->new(
-               filename => "$config{templatedir}/recentchanges.tmpl"
-       );
+       my $template=template("recentchanges.tmpl"); 
        $template->param(
                title => "RecentChanges",
                indexlink => indexlink(),
@@ -43,9 +43,7 @@ sub cgi_recentchanges ($) { #{{{
                styleurl => styleurl(),
                baseurl => "$config{url}/",
        );
-       # XXX why is this needed? If it's raw utf-8 won't print DTRT?
-       require Encode;
-       print $q->header(-charset=>'utf-8'), Encode::decode_utf8($template->output);
+       print $q->header(-charset=>'utf-8'), $template->output;
 } #}}}
 
 sub cgi_signin ($$) { #{{{
@@ -71,7 +69,7 @@ sub cgi_signin ($$) { #{{{
                action => $config{cgiurl},
                header => 0,
                template => (-e "$config{templatedir}/signin.tmpl" ?
-                             "$config{templatedir}/signin.tmpl" : ""),
+                            {template_params("signin.tmpl")} : ""),
                stylesheet => styleurl(),
        );
        
@@ -184,9 +182,7 @@ sub cgi_signin ($$) { #{{{
                }
                elsif ($form->submitted eq 'Mail Password') {
                        my $user_name=$form->field("name");
-                       my $template=HTML::Template->new(
-                               filename => "$config{templatedir}/passwordmail.tmpl"
-                       );
+                       my $template=template("passwordmail.tmpl");
                        $template->param(
                                user_name => $user_name,
                                user_password => userinfo_get($user_name, "password"),
@@ -238,7 +234,7 @@ sub cgi_prefs ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                template => (-e "$config{templatedir}/prefs.tmpl" ?
-                             "$config{templatedir}/prefs.tmpl" : ""),
+                            {template_params("prefs.tmpl")} : ""),
                stylesheet => styleurl(),
        );
        my @buttons=("Save Preferences", "Logout", "Cancel");
@@ -307,13 +303,14 @@ sub cgi_editpage ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                table => 0,
-               template => "$config{templatedir}/editpage.tmpl"
+               template => {template_params("editpage.tmpl")},
        );
        my @buttons=("Save Page", "Preview", "Cancel");
        
        # This untaint is safe because titlepage removes any problimatic
        # characters.
-       my ($page)=titlepage(possibly_foolish_untaint(lc($form->param('page'))));
+       my ($page)=Encode::decode_utf8($form->param('page'));
+       $page=titlepage(possibly_foolish_untaint(lc($page)));
        if (! defined $page || ! length $page ||
            $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
                error("bad page name");
@@ -356,9 +353,12 @@ sub cgi_editpage ($$) { #{{{
                require IkiWiki::Render;
                # Apparently FormBuilder doesn't not treat input as
                # utf-8, so decode from it.
-               require Encode;
                my $content = Encode::decode_utf8($form->field('editcontent'));
-               $form->field(name => "editcontent", value => $content, force => 1);
+               my $comments = Encode::decode_utf8($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($config{default_pageext},
                                linkify($page, $page, $content)));
@@ -441,13 +441,16 @@ sub cgi_editpage ($$) { #{{{
                # save page
                page_locked($page, $session);
                
-               my $content=$form->field('editcontent');
+               # Decode utf-8 since FormBuilder does not
+               my $content=Encode::decode_utf8($form->field('editcontent'));
+
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                writefile($file, $config{srcdir}, $content);
                
                my $message="web commit ";
-               if (length $session->param("name")) {
+               if (defined $session->param("name") && 
+                   length $session->param("name")) {
                        $message.="by ".$session->param("name");
                }
                else {
@@ -455,9 +458,7 @@ sub cgi_editpage ($$) { #{{{
                }
                if (defined $form->field('comments') &&
                    length $form->field('comments')) {
-                       # Decode utf-8 since FormBuilder does not.
-                       require Encode;
-                       $message.=Encode::decode_utf8(": ".$form->field('comments'));
+                       $message.=": ".Encode::decode_utf8($form->field('comments'));
                }
                
                if ($config{rcs}) {
@@ -476,6 +477,7 @@ sub cgi_editpage ($$) { #{{{
                                        force => 1);
                                $form->tmpl_param("page_conflict", 1);
                                $form->field("editcontent", value => $conflict, force => 1);
+                               $form->field(name => "comments", value => Encode::decode_utf8($form->field('comments')), force => 1);
                                $form->field("do", "edit)");
                                $form->tmpl_param("page_select", 0);
                                $form->field(name => "page", type => 'hidden');