X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f84b47d080f4d1ac47d12bd45a7004a6aba5875f..f7d95297bb74878e54207c6f1c6d3ec330d503e7:/IkiWiki/CGI.pm?ds=sidebyside

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 74ed2f217..eb89752ec 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -2,10 +2,37 @@
 
 use warnings;
 use strict;
+use IkiWiki;
 use IkiWiki::UserInfo;
+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;
@@ -16,33 +43,63 @@ 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.");
+			error(htmllink("", "", $page, 1)." is locked by ".
+			      htmllink("", "", $admin, 1)." and cannot be edited.");
 		}
 	}
 
 	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();
 
-	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};
+	memoize("htmllink");
+
+	eval q{use Time::Duration};
+	eval q{use CGI 'escapeHTML'};
+
+	my $changelog=[rcs_recentchanges(100)];
+	foreach my $change (@$changelog) {
+		$change->{when} = concise(ago($change->{when}));
+		$change->{user} = htmllink("", "", escapeHTML($change->{user}), 1);
+		$change->{pages} = [
+			map {
+				$_->{link} = htmllink("", "", $_->{page}, 1);
+				$_;
+			} @{$change->{pages}}
+		];
+	}
+
+	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, $template->output;
+	print $q->header(-charset => 'utf-8'), $template->output;
 } #}}}
 
 sub cgi_signin ($$) { #{{{
@@ -54,6 +111,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 => {
@@ -67,9 +125,11 @@ sub cgi_signin ($$) { #{{{
 		action => $config{cgiurl},
 		header => 0,
 		template => (-e "$config{templatedir}/signin.tmpl" ?
-		              "$config{templatedir}/signin.tmpl" : ""),
-		stylesheet => styleurl(),
+			     {template_params("signin.tmpl")} : ""),
+		stylesheet => baseurl()."style.css",
 	);
+		
+	decode_form_utf8($form);
 	
 	$form->field(name => "name", required => 0);
 	$form->field(name => "do", type => "hidden");
@@ -80,7 +140,7 @@ sub cgi_signin ($$) { #{{{
 	$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") {
+	if ($q->param("do") ne "signin" && !$form->submitted) {
 		$form->text("You need to log in first.");
 	}
 	
@@ -149,7 +209,7 @@ sub cgi_signin ($$) { #{{{
 			$session->param("name", $form->field("name"));
 			if (defined $form->field("do") && 
 			    $form->field("do") ne 'signin') {
-				print $q->redirect(cgiurl(
+				redirect($q, cgiurl(
 					do => $form->field("do"),
 					page => $form->field("page"),
 					title => $form->field("title"),
@@ -158,7 +218,7 @@ sub cgi_signin ($$) { #{{{
 				));
 			}
 			else {
-				print $q->redirect($config{url});
+				redirect($q, $config{url});
 			}
 		}
 		elsif ($form->submitted eq 'Register') {
@@ -171,7 +231,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();
+				printheader($session);
 				print misctemplate($form->title, $form->render(submit => ["Login"]));
 			}
 			else {
@@ -180,9 +240,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"),
@@ -201,12 +259,12 @@ sub cgi_signin ($$) { #{{{
 			
 			$form->text("Your password has been emailed to you.");
 			$form->field(name => "name", required => 0);
-			print $session->header();
+			printheader($session);
 			print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
 		}
 	}
 	else {
-		print $session->header();
+		printheader($session);
 		print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
 	}
 } #}}}
@@ -221,6 +279,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 => {
@@ -233,8 +292,8 @@ sub cgi_prefs ($$) { #{{{
 		params => $q,
 		action => $config{cgiurl},
 		template => (-e "$config{templatedir}/prefs.tmpl" ?
-		              "$config{templatedir}/prefs.tmpl" : ""),
-		stylesheet => styleurl(),
+			     {template_params("prefs.tmpl")} : ""),
+		stylesheet => baseurl()."style.css",
 	);
 	my @buttons=("Save Preferences", "Logout", "Cancel");
 	
@@ -245,9 +304,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("", "", "PageSpec", 1).")");
 	$form->field(name => "locked_pages", size => 50,
-		comment => "(".htmllink("", "GlobList", 1).")");
+		comment => "(".htmllink("", "", "PageSpec", 1).")");
 	
 	if (! is_admin($user_name)) {
 		$form->field(name => "locked_pages", type => "hidden");
@@ -262,13 +321,15 @@ sub cgi_prefs ($$) { #{{{
 			value => userinfo_get($user_name, "locked_pages"));
 	}
 	
+	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) {
@@ -280,7 +341,7 @@ sub cgi_prefs ($$) { #{{{
 		$form->text("Preferences saved.");
 	}
 	
-	print $session->header();
+	printheader($session);
 	print misctemplate($form->title, $form->render(submit => \@buttons));
 } #}}}
 
@@ -290,34 +351,57 @@ 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 type 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},
 		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
