X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/0bb605baf8702d1a5d1ee16f52b07840d88616e7..8c8ce06a1b267a5c5d0b1a4f2b229b6d15e63b71:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index f589ca41d..b1f770b05 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,10 +4,35 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
-use encoding 'utf8'; # force use of utf8 for io layer
+use open qw{:utf8 :std};
+use Encode;
 
 package IkiWiki;
 
+sub printheader ($) { #{{{
+	my $session=shift;
+	
+	if ($config{sslcookie}) {
+		print $session->header(-charset => 'utf-8',
+			-cookie => $session->cookie(-secure => 1));
+	} else {
+		print $session->header(-charset => 'utf-8');
+	}
+
+} #}}}
+
+sub redirect ($$) { #{{{
+	my $q=shift;
+	my $url=shift;
+	if (! $config{w3mmode}) {
+		print $q->redirect($url);
+	}
+	else {
+		print "Content-type: text/plain\n";
+		print "W3m-control: GOTO $url\n\n";
+	}
+} #}}}
+
 sub page_locked ($$;$) { #{{{
 	my $page=shift;
 	my $session=shift;
@@ -18,38 +43,74 @@ sub page_locked ($$;$) { #{{{
 
 	foreach my $admin (@{$config{adminuser}}) {
 		my $locked_pages=userinfo_get($admin, "locked_pages");
-		if (globlist_match($page, userinfo_get($admin, "locked_pages"))) {
+		if (pagespec_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.");
+
+			#translators: The first parameter is a page name,
+			#translators: second is the user who locked it.
+			error(sprintf(gettext("%s is locked by %s and cannot be edited"),
+				htmllink("", "", $page, 1),
+				userlink($admin)));
 		}
 	}
 
 	return 0;
 } #}}}
 
+sub decode_form_utf8 ($) { #{{{
+	my $form = shift;
+	foreach my $f ($form->field) {
+		next if Encode::is_utf8(scalar $form->field($f));
+		$form->field(name  => $f,
+			     value => decode_utf8($form->field($f)),
+			     force => 1,
+			    );
+	}
+} #}}}
+
 sub cgi_recentchanges ($) { #{{{
 	my $q=shift;
 	
-	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"
-	);
+	# Optimisation: building recentchanges means calculating lots of
+	# links. Memoizing htmllink speeds it up a lot (can't be memoized
+	# during page builds as the return values may change, but they
+	# won't here.)
+	eval q{use Memoize};
+	error($@) if $@;
+	memoize("htmllink");
+
+	eval q{use Time::Duration};
+	error($@) if $@;
+
+	my $changelog=[rcs_recentchanges(100)];
+	foreach my $change (@$changelog) {
+		$change->{when} = concise(ago($change->{when}));
+
+		$change->{user} = userlink($change->{user});
+
+		my $is_excess = exists $change->{pages}[10]; # limit pages to first 10
+		delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
+		$change->{pages} = [
+			map {
+				$_->{link} = htmllink("", "", $_->{page}, 1);
+				$_;
+			} @{$change->{pages}}
+		];
+		push @{$change->{pages}}, { link => '...' } if $is_excess;
+	}
+
+	my $template=template("recentchanges.tmpl"); 
 	$template->param(
 		title => "RecentChanges",
 		indexlink => indexlink(),
 		wikiname => $config{wikiname},
-		changelog => [rcs_recentchanges(100)],
-		styleurl => styleurl(),
-		baseurl => "$config{url}/",
+		changelog => $changelog,
+		baseurl => baseurl(),
 	);
-	print $q->header(-charset=>'utf-8'), $template->output;
+	run_hooks(pagetemplate => sub {
+		shift->(page => "", destpage => "", template => $template);
+	});
+	print $q->header(-charset => 'utf-8'), $template->output;
 } #}}}
 
 sub cgi_signin ($$) { #{{{
@@ -57,165 +118,64 @@ sub cgi_signin ($$) { #{{{
 	my $session=shift;
 
 	eval q{use CGI::FormBuilder};
+	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
 		title => "signin",
-		fields => [qw(do title page subpage from name password confirm_password email)],
 		header => 1,
 		charset => "utf-8",
 		method => 'POST',
-		validate => {
-			confirm_password => {
-				perl => q{eq $form->field("password")},
-			},
-			email => 'EMAIL',
-		},
 		required => 'NONE',
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
 		header => 0,
-		template => (-e "$config{templatedir}/signin.tmpl" ?
-		              "$config{templatedir}/signin.tmpl" : ""),
-		stylesheet => styleurl(),
+		template => scalar template_params("signin.tmpl"),
+		stylesheet => baseurl()."style.css",
 	);
+	my $buttons=["Login"];
 	
-	$form->field(name => "name", required => 0);
 	$form->field(name => "do", type => "hidden");
-	$form->field(name => "page", type => "hidden");
-	$form->field(name => "title", type => "hidden");
-	$form->field(name => "from", type => "hidden");
-	$form->field(name => "subpage", type => "hidden");
-	$form->field(name => "password", type => "password", required => 0);
-	$form->field(name => "confirm_password", type => "password", required => 0);
-	$form->field(name => "email", required => 0);
-	if ($q->param("do") ne "signin") {
-		$form->text("You need to log in first.");
+	
+	if ($q->param("do") ne "signin" && !$form->submitted) {
+		$form->text(gettext("You need to log in first."));
 	}
 	
-	if ($form->submitted) {
-		# Set required fields based on how form was submitted.
-		my %required=(
-			"Login" => [qw(name password)],
-			"Register" => [qw(name password confirm_password email)],
-			"Mail Password" => [qw(name)],
-		);
-		foreach my $opt (@{$required{$form->submitted}}) {
-			$form->field(name => $opt, required => 1);
-		}
+	run_hooks(formbuilder_setup => sub {
+		shift->(form => $form, cgi => $q, session => $session);
+	});
 	
-		# Validate password differently depending on how
-		# form was submitted.
-		if ($form->submitted eq 'Login') {
-			$form->field(
-				name => "password",
-				validate => sub {
-					length $form->field("name") &&
-					shift eq userinfo_get($form->field("name"), 'password');
-				},
-			);
-			$form->field(name => "name", validate => '/^\w+$/');
-		}
-		else {
-			$form->field(name => "password", validate => 'VALUE');
-		}
-		# And make sure the entered name exists when logging
-		# in or sending email, and does not when registering.
-		if ($form->submitted eq 'Register') {
-			$form->field(
-				name => "name",
-				validate => sub {
-					my $name=shift;
-					length $name &&
-					$name=~/$config{wiki_file_regexp}/ &&
-					! userinfo_get($name, "regdate");
-				},
-			);
-		}
-		else {
-			$form->field(
-				name => "name",
-				validate => sub {
-					my $name=shift;
-					length $name &&
-					userinfo_get($name, "regdate");
-				},
-			);
-		}
+	decode_form_utf8($form);
+
+	if (exists $hooks{formbuilder}) {
+		run_hooks(formbuilder => sub {
+			shift->(form => $form, cgi => $q, session => $session,
+				buttons => $buttons);
+		});
 	}
 	else {
-		# First time settings.
-		$form->field(name => "name", comment => "use FirstnameLastName");
-		$form->field(name => "confirm_password", comment => "(only needed");
-		$form->field(name => "email",            comment => "for registration)");
-		if ($session->param("name")) {
-			$form->field(name => "name", value => $session->param("name"));
+		if ($form->submitted) {
+			$form->validate;
 		}
+		printheader($session);
+		print misctemplate($form->title, $form->render(submit => $buttons));
 	}
+} #}}}
 
-	if ($form->submitted && $form->validate) {
-		if ($form->submitted eq 'Login') {
-			$session->param("name", $form->field("name"));
-			if (defined $form->field("do") && 
-			    $form->field("do") ne 'signin') {
-				print $q->redirect(cgiurl(
-					do => $form->field("do"),
-					page => $form->field("page"),
-					title => $form->field("title"),
-					subpage => $form->field("subpage"),
-					from => $form->field("from"),
-				));
-			}
-			else {
-				print $q->redirect($config{url});
-			}
-		}
-		elsif ($form->submitted eq 'Register') {
-			my $user_name=$form->field('name');
-			if (userinfo_setall($user_name, {
-				           'email' => $form->field('email'),
-				           'password' => $form->field('password'),
-				           'regdate' => time
-				         })) {
-				$form->field(name => "confirm_password", type => "hidden");
-				$form->field(name => "email", type => "hidden");
-				$form->text("Registration successful. Now you can Login.");
-				print $session->header(-charset=>'utf-8');
-				print misctemplate($form->title, $form->render(submit => ["Login"]));
-			}
-			else {
-				error("Error saving registration.");
-			}
-		}
-		elsif ($form->submitted eq 'Mail Password') {
-			my $user_name=$form->field("name");
-			my $template=HTML::Template->new(
-				filename => "$config{templatedir}/passwordmail.tmpl"
-			);
-			$template->param(
-				user_name => $user_name,
-				user_password => userinfo_get($user_name, "password"),
-				wikiurl => $config{url},
-				wikiname => $config{wikiname},
-				REMOTE_ADDR => $ENV{REMOTE_ADDR},
-			);
-			
-			eval q{use Mail::Sendmail};
-			sendmail(
-				To => userinfo_get($user_name, "email"),
-				From => "$config{wikiname} admin <$config{adminemail}>",
-				Subject => "$config{wikiname} information",
-				Message => $template->output,
-			) or error("Failed to send mail");
-			
-			$form->text("Your password has been emailed to you.");
-			$form->field(name => "name", required => 0);
-			print $session->header(-charset=>'utf-8');
-			print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
-		}
+sub cgi_postsignin ($$) { #{{{
+	my $q=shift;
+	my $session=shift;
+
+	# Continue with whatever was being done before the signin process.
+	if (defined $q->param("do") && $q->param("do") ne "signin" &&
+	    defined $session->param("postsignin")) {
+		my $postsignin=CGI->new($session->param("postsignin"));
+		$session->clear("postsignin");
+		cgi($postsignin, $session);
+		cgi_savesession($session);
+		exit;
 	}
 	else {
-		print $session->header(-charset=>'utf-8');
-		print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
+		redirect($q, $config{url});
 	}
 } #}}}
 
@@ -224,44 +184,42 @@ sub cgi_prefs ($$) { #{{{
 	my $session=shift;
 
 	eval q{use CGI::FormBuilder};
+	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
 		title => "preferences",
-		fields => [qw(do name password confirm_password email 
-		              subscriptions locked_pages)],
 		header => 0,
 		charset => "utf-8",
 		method => 'POST',
 		validate => {
-			confirm_password => {
-				perl => q{eq $form->field("password")},
-			},
 			email => 'EMAIL',
 		},
 		required => 'NONE',
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
-		template => (-e "$config{templatedir}/prefs.tmpl" ?
-		              "$config{templatedir}/prefs.tmpl" : ""),
-		stylesheet => styleurl(),
+		template => scalar template_params("prefs.tmpl"),
+		stylesheet => baseurl()."style.css",
 	);
-	my @buttons=("Save Preferences", "Logout", "Cancel");
+	my $buttons=["Save Preferences", "Logout", "Cancel"];
+
+	run_hooks(formbuilder_setup => sub {
+		shift->(form => $form, cgi => $q, session => $session);
+	});
 	
-	my $user_name=$session->param("name");
 	$form->field(name => "do", type => "hidden");
-	$form->field(name => "name", disabled => 1,
-		value => $user_name, force => 1);
-	$form->field(name => "password", type => "password");
-	$form->field(name => "confirm_password", type => "password");
+	$form->field(name => "email", size => 50);
 	$form->field(name => "subscriptions", size => 50,
-		comment => "(".htmllink("", "", "GlobList", 1).")");
+		comment => "(".htmllink("", "", "PageSpec", 1).")");
 	$form->field(name => "locked_pages", size => 50,
-		comment => "(".htmllink("", "", "GlobList", 1).")");
+		comment => "(".htmllink("", "", "PageSpec", 1).")");
+	$form->field(name => "banned_users", size => 50);
 	
+	my $user_name=$session->param("name");
 	if (! is_admin($user_name)) {
 		$form->field(name => "locked_pages", type => "hidden");
+		$form->field(name => "banned_users", type => "hidden");
 	}
-	
+
 	if (! $form->submitted) {
 		$form->field(name => "email", force => 1,
 			value => userinfo_get($user_name, "email"));
@@ -269,37 +227,59 @@ sub cgi_prefs ($$) { #{{{
 			value => userinfo_get($user_name, "subscriptions"));
 		$form->field(name => "locked_pages", force => 1,
 			value => userinfo_get($user_name, "locked_pages"));
+		if (is_admin($user_name)) {
+			$form->field(name => "banned_users", force => 1,
+				value => join(" ", get_banned_users()));
+		}
 	}
 	
+	decode_form_utf8($form);
+	
 	if ($form->submitted eq 'Logout') {
 		$session->delete();
-		print $q->redirect($config{url});
+		redirect($q, $config{url});
 		return;
 	}
 	elsif ($form->submitted eq 'Cancel') {
-		print $q->redirect($config{url});
+		redirect($q, $config{url});
 		return;
 	}
-	elsif ($form->submitted eq "Save Preferences" && $form->validate) {
-		foreach my $field (qw(password email subscriptions locked_pages)) {
-			if (length $form->field($field)) {
+	elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
+		foreach my $field (qw(email subscriptions locked_pages)) {
+			if (defined $form->field($field) && length $form->field($field)) {
 				userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
 			}
 		}
-		$form->text("Preferences saved.");
+		if (is_admin($user_name)) {
+			set_banned_users(grep { ! is_admin($_) }
+					split(' ', $form->field("banned_users")));
+		}
+		$form->text(gettext("Preferences saved."));
 	}
 	
-	print $session->header(-charset=>'utf-8');
-	print misctemplate($form->title, $form->render(submit => \@buttons));
+	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));
+	}
 } #}}}
 
 sub cgi_editpage ($$) { #{{{
 	my $q=shift;
 	my $session=shift;
 
+	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+	my @buttons=("Save Page", "Preview", "Cancel");
+	
 	eval q{use CGI::FormBuilder};
+	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
-		fields => [qw(do rcsinfo subpage from page editcontent comments)],
+		fields => \@fields,
 		header => 1,
 		charset => "utf-8",
 		method => 'POST',
@@ -311,23 +291,47 @@ sub cgi_editpage ($$) { #{{{
 		params => $q,
 		action => $config{cgiurl},
 		table => 0,
-		template => "$config{templatedir}/editpage.tmpl"
+		template => scalar template_params("editpage.tmpl"),
 	);
-	my @buttons=("Save Page", "Preview", "Cancel");
 	
-	# This untaint is safe because titlepage removes any problimatic
+	run_hooks(formbuilder_setup => sub {
+		shift->(form => $form, cgi => $q, session => $session);
+	});
+	
+	decode_form_utf8($form);
+	
+	# This untaint is safe because titlepage removes any problematic
 	# characters.
-	my ($page)=titlepage(possibly_foolish_untaint(lc($form->param('page'))));
-	if (! defined $page || ! length $page ||
-	    $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
+	my ($page)=$form->field('page');
+	$page=titlepage(possibly_foolish_untaint($page));
+	if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) {
 		error("bad page name");
 	}
-	$page=lc($page);
 	
-	my $file=$page.$config{default_pageext};
-	if (exists $pagesources{lc($page)}) {
-		$file=$pagesources{lc($page)};
+	my $from;
+	if (defined $form->field('from')) {
+		($from)=$form->field('from')=~/$config{wiki_file_regexp}/;
+	}
+	
+	my $file;
+	my $type;
+	if (exists $pagesources{$page}) {
+		$file=$pagesources{$page};
+		$type=pagetype($file);
+	}
+	else {
+		$type=$form->param('type');
+		if (defined $type && length $type && $hooks{htmlize}{$type}) {
+			$type=possibly_foolish_untaint($type);
+		}
+		elsif (defined $from) {
+			# favor the type of linking page
+			$type=pagetype($pagesources{$from});
+		}
+		$type=$config{default_pageext} unless defined $type;
+		$file=$page.".".$type;
 	}
+
 	my $newfile=0;
 	if (! -e "$config{srcdir}/$file") {
 		$newfile=1;
@@ -337,7 +341,8 @@ sub cgi_editpage ($$) { #{{{
 	$form->field(name => "from", type => 'hidden');
 	$form->field(name => "rcsinfo", type => 'hidden');
 	$form->field(name => "subpage", type => 'hidden');
-	$form->field(name => "page", value => "$page", force => 1);
+	$form->field(name => "page", value => $page, force => 1);
+	$form->field(name => "type", value => $type, force => 1);
 	$form->field(name => "comments", type => "text", size => 80);
 	$form->field(name => "editcontent", type => "textarea", rows => 20,
 		cols => 80);
@@ -345,30 +350,37 @@ sub cgi_editpage ($$) { #{{{
 	$form->tmpl_param("indexlink", indexlink());
 	$form->tmpl_param("helponformattinglink",
 		htmllink("", "", "HelpOnFormatting", 1));
-	$form->tmpl_param("styleurl", styleurl());
-	$form->tmpl_param("baseurl", "$config{url}/");
+	$form->tmpl_param("baseurl", baseurl());
 	if (! $form->submitted) {
 		$form->field(name => "rcsinfo", value => rcs_prepedit($file),
 			force => 1);
 	}
 	
 	if ($form->submitted eq "Cancel") {
-		print $q->redirect("$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;
-		# Apparently FormBuilder doesn't not treat input as
-		# utf-8, so decode from it.
-		require Encode;
-		my $content = Encode::decode_utf8($form->field('editcontent'));
+		my $content=$form->field('editcontent');
+		my $comments=$form->field('comments');
 		$form->field(name => "editcontent",
 				value => $content, force => 1);
 		$form->field(name => "comments",
-				value => Encode::decode_utf8($form->field('comments')), force => 1);
+				value => $comments, force => 1);
+		$config{rss}=$config{atom}=0; # avoid preview writing a feed!
 		$form->tmpl_param("page_preview",
-			htmlize($config{default_pageext},
-				linkify($page, $page, $content)));
+			htmlize($page, $type,
+			linkify($page, "",
+			preprocess($page, $page,
+			filter($page, $content)))));
 	}
 	else {
 		$form->tmpl_param("page_preview", "");
@@ -380,10 +392,9 @@ sub cgi_editpage ($$) { #{{{
 		if ($form->field("do") eq "create") {
 			my @page_locs;
 			my $best_loc;
-			my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;
 			if (! defined $from || ! length $from ||
-			    $from ne $form->param('from') ||
-			    $from=~/$config{wiki_file_prune_regexp}/ ||
+			    $from ne $form->field('from') ||
+			    file_pruned($from, $config{srcdir}) ||
 			    $from=~/^\// ||
 			    $form->submitted eq "Preview") {
 				@page_locs=$best_loc=$page;
@@ -392,8 +403,8 @@ sub cgi_editpage ($$) { #{{{
 				my $dir=$from."/";
 				$dir=~s![^/]+/+$!!;
 				
-				if ((defined $form->param('subpage') && length $form->param('subpage')) ||
-				    $page eq 'discussion') {
+				if ((defined $form->field('subpage') && length $form->field('subpage')) ||
+				    $page eq gettext('discussion')) {
 					$best_loc="$from/$page";
 				}
 				else {
@@ -407,31 +418,40 @@ sub cgi_editpage ($$) { #{{{
 					push @page_locs, $dir.$page;
 				}
 			}
+			push @page_locs, "$config{userdir}/$page"
+				if length $config{userdir};
 
 			@page_locs = grep {
-				! exists $pagesources{lc($_)} &&
+				! exists $pagecase{lc $_} &&
 				! page_locked($_, $session, 1)
 			} @page_locs;
 			
 			if (! @page_locs) {
 				# hmm, someone else made the page in the
 				# meantime?
-				print $q->redirect("$config{url}/".htmlpage($page));
+				redirect($q, "$config{url}/".htmlpage($page));
 				return;
 			}
-				
+			
+			my @page_types;
+			if (exists $hooks{htmlize}) {
+				@page_types=keys %{$hooks{htmlize}};
+			}
+			
 			$form->tmpl_param("page_select", 1);
 			$form->field(name => "page", type => 'select',
 				options => \@page_locs, value => $best_loc);
-			$form->title("creating ".pagetitle($page));
+			$form->field(name => "type", type => 'select',
+				options => \@page_types);
+			$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
 		}
 		elsif ($form->field("do") eq "edit") {
 			page_locked($page, $session);
 			if (! defined $form->field('editcontent') || 
 			    ! length $form->field('editcontent')) {
 				my $content="";
-				if (exists $pagesources{lc($page)}) {
-					$content=readfile(srcfile($pagesources{lc($page)}));
+				if (exists $pagesources{$page}) {
+					$content=readfile(srcfile($pagesources{$page}));
 					$content=~s/\n/\r\n/g;
 				}
 				$form->field(name => "editcontent", value => $content,
@@ -439,7 +459,8 @@ sub cgi_editpage ($$) { #{{{
 			}
 			$form->tmpl_param("page_select", 0);
 			$form->field(name => "page", type => 'hidden');
-			$form->title("editing ".pagetitle($page));
+			$form->field(name => "type", type => 'hidden');
+			$form->title(sprintf(gettext("editing %s"), pagetitle($page)));
 		}
 		
 		print $form->render(submit => \@buttons);
@@ -448,28 +469,19 @@ sub cgi_editpage ($$) { #{{{
 		# save page
 		page_locked($page, $session);
 		
-		# Decode utf-8 since FormBuilder does not
-		require Encode;
-		my $content=Encode::decode_utf8($form->field('editcontent'));
+		my $content=$form->field('editcontent');
 
 		$content=~s/\r\n/\n/g;
 		$content=~s/\r/\n/g;
 		writefile($file, $config{srcdir}, $content);
 		
-		my $message="web commit ";
-		if (defined $session->param("name") && 
-		    length $session->param("name")) {
-			$message.="by ".$session->param("name");
-		}
-		else {
-			$message.="from $ENV{REMOTE_ADDR}";
-		}
-		if (defined $form->field('comments') &&
-		    length $form->field('comments')) {
-			$message.=Encode::decode_utf8(": ".$form->field('comments'));
-		}
-		
 		if ($config{rcs}) {
+			my $message="";
+			if (defined $form->field('comments') &&
+			    length $form->field('comments')) {
+				$message=$form->field('comments');
+			}
+			
 			if ($newfile) {
 				rcs_add($file);
 			}
@@ -478,17 +490,20 @@ sub cgi_editpage ($$) { #{{{
 			# presumably the commit will trigger an update
 			# of the wiki
 			my $conflict=rcs_commit($file, $message,
-				$form->field("rcsinfo"));
+				$form->field("rcsinfo"),
+				$session->param("name"), $ENV{REMOTE_ADDR});
 		
 			if (defined $conflict) {
 				$form->field(name => "rcsinfo", value => rcs_prepedit($file),
 					force => 1);
 				$form->tmpl_param("page_conflict", 1);
 				$form->field("editcontent", value => $conflict, force => 1);
+				$form->field(name => "comments", value => $form->field('comments'), force => 1);
 				$form->field("do", "edit)");
 				$form->tmpl_param("page_select", 0);
 				$form->field(name => "page", type => 'hidden');
-				$form->title("editing $page");
+				$form->field(name => "type", type => 'hidden');
+				$form->title(sprintf(gettext("editing %s"), $page));
 				print $form->render(submit => \@buttons);
 				return;
 			}
@@ -501,25 +516,55 @@ sub cgi_editpage ($$) { #{{{
 		
 		# The trailing question mark tries to avoid broken
 		# caches and get the most recent version of the page.
-		print $q->redirect("$config{url}/".htmlpage($page)."?updated");
+		redirect($q, "$config{url}/".htmlpage($page)."?updated");
 	}
 } #}}}
 
-sub cgi () { #{{{
-	eval q{use CGI};
+sub cgi_getsession ($) { #{{{
+	my $q=shift;
+
 	eval q{use CGI::Session};
+	CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
 	
-	my $q=CGI->new;
+	my $oldmask=umask(077);
+	my $session = CGI::Session->new("driver:DB_File", $q,
+		{ FileName => "$config{wikistatedir}/sessions.db" });
+	umask($oldmask);
+
+	return $session;
+} #}}}
+
+sub cgi_savesession ($) { #{{{
+	my $session=shift;
+
+	# Force session flush with safe umask.
+	my $oldmask=umask(077);
+	$session->flush;
+	umask($oldmask);
+}
+
+sub cgi (;$$) { #{{{
+	my $q=shift;
+	my $session=shift;
+
+	if (! $q) {
+		eval q{use CGI};
+		error($@) if $@;
 	
-	if (exists $hooks{cgi}) {
-		foreach my $id (keys %{$hooks{cgi}}) {
-			$hooks{cgi}{$id}{call}->($q);
-		}
-	}
+		$q=CGI->new;
 	
+		run_hooks(cgi => sub { shift->($q) });
+	}
+
 	my $do=$q->param('do');
 	if (! defined $do || ! length $do) {
-		error("\"do\" parameter missing");
+		my $error = $q->cgi_error;
+		if ($error) {
+			error("Request not processed: $error");
+		}
+		else {
+			error("\"do\" parameter missing");
+		}
 	}
 	
 	# Things that do not need a session.
@@ -530,27 +575,55 @@ sub cgi () { #{{{
 	elsif ($do eq 'hyperestraier') {
 		cgi_hyperestraier();
 	}
+
+	# Need to lock the wiki before getting a session.
+	lockwiki();
 	
-	CGI::Session->name("ikiwiki_session_$config{wikiname}");
-	
-	my $oldmask=umask(077);
-	my $session = CGI::Session->new("driver:DB_File", $q,
-		{ FileName => "$config{wikistatedir}/sessions.db" });
-	umask($oldmask);
+	if (! $session) {
+		$session=cgi_getsession($q);
+	}
 	
+	# Auth hooks can sign a user in.
+	if ($do ne 'signin' && ! defined $session->param("name")) {
+		run_hooks(auth => sub {
+			shift->($q, $session)
+		});
+		if (defined $session->param("name")) {
+			# Make sure whatever user was authed is in the
+			# userinfo db.
+			if (! userinfo_get($session->param("name"), "regdate")) {
+				userinfo_setall($session->param("name"), {
+					email => "",
+					password => "",
+					regdate => time,
+				});
+			}
+		}
+	}
+
 	# Everything below this point needs the user to be signed in.
-	if ((! $config{anonok} &&
+	if (((! $config{anonok} || $do eq 'prefs') &&
 	     (! defined $session->param("name") ||
-	     ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
+	     ! userinfo_get($session->param("name"), "regdate")))
+            || $do eq 'signin') {
+	    	if ($do ne 'signin' && ! defined $session->param("postsignin")) {
+			$session->param(postsignin => $ENV{QUERY_STRING});
+		}
 		cgi_signin($q, $session);
-	
-		# Force session flush with safe umask.
-		my $oldmask=umask(077);
-		$session->flush;
-		umask($oldmask);
-		
+		cgi_savesession($session);
 		return;
 	}
+	elsif (defined $session->param("postsignin")) {
+		cgi_postsignin($q, $session);
+	}
+
+	if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
+		print $q->header(-status => "403 Forbidden");
+		$session->delete();
+		print gettext("You are banned.");
+		cgi_savesession($session);
+		exit;
+	}
 	
 	if ($do eq 'create' || $do eq 'edit') {
 		cgi_editpage($q, $session);
@@ -559,11 +632,12 @@ sub cgi () { #{{{
 		cgi_prefs($q, $session);
 	}
 	elsif ($do eq 'blog') {
-		my $page=titlepage(lc($q->param('title')));
+		my $page=titlepage(decode_utf8($q->param('title')));
+		$page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
 		# if the page already exists, munge it to be unique
 		my $from=$q->param('from');
 		my $add="";
-		while (exists $oldpagemtime{"$from/$page$add"}) {
+		while (exists $pagecase{lc "$from/$page$add"}) {
 			$add=1 unless length $add;
 			$add++;
 		}
@@ -577,4 +651,32 @@ sub cgi () { #{{{
 	}
 } #}}}
 
+sub userlink ($) { #{{{
+	my $user=shift;
+
+	eval q{use CGI 'escapeHTML'};
+	error($@) if $@;
+	if ($user =~ m!^https?://! &&
+	    eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
+		# Munge user-urls, as used by eg, OpenID.
+		my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
+		my $display=$oid->display;
+		# Convert "user.somehost.com" to "user [somehost.com]".
+		if ($display !~ /\[/) {
+			$display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
+		}
+		# Convert "http://somehost.com/user" to "user [somehost.com]".
+		if ($display !~ /\[/) {
+			$display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
+		}
+		$display=~s!^https?://!!; # make sure this is removed
+		return "<a href=\"$user\">".escapeHTML($display)."</a>";
+	}
+	else {
+		return htmllink("", "", escapeHTML(
+			length $config{userdir} ? $config{userdir}."/".$user : $user
+		), 1);
+	}
+} #}}}
+
 1