X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6d80bdda7c0cea5fa538733d5ed5c510bb7b1ee1..049d7c970e52561bcf2cbe7bfc85dae542137939:/IkiWiki/Plugin/remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index b94447020..859c39066 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -22,6 +22,14 @@ sub getsetup () {
 		},
 }
 
+sub allowed_dirs {
+	no warnings 'once';
+	return grep { defined $_ } (
+		$config{srcdir},
+		$IkiWiki::Plugin::transient::transientdir,
+	);
+}
+
 sub check_canremove ($$$) {
 	my $page=shift;
 	my $q=shift;
@@ -33,12 +41,22 @@ sub check_canremove ($$$) {
 			htmllink("", "", $page, noimageinline => 1)));
 	}
 
-	# Must exist on disk, and be a regular file.
+	# Must exist in either the srcdir or a suitable underlay (e.g.
+	# transient underlay), and be a regular file.
 	my $file=$pagesources{$page};
-	if (! -e "$config{srcdir}/$file") {
+	my $dir;
+
+	foreach my $srcdir (allowed_dirs()) {
+		if (-e "$srcdir/$file") {
+			$dir = $srcdir;
+			last;
+		}
+	}
+
+	if (! defined $dir) {
 		error(sprintf(gettext("%s is not in the srcdir, so it cannot be deleted"), $file));
 	}
-	elsif (-l "$config{srcdir}/$file" && ! -f _) {
+	elsif (-l "$dir/$file" && ! -f _) {
 		error(sprintf(gettext("%s is not a file"), $file));
 	}
 	
@@ -46,7 +64,7 @@ sub check_canremove ($$$) {
 	# This is sorta overkill, but better safe than sorry.
 	if (! defined pagetype($pagesources{$page})) {
 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
-			IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file");
+			IkiWiki::Plugin::attachment::check_canattach($session, $page, "$dir/$file");
 		}
 		else {
 			error("removal of attachments is not allowed");
@@ -120,12 +138,11 @@ sub removal_confirm ($$@) {
 		
 	# Special case for unsaved attachments.
 	foreach my $page (@pages) {
-		if (IkiWiki::Plugin::attachment->can("is_held_attachment")) {
+		if ($attachment && IkiWiki::Plugin::attachment->can("is_held_attachment")) {
 			my $f=IkiWiki::Plugin::attachment::is_held_attachment($page);
 			if (defined $f) {
-				print STDERR "!! remove $f\n";
 				require IkiWiki::Render;
-				IkiWiki::prune($f);
+				IkiWiki::prune($f, "$config{wikistatedir}/attachments");
 			}
 		}
 	}
@@ -179,7 +196,9 @@ sub formbuilder (@) {
 		my $session=$params{session};
 
 		if ($form->submitted eq "Remove" && $form->field("do") eq "edit") {
-			removal_confirm($q, $session, 0, $form->field("page"));
+			# deliberately taking multiple values of page
+			my @pages = $form->field("page");
+			removal_confirm($q, $session, 0, @pages);
 		}
 		elsif ($form->submitted eq "Remove Attachments") {
 			my @selected=map { Encode::decode_utf8($_) } $q->param("attachment_select");
@@ -199,14 +218,15 @@ sub sessioncgi ($$) {
 		my ($form, $buttons)=confirmation_form($q, $session);
 		IkiWiki::decode_form_utf8($form);
 
+		# deliberately taking multiple values of page
+		my @pages = $form->field("page");
+
 		if ($form->submitted eq 'Cancel') {
 			postremove($session);
 		}
 		elsif ($form->submitted eq 'Remove' && $form->validate) {
-			IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
+			IkiWiki::checksessionexpiry($q, $session);
 
-			my @pages=$form->field("page");
-			
 			# Validate removal by checking that the page exists,
 			# and that the user is allowed to edit(/remove) it.
 			my @files;
@@ -224,21 +244,34 @@ sub sessioncgi ($$) {
 			require IkiWiki::Render;
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
-				foreach my $file (@files) {
-					IkiWiki::rcs_remove($file);
+			}
+			my $rcs_removed = 1;
+
+			foreach my $file (@files) {
+				foreach my $srcdir (allowed_dirs()) {
+					if (-e "$srcdir/$file") {
+						if ($srcdir eq $config{srcdir} && $config{rcs}) {
+							IkiWiki::rcs_remove($file);
+							$rcs_removed = 1;
+						}
+						else {
+							IkiWiki::prune("$srcdir/$file", $srcdir);
+						}
+					}
 				}
-				IkiWiki::rcs_commit_staged(
-					message => gettext("removed"),
-					session => $session,
-				);
-				IkiWiki::enable_commit_hook();
-				IkiWiki::rcs_update();
 			}
-			else {
-				foreach my $file (@files) {
-					IkiWiki::prune("$config{srcdir}/$file");
+
+			if ($config{rcs}) {
+				if ($rcs_removed) {
+					IkiWiki::rcs_commit_staged(
+						message => gettext("removed"),
+						session => $session,
+					);
 				}
+				IkiWiki::enable_commit_hook();
+				IkiWiki::rcs_update();
 			}
+
 			IkiWiki::refresh();
 			IkiWiki::saveindex();
 
@@ -258,7 +291,7 @@ sub sessioncgi ($$) {
 			}
 		}
 		else {
-			removal_confirm($q, $session, 0, $form->field("page"));
+			removal_confirm($q, $session, 0, @pages);
 		}
 
 		exit 0;