X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/282893be819eab14f3a2078f1741ec9c9ed363b1..1452b3adf30145e8fd1208ac73da9d12967863bc:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 2483bf4d8..d9c9fe828 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,6 +4,7 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
+use encoding 'utf8'; # force use of utf8 for io layer
 
 package IkiWiki;
 
@@ -19,8 +20,8 @@ sub page_locked ($$;$) { #{{{
 		my $locked_pages=userinfo_get($admin, "locked_pages");
 		if (globlist_match($page, userinfo_get($admin, "locked_pages"))) {
 			return 1 if $nonfatal;
-			error(htmllink("", $page, 1)." is locked by ".
-			      htmllink("", $admin, 1)." and cannot be edited.");
+			error(htmllink("", "", $page, 1)." is locked by ".
+			      htmllink("", "", $admin, 1)." and cannot be edited.");
 		}
 	}
 
@@ -32,6 +33,11 @@ sub cgi_recentchanges ($) { #{{{
 	
 	unlockwiki();
 
+	# Force reading the template as utf-8, necessary if
+	# rcs_recentchanges returns true utf-8 strings.
+	open(TMPL, "<:utf8", "$config{templatedir}/recentchanges.tmpl");
+	my $template=HTML::Template->new(filehandle => *TMPL);
+	close(TMPL);
 	my $template=HTML::Template->new(
 		filename => "$config{templatedir}/recentchanges.tmpl"
 	);
@@ -43,7 +49,7 @@ sub cgi_recentchanges ($) { #{{{
 		styleurl => styleurl(),
 		baseurl => "$config{url}/",
 	);
-	print $q->header, $template->output;
+	print $q->header(-charset=>'utf-8'), $template->output;
 } #}}}
 
 sub cgi_signin ($$) { #{{{
@@ -55,6 +61,7 @@ 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 => {
@@ -172,7 +179,7 @@ sub cgi_signin ($$) { #{{{
 				$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 {
@@ -202,12 +209,12 @@ sub cgi_signin ($$) { #{{{
 			
 			$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"]));
 	}
 } #}}}
@@ -222,6 +229,7 @@ sub cgi_prefs ($$) { #{{{
 		fields => [qw(do name password confirm_password email 
 		              subscriptions locked_pages)],
 		header => 0,
+		charset => "utf-8",
 		method => 'POST',
 		validate => {
 			confirm_password => {
@@ -246,9 +254,9 @@ sub cgi_prefs ($$) { #{{{
 	$form->field(name => "password", type => "password");
 	$form->field(name => "confirm_password", type => "password");
 	$form->field(name => "subscriptions", size => 50,
-		comment => "(".htmllink("", "GlobList", 1).")");
+		comment => "(".htmllink("", "", "GlobList", 1).")");
 	$form->field(name => "locked_pages", size => 50,
-		comment => "(".htmllink("", "GlobList", 1).")");
+		comment => "(".htmllink("", "", "GlobList", 1).")");
 	
 	if (! is_admin($user_name)) {
 		$form->field(name => "locked_pages", type => "hidden");
@@ -281,7 +289,7 @@ sub cgi_prefs ($$) { #{{{
 		$form->text("Preferences saved.");
 	}
 	
-	print $session->header();
+	print $session->header(-charset=>'utf-8');
 	print misctemplate($form->title, $form->render(submit => \@buttons));
 } #}}}
 
@@ -291,13 +299,14 @@ sub cgi_editpage ($$) { #{{{
 
 	eval q{use CGI::FormBuilder};
 	my $form = CGI::FormBuilder->new(
-		fields => [qw(do rcsinfo subpage from page content comments)],
+		fields => [qw(do rcsinfo subpage from page editcontent comments)],
 		header => 1,
+		charset => "utf-8",
 		method => 'POST',
 		validate => {
-			content => '/.+/',
+			editcontent => '/.+/',
 		},
-		required => [qw{content}],
+		required => [qw{editcontent}],
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
@@ -330,12 +339,12 @@ sub cgi_editpage ($$) { #{{{
 	$form->field(name => "subpage", type => 'hidden');
 	$form->field(name => "page", value => "$page", force => 1);
 	$form->field(name => "comments", type => "text", size => 80);
-	$form->field(name => "content", type => "textarea", rows => 20,
+	$form->field(name => "editcontent", type => "textarea", rows => 20,
 		cols => 80);
 	$form->tmpl_param("can_commit", $config{rcs});
 	$form->tmpl_param("indexlink", indexlink());
 	$form->tmpl_param("helponformattinglink",
-		htmllink("", "HelpOnFormatting", 1));
+		htmllink("", "", "HelpOnFormatting", 1));
 	$form->tmpl_param("styleurl", styleurl());
 	$form->tmpl_param("baseurl", "$config{url}/");
 	if (! $form->submitted) {
@@ -349,9 +358,17 @@ sub cgi_editpage ($$) { #{{{
 	}
 	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->field(name => "comments",
+				value => Encode::decode_utf8($form->field('comments')), force => 1);
 		$form->tmpl_param("page_preview",
 			htmlize($config{default_pageext},
-				linkify($page, $form->field('content'))));
+				linkify($page, $page, $content)));
 	}
 	else {
 		$form->tmpl_param("page_preview", "");
@@ -410,14 +427,14 @@ sub cgi_editpage ($$) { #{{{
 		}
 		elsif ($form->field("do") eq "edit") {
 			page_locked($page, $session);
-			if (! defined $form->field('content') || 
-			    ! length $form->field('content')) {
+			if (! defined $form->field('editcontent') || 
+			    ! length $form->field('editcontent')) {
 				my $content="";
 				if (exists $pagesources{lc($page)}) {
 					$content=readfile(srcfile($pagesources{lc($page)}));
 					$content=~s/\n/\r\n/g;
 				}
-				$form->field(name => "content", value => $content,
+				$form->field(name => "editcontent", value => $content,
 					force => 1);
 			}
 			$form->tmpl_param("page_select", 0);
@@ -431,13 +448,17 @@ sub cgi_editpage ($$) { #{{{
 		# save page
 		page_locked($page, $session);
 		
-		my $content=$form->field('content');
+		# Decode utf-8 since FormBuilder does not
+		require Encode;
+		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 {
@@ -445,7 +466,7 @@ sub cgi_editpage ($$) { #{{{
 		}
 		if (defined $form->field('comments') &&
 		    length $form->field('comments')) {
-			$message.=": ".$form->field('comments');
+			$message.=Encode::decode_utf8(": ".$form->field('comments'));
 		}
 		
 		if ($config{rcs}) {
@@ -463,7 +484,8 @@ sub cgi_editpage ($$) { #{{{
 				$form->field(name => "rcsinfo", value => rcs_prepedit($file),
 					force => 1);
 				$form->tmpl_param("page_conflict", 1);
-				$form->field("content", value => $conflict, force => 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');