X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/af9c5e4bbadc87850f435cfc530ffc1d81419564..52bbdbb1a5ce994c9afac253c1d9bfd94acf4d1d:/IkiWiki/Plugin/remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index a37240680..a886956b2 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -12,6 +12,38 @@ sub import { #{{{
 
 } # }}}
 
+sub check_canremove ($$$$) { #{{{
+	my $page=shift;
+	my $q=shift;
+	my $session=shift;
+	my $attachment=shift;
+
+	# Must be a known source file.
+	if (! exists $pagesources{$page}) {
+		error(sprintf(gettext("%s does not exist"),
+			htmllink("", "", $page, noimageinline => 1)));
+	}
+
+	# Must exist on disk, and be a regular file.
+	my $file=$pagesources{$page};
+	if (! -e "$config{srcdir}/$file") {
+		error(sprintf(gettext("%s is not in the srcdir, so it cannot be deleted"), $file));
+	}
+	elsif (-l "$config{srcdir}/$file" && ! -f _) {
+		error(sprintf(gettext("%s is not a file"), $file));
+	}
+	
+	# Must be editiable.
+	IkiWiki::check_canedit($page, $q, $session);
+
+	# This is sorta overkill, but better safe
+	# than sorry. If a user can't upload an
+	# attachment, don't let them delete it.
+	if ($attachment) {
+		IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+	}
+} #}}}
+
 sub formbuilder_setup (@) { #{{{
 	my %params=@_;
 	my $form=$params{form};
@@ -30,7 +62,6 @@ sub confirmation_form ($$) { #{{{
 
 	eval q{use CGI::FormBuilder};
 	error($@) if $@;
-	my @fields=qw(do page);
 	my $f = CGI::FormBuilder->new(
 		name => "remove",
 		header => 0,
@@ -40,7 +71,7 @@ sub confirmation_form ($$) { #{{{
 		params => $q,
 		action => $config{cgiurl},
 		stylesheet => IkiWiki::baseurl()."style.css",
-		fields => \@fields,
+		fields => [qw{do page}],
 	);
 	
 	$f->field(name => "do", type => "hidden", value => "remove", force => 1);
@@ -48,12 +79,14 @@ sub confirmation_form ($$) { #{{{
 	return $f, ["Remove", "Cancel"];
 } #}}}
 
-sub removal_confirm ($$@) {
+sub removal_confirm ($$@) { #{{{
 	my $q=shift;
 	my $session=shift;
 	my $attachment=shift;
 	my @pages=@_;
 
+	check_canremove($_, $q, $session, $attachment) foreach @pages;
+
    	# Save current form state to allow returning to it later
 	# without losing any edits.
 	# (But don't save what button was submitted, to avoid
@@ -74,9 +107,9 @@ sub removal_confirm ($$@) {
 
 	IkiWiki::showform($f, $buttons, $session, $q);
 	exit 0;
-}
+} #}}}
 
-sub postremove ($) {
+sub postremove ($) { #{{{
 	my $session=shift;
 
 	# Load saved form state and return to edit form.
@@ -84,7 +117,7 @@ sub postremove ($) {
 	$session->clear("postremove");
 	IkiWiki::cgi_savesession($session);
 	IkiWiki::cgi($postremove, $session);
-}
+} #}}}
 
 sub formbuilder (@) { #{{{
 	my %params=@_;
@@ -98,7 +131,11 @@ sub formbuilder (@) { #{{{
 			removal_confirm($q, $session, 0, $form->field("page"));
 		}
 		elsif ($form->submitted eq "Remove Attachments") {
-			removal_confirm($q, $session, 1, $q->param("attachment_select"));
+			my @selected=$q->param("attachment_select");
+			if (! @selected) {
+				error(gettext("Please select the attachments to remove."));
+			}
+			removal_confirm($q, $session, 1, @selected);
 		}
 	}
 } #}}}
@@ -116,16 +153,17 @@ sub sessioncgi ($$) { #{{{
 		}
 		elsif ($form->submitted eq 'Remove' && $form->validate) {
 			my @pages=$q->param("page");
-			my @files = map { $pagesources{$_} } @pages;
 	
 			# Validate removal by checking that the page exists,
 			# and that the user is allowed to edit(/remove) it.
+			my @files;
 			foreach my $page (@pages) {
-				if (! exists $pagesources{$page}) {
-					error(sprintf(gettext("%s does not exist"),
-					htmllink("", "", $page, noimageinline => 1)));
-				}
-				IkiWiki::check_canedit($page, $q, $session);
+				check_canremove($page, $q, $session, $q->param("attachment"));
+				
+				# This untaint is safe because of the
+				# checks performed above, which verify the
+				# page is a normal file, etc.
+				push @files, IkiWiki::possibly_foolish_untaint($pagesources{$page});
 			}
 
 			# Do removal, and update the wiki.
@@ -134,22 +172,23 @@ sub sessioncgi ($$) { #{{{
 				IkiWiki::disable_commit_hook();
 				foreach my $file (@files) {
 					IkiWiki::rcs_remove($file);
-					IkiWiki::rcs_commit($file, gettext("removed"),
-						IkiWiki::rcs_prepedit($file),
-						$session->param("name"), $ENV{REMOTE_ADDR});
 				}
+				IkiWiki::rcs_commit_staged(gettext("removed"),
+					$session->param("name"), $ENV{REMOTE_ADDR});
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}
-			foreach my $file (@files) {
-				IkiWiki::prune("$config{srcdir}/$file");
+			else {
+				foreach my $file (@files) {
+					IkiWiki::prune("$config{srcdir}/$file");
+				}
 			}
 			IkiWiki::refresh();
 			IkiWiki::saveindex();
 
 			if ($q->param("attachment")) {
 				# Attachments were deleted, so redirect
-				# to the edit form.
+				# back to the edit form.
 				postremove($session);
 			}
 			else {