X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8c9c3915ecaf9cce4d0335f2b3c588d7f96d2b36..5975a6ddc3c14b69a6db1b05132724b422592b08:/IkiWiki/Plugin/editpage.pm

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index f6cebd4cd..d15607990 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -39,7 +39,7 @@ sub refresh () {
 				}
 				if ($delete) {
 					debug(sprintf(gettext("removing old preview %s"), $file));
-					IkiWiki::prune("$config{destdir}/$file");
+					IkiWiki::prune("$config{destdir}/$file", $config{destdir});
 				}
 			}
 			elsif (defined $mtime) {
@@ -64,7 +64,8 @@ sub cgi_editpage ($$) {
 
 	decode_cgi_utf8($q);
 
-	my @fields=qw(do rcsinfo subpage from page type editcontent editmessage);
+	my @fields=qw(do rcsinfo subpage from page type editcontent
+		editmessage subscribe);
 	my @buttons=("Save Page", "Preview", "Cancel");
 	eval q{use CGI::FormBuilder};
 	error($@) if $@;
@@ -91,6 +92,9 @@ sub cgi_editpage ($$) {
 	# This untaint is safe because we check file_pruned and
 	# wiki_file_regexp.
 	my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;
+	if (! defined $page) {
+		error(gettext("bad page name"));
+	}
 	$page=possibly_foolish_untaint($page);
 	my $absolute=($page =~ s#^/+##); # absolute name used to force location
 	if (! defined $page || ! length $page ||
@@ -128,7 +132,8 @@ sub cgi_editpage ($$) {
 			# favor the type of linking page
 			$type=pagetype($pagesources{$from});
 		}
-		$type=$config{default_pageext} unless defined $type;
+		$type=$config{default_pageext}
+			if ! defined $type || $type=~/^_/; # not internal type
 		$file=newpagefile($page, $type);
 		if (! $form->submitted) {
 			$form->field(name => "rcsinfo", value => "", force => 1);
@@ -153,6 +158,17 @@ sub cgi_editpage ($$) {
 			noimageinline => 1,
 			linktext => "FormattingHelp"));
 	
+	my $cansubscribe=IkiWiki::Plugin::notifyemail->can("subscribe")
+		&& IkiWiki::Plugin::comments->can("import")
+		&& defined $session->param('name');
+	if ($cansubscribe) {
+		$form->field(name => "subscribe", type => "checkbox",
+			options => [gettext("email comments to me")]);
+	}
+	else {
+		$form->field(name => "subscribe", type => 'hidden');
+	}
+	
 	my $previewing=0;
 	if ($form->submitted eq "Cancel") {
 		if ($form->field("do") eq "create" && defined $from) {
@@ -223,27 +239,36 @@ sub cgi_editpage ($$) {
 			    $absolute ||
 			    $form->submitted) {
 				@page_locs=$best_loc=$page;
+				unshift @page_locs, lc($page)
+					if ! $form->submitted && lc($page) ne $page;
+			}
+			elsif (lc $page eq lc $config{discussionpage}) {
+				@page_locs=$best_loc="$from/".lc($page);
 			}
 			else {
 				my $dir=$from."/";
 				$dir=~s![^/]+/+$!!;
 				
 				if ((defined $form->field('subpage') &&
-				     length $form->field('subpage')) ||
-				    $page eq lc($config{discussionpage})) {
+				     length $form->field('subpage'))) {
 					$best_loc="$from/$page";
 				}
 				else {
 					$best_loc=$dir.$page;
 				}
 				
+				my $mixedcase=lc($page) ne $page;
+
+				push @page_locs, $dir.lc($page) if $mixedcase;
 				push @page_locs, $dir.$page;
-				push @page_locs, "$from/$page";
+				push @page_locs, $from."/".lc($page) if $mixedcase;
+				push @page_locs, $from."/".$page;
 				while (length $dir) {
 					$dir=~s![^/]+/+$!!;
+					push @page_locs, $dir.lc($page) if $mixedcase;
 					push @page_locs, $dir.$page;
 				}
-			
+
 				my $userpage=IkiWiki::userpage($page);
 				push @page_locs, $userpage
 					if ! grep { $_ eq $userpage } @page_locs;
@@ -312,7 +337,7 @@ sub cgi_editpage ($$) {
 			$form->title(sprintf(gettext("editing %s"), pagetitle(basename($page))));
 		}
 		
-		showform_preview($form, \@buttons, $session, $q, page => $page);
+		showform($form, \@buttons, $session, $q, page => $page);
 	}
 	else {
 		# save page
@@ -329,7 +354,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			showform_preview($form, \@buttons, $session, $q,
+			showform($form, \@buttons, $session, $q,
 				page => $page);
 			exit;
 		}
@@ -344,7 +369,7 @@ sub cgi_editpage ($$) {
 				value => readfile("$config{srcdir}/$file").
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
-			showform_preview($form, \@buttons, $session, $q,
+			showform($form, \@buttons, $session, $q,
 				page => $page);
 			exit;
 		}
@@ -385,7 +410,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			showform_preview($form, \@buttons, $session, $q,
+			showform($form, \@buttons, $session, $q,
 				page => $page);
 			exit;
 		}
@@ -427,7 +452,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			showform_preview($form, \@buttons, $session, $q,
+			showform($form, \@buttons, $session, $q,
 				page => $page);
 		}
 		else {
@@ -435,6 +460,12 @@ sub cgi_editpage ($$) {
 			# caches and get the most recent version of the page.
 			redirect($q, $baseurl."?updated");
 		}
+
+		if ($cansubscribe && length $form->field("subscribe")) {
+			my $subspec="comment($page)";
+			IkiWiki::Plugin::notifyemail::subscribe(
+				$session->param('name'), $subspec);
+		}
 	}
 
 	exit;