X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6e243a45e5df8ec2e24d47b3466882ad6b8e0f62..ac1226031eb5c5f9b8fe528420483f4d8828c73d:/IkiWiki/Plugin/remove.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 7cc1d615e..9b6655139 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -30,7 +30,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 +39,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);
@@ -98,7 +97,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);
 		}
 	}
 } #}}}
@@ -126,9 +129,6 @@ sub sessioncgi ($$) { #{{{
 					error(sprintf(gettext("%s does not exist"),
 					htmllink("", "", $page, noimageinline => 1)));
 				}
-				
-				# Must be editiable.
-				IkiWiki::check_canedit($page, $q, $session);
 
 				# Must exist on disk, and be a regular file.
 				my $file=$pagesources{$page};
@@ -138,6 +138,16 @@ sub sessioncgi ($$) { #{{{
 				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 ($q->param("attachment")) {
+					IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+				}
 
 				push @files, IkiWiki::possibly_foolish_untaint($file);
 			}