styleurl => styleurl(),
baseurl => "$config{url}/",
);
- print $q->header, $template->output;
+ # 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);
} #}}}
sub cgi_signin ($$) { #{{{
title => "signin",
fields => [qw(do title page subpage from name password confirm_password email)],
header => 1,
+ charset => "utf-8",
method => 'POST',
validate => {
confirm_password => {
$form->field(name => "confirm_password", type => "hidden");
$form->field(name => "email", type => "hidden");
$form->text("Registration successful. Now you can Login.");
- print $session->header();
+ print $session->header(-charset=>'utf-8');
print misctemplate($form->title, $form->render(submit => ["Login"]));
}
else {
$form->text("Your password has been emailed to you.");
$form->field(name => "name", required => 0);
- print $session->header();
+ print $session->header(-charset=>'utf-8');
print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
}
}
else {
- print $session->header();
+ print $session->header(-charset=>'utf-8');
print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
}
} #}}}
fields => [qw(do name password confirm_password email
subscriptions locked_pages)],
header => 0,
+ charset => "utf-8",
method => 'POST',
validate => {
confirm_password => {
$form->text("Preferences saved.");
}
- print $session->header();
+ print $session->header(-charset=>'utf-8');
print misctemplate($form->title, $form->render(submit => \@buttons));
} #}}}
my $form = CGI::FormBuilder->new(
fields => [qw(do rcsinfo subpage from page editcontent comments)],
header => 1,
+ charset => "utf-8",
method => 'POST',
validate => {
editcontent => '/.+/',
}
elsif ($form->submitted eq "Preview") {
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);
$form->tmpl_param("page_preview",
htmlize($config{default_pageext},
- linkify($page, $page, $form->field('editcontent'))));
+ linkify($page, $page, $content)));
}
else {
$form->tmpl_param("page_preview", "");
}
if (defined $form->field('comments') &&
length $form->field('comments')) {
- $message.=": ".$form->field('comments');
+ # Decode utf-8 since FormBuilder does not.
+ require Encode;
+ $message.=Encode::decode_utf8(": ".$form->field('comments'));
}
if ($config{rcs}) {