+	decode_form_utf8($form);
+	
+	# This untaint is safe because titlepage removes any problematic
 	# characters.
-	my ($page)=titlepage(possibly_foolish_untaint(lc($form->param('page'))));
+	my ($page)=$form->field('page');
+	$page=titlepage(possibly_foolish_untaint($page));
 	if (! defined $page || ! length $page ||
 	    $page=~/$config{wiki_file_prune_regexp}/ || $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;
@@ -327,30 +411,39 @@ 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 => "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));
-	$form->tmpl_param("styleurl", styleurl());
-	$form->tmpl_param("baseurl", "$config{url}/");
+		htmllink("", "", "HelpOnFormatting", 1));
+	$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));
+		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",
+				value => $content, force => 1);
+		$form->field(name => "comments",
+				value => $comments, force => 1);
+		$config{rss}=0; # avoid preview writing an rss feed!
 		$form->tmpl_param("page_preview",
-			htmlize($config{default_pageext},
-				linkify($form->field('content'), $page)));
+			htmlize($page, $type,
+			linkify($page, "",
+			preprocess($page, $page,
+			filter($page, $content)))));
 	}
 	else {
 		$form->tmpl_param("page_preview", "");
@@ -362,9 +455,8 @@ 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 ne $form->field('from') ||
 			    $from=~/$config{wiki_file_prune_regexp}/ ||
 			    $from=~/^\// ||
 			    $form->submitted eq "Preview") {
@@ -374,7 +466,7 @@ sub cgi_editpage ($$) { #{{{
 				my $dir=$from."/";
 				$dir=~s![^/]+/+$!!;
 				
-				if ((defined $form->param('subpage') && length $form->param('subpage')) ||
+				if ((defined $form->field('subpage') && length $form->field('subpage')) ||
 				    $page eq 'discussion') {
 					$best_loc="$from/$page";
 				}
@@ -391,36 +483,44 @@ sub cgi_editpage ($$) { #{{{
 			}
 
 			@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->field(name => "type", type => 'select',
+				options => \@page_types);
 			$form->title("creating ".pagetitle($page));
 		}
 		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)}));
+				if (exists $pagesources{$page}) {
+					$content=readfile(srcfile($pagesources{$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);
 			$form->field(name => "page", type => 'hidden');
+			$form->field(name => "type", type => 'hidden');
 			$form->title("editing ".pagetitle($page));
 		}
 		
@@ -430,13 +530,15 @@ sub cgi_editpage ($$) { #{{{
 		# save page
 		page_locked($page, $session);
 		
-		my $content=$form->field('content');
+		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 (length $session->param("name")) {
+		if (defined $session->param("name") && 
+		    length $session->param("name")) {
 			$message.="by ".$session->param("name");
 		}
 		else {
@@ -462,10 +564,12 @@ 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 => $form->field('comments'), force => 1);
 				$form->field("do", "edit)");
 				$form->tmpl_param("page_select", 0);
 				$form->field(name => "page", type => 'hidden');
+				$form->field(name => "type", type => 'hidden');
 				$form->title("editing $page");
 				print $form->render(submit => \@buttons);
 				return;
@@ -479,26 +583,23 @@ 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_hyperestraier () { #{{{
-	# only works for GET requests
-	chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
-	exec("./".basename($config{cgiurl})) || error("estseek.cgi failed");
-} #}}}
-
 sub cgi () { #{{{
 	eval q{use CGI};
 	eval q{use CGI::Session};
 	
 	my $q=CGI->new;
 	
+	run_hooks(cgi => sub { shift->($q) });
+	
 	my $do=$q->param('do');
 	if (! defined $do || ! length $do) {
-		if (defined $q->param('phrase')) {
-			cgi_hyperestraier();
+		my $error = $q->cgi_error;
+		if ($error) {
+			error("Request not processed: $error");
 		}
 		else {
 			error("\"do\" parameter missing");
@@ -522,7 +623,7 @@ sub cgi () { #{{{
 	umask($oldmask);
 	
 	# 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') {
 		cgi_signin($q, $session);
@@ -542,11 +643,11 @@ 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')));
 		# 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++;
 		}