X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a759a864f37925e6788980ac53bd8f7c69172635..779c5214f330269fa95a5fed5b16fe8d65730102:/IkiWiki/Plugin/remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 9b6655139..9666408bc 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -6,12 +6,53 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "remove", call => \&getsetup);
 	hook(type => "formbuilder_setup", id => "remove", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "remove", call => \&formbuilder);
 	hook(type => "sessioncgi", id => "remove", call => \&sessioncgi);
 
 } # }}}
 
+sub getsetup () { #{{{
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+		},
+} #}}}
+
+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};
@@ -47,12 +88,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
@@ -73,9 +116,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.
@@ -83,7 +126,7 @@ sub postremove ($) {
 	$session->clear("postremove");
 	IkiWiki::cgi_savesession($session);
 	IkiWiki::cgi($postremove, $session);
-}
+} #}}}
 
 sub formbuilder (@) { #{{{
 	my %params=@_;
@@ -124,32 +167,12 @@ sub sessioncgi ($$) { #{{{
 			# and that the user is allowed to edit(/remove) it.
 			my @files;
 			foreach my $page (@pages) {
-				# 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));
-				}
+				check_canremove($page, $q, $session, $q->param("attachment"));
 				
-				# 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 ($q->param("attachment")) {
-					IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
-				}
-
-				push @files, IkiWiki::possibly_foolish_untaint($file);
+				# 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.
@@ -157,11 +180,10 @@ sub sessioncgi ($$) { #{{{
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
 				foreach my $file (@files) {
-					my $token=IkiWiki::rcs_prepedit($file);
 					IkiWiki::rcs_remove($file);
-					IkiWiki::rcs_commit($file, gettext("removed"),
-						$token, $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();
 			}