X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1202b4fd7b305b223d64f9e9f24424b72c81ab6d..1d51328d0600c4cbd3704149849eb941dfd3346c:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 8d86d8d3e..2b7727000 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -290,8 +290,7 @@ sub cgi_editpage ($$) { #{{{
 	my $q=shift;
 	my $session=shift;
 
-	my @fields=qw(do rcsinfo subpage from page type editcontent comments
-	              newfile);
+	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
 	my @buttons=("Save Page", "Preview", "Cancel");
 	
 	eval q{use CGI::FormBuilder};
@@ -333,12 +332,16 @@ sub cgi_editpage ($$) { #{{{
 	
 	my $file;
 	my $type;
-	if (exists $pagesources{$page}) {
+	if (exists $pagesources{$page} && $form->field("do") ne "create") {
 		$file=$pagesources{$page};
 		$type=pagetype($file);
 		if (! defined $type) {
 			error(sprintf(gettext("%s is not an editable page"), $page));
 		}
+		if (! $form->submitted) {
+			$form->field(name => "rcsinfo",
+				value => rcs_prepedit($file), force => 1);
+		}
 	}
 	else {
 		$type=$form->param('type');
@@ -351,37 +354,31 @@ sub cgi_editpage ($$) { #{{{
 		}
 		$type=$config{default_pageext} unless defined $type;
 		$file=$page.".".$type;
+		if (! $form->submitted) {
+			$form->field(name => "rcsinfo", value => "", force => 1);
+		}
 	}
 
-
 	$form->field(name => "do", type => 'hidden');
 	$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 => pagetitle($page, 1), 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);
-	$form->field(name => "newfile", type => 'hidden');
 	$form->tmpl_param("can_commit", $config{rcs});
 	$form->tmpl_param("indexlink", indexlink());
 	$form->tmpl_param("helponformattinglink",
 		htmllink("", "", "HelpOnFormatting", noimageinline => 1));
 	$form->tmpl_param("baseurl", baseurl());
-	if (! $form->submitted) {
-		$form->field(name => "rcsinfo", value => rcs_prepedit($file),
-			force => 1);
-		$form->field(name => "newfile", 
-			value => ! -e "$config{srcdir}/$file",
-			force => 1);
-	}
 	
 	if ($form->submitted eq "Cancel") {
-		if ($form->field(name => "newfile") && defined $from) {
+		if ($form->field("do") eq "create" && defined $from) {
 			redirect($q, "$config{url}/".htmlpage($from));
 		}
-		elsif ($form->field(name => "newfile")) {
+		elsif ($form->field("do") eq "create") {
 			redirect($q, $config{url});
 		}
 		else {
@@ -390,17 +387,11 @@ sub cgi_editpage ($$) { #{{{
 		return;
 	}
 	elsif ($form->submitted eq "Preview") {
-		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);
 		$form->tmpl_param("page_preview",
 			htmlize($page, $type,
 			linkify($page, "",
 			preprocess($page, $page,
-			filter($page, $content), 0, 1))));
+			filter($page, $form->field('editcontent')), 0, 1))));
 	}
 	else {
 		$form->tmpl_param("page_preview", "");
@@ -466,8 +457,8 @@ sub cgi_editpage ($$) { #{{{
 			
 			$form->tmpl_param("page_select", 1);
 			$form->field(name => "page", type => 'select',
-				options => { map { $_ => pagetitle($_, 1) } @editable_locs },
-				value => $best_loc);
+				options => [ map { pagetitle($_, 1) } @editable_locs ],
+				value => pagetitle($best_loc, 1));
 			$form->field(name => "type", type => 'select',
 				options => \@page_types);
 			$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
@@ -495,13 +486,29 @@ sub cgi_editpage ($$) { #{{{
 	else {
 		# save page
 		check_canedit($page, $q, $session);
-		if (! -e "$config{srcdir}/$file" && ! $form->field(name => 'newfile')){
+		if (! -e "$config{srcdir}/$file" &&
+		    $form->field("do") ne "create") {
 			$form->tmpl_param("page_gone", 1);
-			$form->field(name => "newfile",
-			             value => 1, force => 1);
+			$form->field(name => "do", value => "create", force => 1);
 			$form->tmpl_param("page_select", 0);
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
+			$form->title(sprintf(gettext("editing %s"), $page));
+			print $form->render(submit => \@buttons);
+			return;
+		}
+		elsif (-e "$config{srcdir}/$file" &&
+		       $form->field("do") eq "create") {
+			$form->tmpl_param("creation_conflict", 1);
+			$form->field(name => "do", value => "edit", force => 1);
+			$form->tmpl_param("page_select", 0);
+			$form->field(name => "page", type => 'hidden');
+			$form->field(name => "type", type => 'hidden');
+			$form->title(sprintf(gettext("editing %s"), $page));
+			$form->field("editcontent", 
+				value => readfile("$config{srcdir}/$file").
+				         "\n\n\n".$form->field("editcontent"),
+				force => 1);
 			print $form->render(submit => \@buttons);
 			return;
 		}
@@ -536,7 +543,7 @@ sub cgi_editpage ($$) { #{{{
 				$message=$form->field('comments');
 			}
 			
-			if ($form->field(name => "newfile")) {
+			if ($form->field("do") eq "create") {
 				rcs_add($file);
 			}
 
@@ -681,12 +688,12 @@ sub cgi (;$$) { #{{{
 		cgi_editpage($q, $session);
 	}
 	elsif ($do eq 'blog') {
-		my $page=titlepage(decode_utf8($q->param('title')));
-		$page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
+		my $page=decode_utf8($q->param('title'));
+		$page=~s/\///g; # no slashes in blog posts
 		# if the page already exists, munge it to be unique
 		my $from=$q->param('from');
 		my $add="";
-		while (exists $pagecase{lc "$from/$page$add"}) {
+		while (exists $pagecase{lc($from."/".titlepage($page).$add)}) {
 			$add=1 unless length $add;
 			$add++;
 		}