X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/04a9dbfe7daa9c352ae4e9af17df8134248f3806..c494e2f97461b5b524607cef88657e0bb89add25:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 1caea99a4..83ed959c0 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -45,8 +45,10 @@ sub page_locked ($$;$) { #{{{
 		my $locked_pages=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 ".
-			      userlink($admin)." and cannot be edited.");
+
+			error(sprintf(gettext("%s is locked by %s and cannot be edited"),
+				htmllink("", "", $page, 1),
+				userlink($admin)));
 		}
 	}
 
@@ -134,7 +136,7 @@ sub cgi_signin ($$) { #{{{
 	$form->field(name => "do", type => "hidden");
 	
 	if ($q->param("do") ne "signin" && !$form->submitted) {
-		$form->text("You need to log in first.");
+		$form->text(gettext("You need to log in first."));
 	}
 	
 	run_hooks(formbuilder_setup => sub {
@@ -168,6 +170,7 @@ sub cgi_postsignin ($$) { #{{{
 		my $postsignin=CGI->new($session->param("postsignin"));
 		$session->clear("postsignin");
 		cgi($postsignin, $session);
+		cgi_savesession($session);
 		exit;
 	}
 	else {
@@ -241,7 +244,7 @@ sub cgi_prefs ($$) { #{{{
 		redirect($q, $config{url});
 		return;
 	}
-	elsif ($form->submitted eq "Save Preferences" && $form->validate) {
+	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");
@@ -251,7 +254,7 @@ sub cgi_prefs ($$) { #{{{
 			set_banned_users(grep { ! is_admin($_) }
 					split(' ', $form->field("banned_users")));
 		}
-		$form->text("Preferences saved.");
+		$form->text(gettext("Preferences saved."));
 	}
 	
 	if (exists $hooks{formbuilder}) {
@@ -273,15 +276,8 @@ sub cgi_editpage ($$) { #{{{
 	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
 	my @buttons=("Save Page", "Preview", "Cancel");
 	
-	eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML};
+	eval q{use CGI::FormBuilder};
 	error($@) if $@;
-	my $renderer=CGI::FormBuilder::Template::HTML->new(
-		fields => \@fields,
-		template_params("editpage.tmpl"),
-	);
-	run_hooks(pagetemplate => sub {
-		shift->(page => "", destpage => "", template => $renderer->engine);
-	});
 	my $form = CGI::FormBuilder->new(
 		fields => \@fields,
 		header => 1,
@@ -295,7 +291,8 @@ sub cgi_editpage ($$) { #{{{
 		params => $q,
 		action => $config{cgiurl},
 		table => 0,
-		template => $renderer,
+		template => (-e "$config{templatedir}/editpage.tmpl" ?
+				{template_params("editpage.tmpl")} : ""),
 	);
 	
 	run_hooks(formbuilder_setup => sub {
@@ -308,8 +305,7 @@ sub cgi_editpage ($$) { #{{{
 	# characters.
 	my ($page)=$form->field('page');
 	$page=titlepage(possibly_foolish_untaint($page));
-	if (! defined $page || ! length $page ||
-	    $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
+	if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) {
 		error("bad page name");
 	}
 	
@@ -399,7 +395,7 @@ sub cgi_editpage ($$) { #{{{
 			my $best_loc;
 			if (! defined $from || ! length $from ||
 			    $from ne $form->field('from') ||
-			    $from=~/$config{wiki_file_prune_regexp}/ ||
+			    file_pruned($from, $config{srcdir}) ||
 			    $from=~/^\// ||
 			    $form->submitted eq "Preview") {
 				@page_locs=$best_loc=$page;
@@ -409,7 +405,7 @@ sub cgi_editpage ($$) { #{{{
 				$dir=~s![^/]+/+$!!;
 				
 				if ((defined $form->field('subpage') && length $form->field('subpage')) ||
-				    $page eq 'discussion') {
+				    $page eq gettext('discussion')) {
 					$best_loc="$from/$page";
 				}
 				else {
@@ -423,6 +419,8 @@ sub cgi_editpage ($$) { #{{{
 					push @page_locs, $dir.$page;
 				}
 			}
+			push @page_locs, "$config{userdir}/$page"
+				if length $config{userdir};
 
 			@page_locs = grep {
 				! exists $pagecase{lc $_} &&
@@ -446,7 +444,7 @@ sub cgi_editpage ($$) { #{{{
 				options => \@page_locs, value => $best_loc);
 			$form->field(name => "type", type => 'select',
 				options => \@page_types);
-			$form->title("creating ".pagetitle($page));
+			$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
 		}
 		elsif ($form->field("do") eq "edit") {
 			page_locked($page, $session);
@@ -463,7 +461,7 @@ sub cgi_editpage ($$) { #{{{
 			$form->tmpl_param("page_select", 0);
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
-			$form->title("editing ".pagetitle($page));
+			$form->title(sprintf(gettext("editing %s"), pagetitle($page)));
 		}
 		
 		print $form->render(submit => \@buttons);
@@ -506,7 +504,7 @@ sub cgi_editpage ($$) { #{{{
 				$form->tmpl_param("page_select", 0);
 				$form->field(name => "page", type => 'hidden');
 				$form->field(name => "type", type => 'hidden');
-				$form->title("editing $page");
+				$form->title(sprintf(gettext("editing %s"), $page));
 				print $form->render(submit => \@buttons);
 				return;
 			}
@@ -523,12 +521,35 @@ sub cgi_editpage ($$) { #{{{
 	}
 } #}}}
 
+sub cgi_getsession ($) { #{{{
+	my $q=shift;
+
+	eval q{use CGI::Session};
+	CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
+	
+	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; use CGI::Session};
+		eval q{use CGI};
 		error($@) if $@;
 	
 		$q=CGI->new;
@@ -560,12 +581,7 @@ sub cgi (;$$) { #{{{
 	lockwiki();
 	
 	if (! $session) {
-		CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
-	
-		my $oldmask=umask(077);
-		$session = CGI::Session->new("driver:DB_File", $q,
-			{ FileName => "$config{wikistatedir}/sessions.db" });
-		umask($oldmask);
+		$session=cgi_getsession($q);
 	}
 	
 	# Auth hooks can sign a user in.
@@ -595,12 +611,7 @@ sub cgi (;$$) { #{{{
 			$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")) {
@@ -610,7 +621,8 @@ sub cgi (;$$) { #{{{
 	if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
 		print $q->header(-status => "403 Forbidden");
 		$session->delete();
-		print "You are banned.";
+		print gettext("You are banned.");
+		cgi_savesession($session);
 		exit;
 	}
 	
@@ -622,6 +634,7 @@ sub cgi (;$$) { #{{{
 	}
 	elsif ($do eq 'blog') {
 		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="";
@@ -653,11 +666,17 @@ sub userlink ($) { #{{{
 		if ($display !~ /\[/) {
 			$display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
 		}
+		# Convert "somehost.com/user" to "user [somehost.com]".
+		if ($display !~ /\[/) {
+			$display=~s/^(.+)\/[^\/](.+)$/$2 [$1]/;
+		}
 		$display=~s!^https?://!!; # make sure this is removed
 		return "<a href=\"$user\">".escapeHTML($display)."</a>";
 	}
 	else {
-		return htmllink("", "", escapeHTML($user), 1);
+		return htmllink("", "", escapeHTML(
+			length $config{userdir} ? $config{userdir}."/".$user : $user
+		), 1);
 	}
 } #}}}